From bf05a80f397956032a1191c1f06ccf0211d11596 Mon Sep 17 00:00:00 2001
From: helei <helei@nky.com>
Date: Sun, 16 Aug 2026 18:47:41 +0800
Subject: [PATCH] =?UTF-8?q?V1.5:=20ICCID=E5=8F=AA=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=89=8D19=E4=BD=8D=E5=8D=A1=E5=8F=B7=E6=9C=AC=E4=BD=93,?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=AB=E4=BD=8D=E6=A0=A1=E9=AA=8C=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6(=E7=94=B5=E4=BF=A1=E5=8D=A1=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BD=8D=E5=8F=AF=E8=83=BD=E5=8D=B0=E6=88=90=E5=AD=97=E6=AF=8D?=
 =?UTF-8?q?=E6=98=93=E6=B7=B7=E6=B7=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 V1.5/STM32F103_App1/HardWare/CAR/air780e.c         |  2 +-
 V1.5/STM32F103_App1/Inc/main.h                     | 14 ++++++++++----
 .../STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/V1.5/STM32F103_App1/HardWare/CAR/air780e.c b/V1.5/STM32F103_App1/HardWare/CAR/air780e.c
index 0bd4a63..30ffa31 100644
--- a/V1.5/STM32F103_App1/HardWare/CAR/air780e.c
+++ b/V1.5/STM32F103_App1/HardWare/CAR/air780e.c
@@ -295,7 +295,7 @@ static int cat_connect_network(void) {
                 p += 7;
                 while (*p == ' ') p++;
                 int n = 0;
-                while (p[n] >= '0' && p[n] <= '9' && n < 20) n++;
+                while (p[n] >= '0' && p[n] <= '9' && n < 19) n++;   /* 只取 19 位卡号本体，末位校验字符(可能印成字母)不上传 */
                 memcpy(s_iccid, p, n);
                 s_iccid[n] = 0;
             }
diff --git a/V1.5/STM32F103_App1/Inc/main.h b/V1.5/STM32F103_App1/Inc/main.h
index 99590fa..a9e722c 100644
--- a/V1.5/STM32F103_App1/Inc/main.h
+++ b/V1.5/STM32F103_App1/Inc/main.h
@@ -31,7 +31,7 @@ extern UART_HandleTypeDef huart3;
  *       由平台侧自行计时控制
  */
 /*===== 固件版本号（开机横幅打印用，改版本只动这里） =====*/
-#define FIRMWARE_VERSION_STR   "1.5.1"
+#define FIRMWARE_VERSION_STR   "1.5.6"
 
 #define PRODUCT_WITH_FEED_SCALE   0
 
@@ -48,10 +48,16 @@ extern UART_HandleTypeDef huart3;
 //#define MQTT_USERNAME    "766990788193702677"
 //#define MQTT_PASSWORD    "a0207984565267a5"
 
+////测试平台的ID - 01
+//#define MQTT_CLIENT_ID   "4fbaf68ca378b72b"
+//#define MQTT_USERNAME    "698227263545354343"
+//#define MQTT_PASSWORD    "b612c2839c135934"
+
+//RTOS版-投料机-无蠕变磅秤-01
+#define MQTT_CLIENT_ID   "46c080c385c3652e"
+#define MQTT_USERNAME    "766990788193702677"
+#define MQTT_PASSWORD    "6ae9622b7034326b"
 
-#define MQTT_CLIENT_ID   "4fbaf68ca378b72b"
-#define MQTT_USERNAME    "698227263545354343"
-#define MQTT_PASSWORD    "b612c2839c135934"
 #define MQTT_SERVER_IP   "58.17.14.95"
 #define MQTT_SERVER_PORT 1880
 #define MQTT_TOPIC       "/iot/data/down/"
diff --git a/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx b/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx
index 0330f1f..7ae1993 100644
--- a/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx
+++ b/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx
@@ -77,7 +77,7 @@
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
-      <CpuCode>255</CpuCode>
+      <CpuCode>18</CpuCode>
       <Books>
         <Book>
           <Number>0</Number>