diff --git a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c index 55d572f..a2d27c8 100644 --- a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c +++ b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c @@ -323,12 +323,12 @@ void NET_publish_version(const char *ver) if (g_net_tx_busy) { log_info("> NET: 版本上报被丢弃 (发送忙)"); return; } if (net_at_trylock() != 0) { log_info("> NET: 版本上报被丢弃 (AT 忙)"); return; } if (s_backend == NET_BACKEND_4G) { - CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22fwVer\\22:\\22%s\\22}}\"", + CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22fwver\\22:\\22%s\\22}}\"", MqttInfoStr.ClientID, ver); } else { char json[96]; snprintf(json, sizeof(json), - "{\"header\":\"iot.prop.post\",\"body\":{\"fwVer\":\"%s\"}}", ver); + "{\"header\":\"iot.prop.post\",\"body\":{\"fwver\":\"%s\"}}", ver); net_wifi_publish_up(json); } net_at_unlock(); diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md index 2eafc44..facca6d 100644 --- a/V1.5/STM32F103_App1/README.md +++ b/V1.5/STM32F103_App1/README.md @@ -345,7 +345,7 @@ W25Q64 澶栭儴 Flash锛8MB锛夛細 | `pow` | 鐢甸噺鐘舵 | 1=姝e父锛0=浣庣數閲 | | `energy` | 绱娑堣楃數閲 | HLW8032 璁¢噺锛屽崟浣 kWh锛屼袱浣嶅皬鏁帮紙>10W 姣 30s锛屽惁鍒欓娆+寮鍏冲垏鎹級 | | `iccid` | SIM 鍗″彿 | 浠 4G 閫氶亾锛孧QTT 杩炰笂鍚庨殢 pow 涓婃姤涓娆★紝鐢ㄤ簬鐗╄仈缃戝崱濂楅鏌ヨ缂磋垂 | -| `fwVer` | 浠g爜鐗堟湰瀛楃涓 | 鍗 `FIRMWARE_VERSION_STR`锛堝 "1.5.0"锛夛紝瀛楃涓茬被鍨嬶紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙涓庣姸鎬佸ぇ鎶ユ枃涓殑鏁存暟 `ver` OTA 鐗堟湰鍙峰尯鍒嗗紑锛 | +| `fwver` | 浠g爜鐗堟湰瀛楃涓 | 鍗 `FIRMWARE_VERSION_STR`锛堝 "1.5.0"锛夛紝瀛楃涓茬被鍨嬶紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙涓庣姸鎬佸ぇ鎶ユ枃涓殑鏁存暟 `ver` OTA 鐗堟湰鍙峰尯鍒嗗紑锛 | | `GPS` | 瀹氫綅鍧愭爣 | 浠 4G 閫氶亾(Air780EG)锛孏CJ-02 楂樺痉鍧愭爣绯伙紝鏍煎紡 `"缁忓害,绾害"`锛屾瘡 5 鍒嗛挓涓婃姤 | > 娉細`zero`锛堝墿浣欐枡閲嶏級涓 `onceWt` 涓虹О閲嶆ā寮忎笓鐢ㄥ瓧娈碘斺擿PRODUCT_WITH_FEED_SCALE=0` 鏃剁姸鎬佷笂鎶ヤ笉鎼哄甫杩欎袱涓瓧娈碉紝骞冲彴涓嬪彂璁剧疆浼氭敹鍒 `no scale on this device` 鎷掔粷搴旂瓟銆 diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md index 63dfdf4..572b139 100644 --- a/V1.5/鐗堟湰璇存槑.md +++ b/V1.5/鐗堟湰璇存槑.md @@ -147,6 +147,6 @@ 鏍囪鍘熷洜(RSN_OTA_FAIL "OTA澶辫触涓")骞朵富鍔ㄥ浣嶏紝閲嶅惎璧板共鍑 4G 鍒濆鍖栨仮澶嶈仈缃 - 淇 OTA 鐨 SAPBR 婵娲绘壙杞芥鐜囨уけ璐ワ細OTA 鍏ュ彛澶嶄綅妯$粍鍚庢湭绛夌綉缁滈噸鏂伴檮鐫(CATT)灏 婵娲绘壙杞斤紝娉ㄥ唽鎱㈡椂蹇呭け璐ャ傜幇 CSQ 鍚庡姞 cat_wait_cgatt_attached(30)锛岄檮鐫鎴愬姛鎵嶈蛋 SAPBR -- 鏂板浠g爜鐗堟湰涓婃姤锛氭爣璇嗙 fwVer锛堝瓧绗︿覆锛屽唴瀹=FIRMWARE_VERSION_STR锛夛紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙閬垮紑涓庢暣鏁 ver 閲嶅悕锛 +- 鏂板浠g爜鐗堟湰涓婃姤锛氭爣璇嗙 fwver锛堝瓧绗︿覆锛屽唴瀹=FIRMWARE_VERSION_STR锛夛紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙閬垮紑涓庢暣鏁 ver 閲嶅悕锛 - 485 绉よ皟璇曟棩蹇楀寮猴細鏀跺埌甯у厛鎵撳嵃鍘熷 hex锛岃В鏋愬け璐ヨ緭鍑哄叿浣撳師鍥 锛堝抚杩囩煭/绔欏彿涓嶇/寮傚父甯/鍔熻兘鐮佷笉绗/CRC 閿欒鍚勫甫璇存槑锛