From cd2a3f7659d266cddfe75442373fadbb2ac8fa00 Mon Sep 17 00:00:00 2001 From: helei Date: Tue, 18 Aug 2026 22:50:28 +0800 Subject: [PATCH] =?UTF-8?q?V1.5:=20fwver=E4=B8=8A=E6=8A=A5=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=8A=A0=E7=89=88=E6=9C=AC=E5=BA=8F=E5=8F=B7(FIRMWARE?= =?UTF-8?q?=5FVERSION=5FSTR:EEPROM=5FVer,=20=E5=A6=821.5.0:15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c | 7 ++++++- V1.5/STM32F103_App1/README.md | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c index 3987c01..d54a5da 100644 --- a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c +++ b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c @@ -159,7 +159,12 @@ static void app_task(void *arg) mqtt_first_status_reported = 1; relayRestoreState(); relayStatueUpdata(); - NET_publish_version(FIRMWARE_VERSION_STR); /* 每次重启联网后上报一次代码版本 */ + { /* 每次重启联网后上报一次代码版本："1.5.0:15"（字符串版本 + EEPROM 版本序号） */ + char verbuf[24]; + snprintf(verbuf, sizeof(verbuf), "%s:%u", + FIRMWARE_VERSION_STR, (unsigned)MqttInfoStr.Ver); + NET_publish_version(verbuf); + } log_info("> Main: MQTT Ready 后首次状态上报"); ota_confirm_tick = HAL_GetTick(); } diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md index fde0538..05bcb4f 100644 --- a/V1.5/STM32F103_App1/README.md +++ b/V1.5/STM32F103_App1/README.md @@ -346,7 +346,7 @@ W25Q64 澶栭儴 Flash锛8MB锛夛細 | `pow` | 鐢甸噺鐘舵 | 1=姝ｅ父锛0=浣庣數閲 | | `energy` | 绱娑堣楃數閲 | HLW8032 璁￠噺锛屽崟浣 kWh锛屼袱浣嶅皬鏁帮紙>10W 姣 30s锛屽惁鍒欓娆+寮鍏冲垏鎹級 | | `iccid` | SIM 鍗″彿 | 浠 4G 閫氶亾锛孧QTT 杩炰笂鍚庨殢 pow 涓婃姤涓娆★紝鐢ㄤ簬鐗╄仈缃戝崱濂楅鏌ヨ缂磋垂 | -| `fwver` | 浠ｇ爜鐗堟湰瀛楃涓 | 鍗 `FIRMWARE_VERSION_STR`锛堝 "1.5.0"锛夛紝瀛楃涓茬被鍨嬶紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙涓庣姸鎬佸ぇ鎶ユ枃涓殑鏁存暟 `ver` OTA 鐗堟湰鍙峰尯鍒嗗紑锛 | +| `fwver` | 浠ｇ爜鐗堟湰瀛楃涓 | 鏍煎紡 `FIRMWARE_VERSION_STR`+`:`+EEPROM 鐗堟湰搴忓彿锛堝 "1.5.0:15"锛夛紝瀛楃涓茬被鍨嬶紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙涓庣姸鎬佸ぇ鎶ユ枃涓殑鏁存暟 `ver` OTA 鐗堟湰鍙峰尯鍒嗗紑锛 | | `GPS` | 瀹氫綅鍧愭爣 | 浠 4G 閫氶亾(Air780EG)锛孏CJ-02 楂樺痉鍧愭爣绯伙紝鏍煎紡 `"缁忓害,绾害"`锛屾瘡 5 鍒嗛挓涓婃姤 | > 娉細`zero`锛堝墿浣欐枡閲嶏級涓 `onceWt` 涓虹О閲嶆ā寮忎笓鐢ㄥ瓧娈碘斺擿PRODUCT_WITH_FEED_SCALE=0` 鏃剁姸鎬佷笂鎶ヤ笉鎼哄甫杩欎袱涓瓧娈碉紝骞冲彴涓嬪彂璁剧疆浼氭敹鍒 `no scale on this device` 鎷掔粷搴旂瓟銆