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 @@
0
1
- 255
+ 18
0