From 7e427fbfc4917d14c5cb1a2a25b818a9b5002b8c Mon Sep 17 00:00:00 2001
From: helei <helei@nky.com>
Date: Thu, 20 Aug 2026 09:25:42 +0800
Subject: [PATCH] =?UTF-8?q?V1.5:=20=E6=96=B0=E5=A2=9E=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E5=8A=9F=E7=8E=87=E4=B8=8A=E6=8A=A5(power=E5=AD=97=E6=AE=B5,?=
 =?UTF-8?q?=E4=B8=8Eenergy=E5=90=8C=E4=B8=80=E6=9D=A1=E6=8A=A5=E6=96=87,?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=90=8C=E6=AD=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 V1.5/STM32F103_App1/HardWare/NETWORK/network.c  | 10 +++++-----
 V1.5/STM32F103_App1/HardWare/NETWORK/network.h  |  2 +-
 V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c |  2 +-
 V1.5/STM32F103_App1/README.md                   |  1 +
 V1.5/鐗堟湰璇存槑.md                            |  2 ++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c
index 60d88c3..8e60583 100644
--- a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c
+++ b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c
@@ -356,17 +356,17 @@ int NET_publish_power(int on)
 }
 
 /* 上报累计电量: energy 字段，单位 kWh，两位小数 */
-void NET_publish_energy(float kwh)
+void NET_publish_energy(float kwh, float power_w)
 {
     if (g_net_tx_busy) { log_info("> NET: energy 上报被丢弃 (发送忙)"); return; }
     if (net_at_trylock() != 0) { log_info("> NET: energy 上报被丢弃 (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:{\\22energy\\22:%.2f}}\"",
-            MqttInfoStr.ClientID, kwh);
+        CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22energy\\22:%.2f,\\22power\\22:%.1f}}\"",
+            MqttInfoStr.ClientID, kwh, power_w);
     } else {
-        char json[96];
+        char json[128];
         snprintf(json, sizeof(json),
-            "{\"header\":\"iot.prop.post\",\"body\":{\"energy\":%.2f}}", kwh);
+            "{\"header\":\"iot.prop.post\",\"body\":{\"energy\":%.2f,\"power\":%.1f}}", kwh, power_w);
         net_wifi_publish_up(json);
     }
     log_debug("> NET: energy 已发布 %.2f", (double)kwh);
diff --git a/V1.5/STM32F103_App1/HardWare/NETWORK/network.h b/V1.5/STM32F103_App1/HardWare/NETWORK/network.h
index 54a9807..089ed08 100644
--- a/V1.5/STM32F103_App1/HardWare/NETWORK/network.h
+++ b/V1.5/STM32F103_App1/HardWare/NETWORK/network.h
@@ -54,7 +54,7 @@ int  NET_publish_status(int sw1, int feeding, int sw2, int sw3, int sw4,
 void NET_publish_response(const char *cmd_id, int ok, const char *msg);
 int  NET_publish_power(int on);
 void NET_publish_version(const char *ver);   /* 上报代码版本字符串(FIRMWARE_VERSION_STR) */   /* 返回 0=已发出，-1=通道忙被丢弃 */
-void NET_publish_energy(float kwh);   /* 上报累计电量，标识符 energy，单位 kWh */
+void NET_publish_energy(float kwh, float power_w);   /* 上报累计电量，标识符 energy，单位 kWh */
 int  NET_mqtt_report(const char *header, const char *ota_id, int val);   /* 返回 0=送达 */
 int  NET_ota_confirm(void);   /* 0=确认通知已送达 1=无挂起 -1=未送达(需重试) */
 
diff --git a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
index d54a5da..9d81d0a 100644
--- a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
+++ b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
@@ -394,7 +394,7 @@ static void sys_task(void *arg)
             }
             if (report) {
                 energy_report_tick = HAL_GetTick();
-                NET_publish_energy(kwh);
+                NET_publish_energy(kwh, pw);
             }
             log_info(FMT_ENERGY, (double)kwh,
                      (double)hlw8032_get_voltage_v(),
diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md
index db15203..c524263 100644
--- a/V1.5/STM32F103_App1/README.md
+++ b/V1.5/STM32F103_App1/README.md
@@ -346,6 +346,7 @@ W25Q64 澶栭儴 Flash锛�8MB锛夛細
 | `sw2~sw4` | 澶囩敤缁х數鍣ㄧ姸鎬� | 0/1 |
 | `pow` | 鐢甸噺鐘舵�� | 1=姝ｅ父锛�0=浣庣數閲� |
 | `energy` | 绱娑堣�楃數閲� | HLW8032 璁￠噺锛屽崟浣� kWh锛屼袱浣嶅皬鏁帮紙>10W 姣� 30s锛屽惁鍒欓娆�+寮�鍏冲垏鎹級 |
+| `power` | 瀹炴椂鍔熺巼 | HLW8032 璁￠噺锛屽崟浣� W锛屼竴浣嶅皬鏁帮紝涓� energy 鍚屼竴鏉℃姤鏂囦笂鎶ワ紙绛栫暐鍚� energy锛� |
 | `iccid` | SIM 鍗″彿 | 浠� 4G 閫氶亾锛孧QTT 杩炰笂鍚庨殢 pow 涓婃姤涓�娆★紝鐢ㄤ簬鐗╄仈缃戝崱濂楅鏌ヨ缂磋垂 |
 | `fwver` | 浠ｇ爜鐗堟湰瀛楃涓� | 鏍煎紡 `FIRMWARE_VERSION_STR`+`:`+EEPROM 鐗堟湰搴忓彿锛堝 "1.5.0:15"锛夛紝瀛楃涓茬被鍨嬶紝姣忔閲嶅惎鑱旂綉鍚庝笂鎶ヤ竴娆★紙涓庣姸鎬佸ぇ鎶ユ枃涓殑鏁存暟 `ver` OTA 鐗堟湰鍙峰尯鍒嗗紑锛� |
 | `GPS` | 瀹氫綅鍧愭爣 | 浠� 4G 閫氶亾(Air780EG)锛孏CJ-02 楂樺痉鍧愭爣绯伙紝鏍煎紡 `"缁忓害,绾害"`锛屾瘡 5 鍒嗛挓涓婃姤 |
diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md
index 7404551..5b31424 100644
--- a/V1.5/鐗堟湰璇存槑.md
+++ b/V1.5/鐗堟湰璇存槑.md
@@ -168,3 +168,5 @@
   锛堝師鍏堣绛夎涪绾�/閲嶅惎/鎷ㄥ紑鍏宠Е鍙戜笂鎶ユ墠鏇存柊锛�
 - 淇閲嶅惎鍚庣绉ら噸閲忓钩鍙颁竴鐩翠负 0锛氶娆￠噸閲忎笂鎶ヨ AT 蹇欎涪寮冨悗涓嶉噸璇曪紝
   鏀逛负鍙戝竷鎴愬姛鎵嶇疆鏍囧織锛屽け璐ヤ笅杞煡璇㈢户缁噸璇�
+- 鏂板瀹炴椂鍔熺巼涓婃姤锛氭爣璇嗙 power锛堝崟浣� W锛屼竴浣嶅皬鏁帮級锛屼笌 energy 鍚堝苟鍚屼竴鏉℃姤鏂�
+  锛�>10W 姣� 30s锛屽惁鍒欓娆�+寮�鍏冲垏鎹級锛屽钩鍙扮墿妯″瀷鍔� float 鍗冲彲