From 6e98017248c39dde9d69e8a6ee54b0b3c9413a8e Mon Sep 17 00:00:00 2001 From: helei Date: Sat, 15 Aug 2026 07:20:46 +0800 Subject: [PATCH] =?UTF-8?q?V1.5:=20energy=E5=90=8C=E6=97=B6=E9=9A=8F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=A7=E6=8A=A5=E6=96=87=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?(sw1/weight=E5=90=8C=E5=8C=85,=E5=B9=B3=E5=8F=B0=E5=AF=B9?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=8D=95=E5=AD=97=E6=AE=B5energy=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E4=B8=8D=E5=A4=84=E7=90=86=E7=9A=84=E5=A4=87=E9=80=89?= =?UTF-8?q?=E9=80=9A=E9=81=93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- V1.5/STM32F103_App1/HardWare/NETWORK/network.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c index 2452f94..7c4e1ec 100644 --- a/V1.5/STM32F103_App1/HardWare/NETWORK/network.c +++ b/V1.5/STM32F103_App1/HardWare/NETWORK/network.c @@ -11,6 +11,7 @@ #include "network.h" #include "net_wifi.h" +#include "hlw8032.h" #include "net_wifi_ota.h" #include "air780e.h" #include "led.h" @@ -267,8 +268,8 @@ void NET_publish_status(int sw1, int feeding, int sw2, int sw3, int sw4, CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22ver\\22:%u,\\22weight\\22:%.1f,\\22onceWt\\22:%.1f,\\22zero\\22:%.1f,\\22sw1\\22:%d,\\22feeding\\22:%d,\\22sw2\\22:%d,\\22sw3\\22:%d,\\22sw4\\22:%d}}\"", MqttInfoStr.ClientID, (unsigned)MqttInfoStr.Ver, zero_kg, once_wt_kg, weight_kg, sw1, feeding, sw2, sw3, sw4); #else - CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22ver\\22:%u,\\22weight\\22:%.1f,\\22sw1\\22:%d,\\22feeding\\22:%d,\\22sw2\\22:%d,\\22sw3\\22:%d,\\22sw4\\22:%d}}\"", - MqttInfoStr.ClientID, (unsigned)MqttInfoStr.Ver, zero_kg, sw1, feeding, sw2, sw3, sw4); + CAT1_printf("AT+MPUB=\"/iot/data/up/%s\",0,0,\"{\\22header\\22:\\22iot.prop.post\\22,\\22body\\22:{\\22ver\\22:%u,\\22weight\\22:%.1f,\\22sw1\\22:%d,\\22feeding\\22:%d,\\22sw2\\22:%d,\\22sw3\\22:%d,\\22sw4\\22:%d,\\22energy\\22:%.2f}}\"", + MqttInfoStr.ClientID, (unsigned)MqttInfoStr.Ver, zero_kg, sw1, feeding, sw2, sw3, sw4, (double)hlw8032_get_energy_kwh()); #endif } else { char json[256]; @@ -278,8 +279,8 @@ void NET_publish_status(int sw1, int feeding, int sw2, int sw3, int sw4, (unsigned)MqttInfoStr.Ver, zero_kg, once_wt_kg, weight_kg, sw1, feeding, sw2, sw3, sw4); #else snprintf(json, sizeof(json), - "{\"header\":\"iot.prop.post\",\"body\":{\"ver\":%u,\"weight\":%.1f,\"sw1\":%d,\"feeding\":%d,\"sw2\":%d,\"sw3\":%d,\"sw4\":%d}}", - (unsigned)MqttInfoStr.Ver, zero_kg, sw1, feeding, sw2, sw3, sw4); + "{\"header\":\"iot.prop.post\",\"body\":{\"ver\":%u,\"weight\":%.1f,\"sw1\":%d,\"feeding\":%d,\"sw2\":%d,\"sw3\":%d,\"sw4\":%d,\"energy\":%.2f}}", + (unsigned)MqttInfoStr.Ver, zero_kg, sw1, feeding, sw2, sw3, sw4, (double)hlw8032_get_energy_kwh()); #endif net_wifi_publish_up(json); } @@ -334,6 +335,7 @@ void NET_publish_energy(float kwh) "{\"header\":\"iot.prop.post\",\"body\":{\"energy\":%.2f}}", kwh); net_wifi_publish_up(json); } + log_debug("> NET: energy زر·¢²¼ %.2f", (double)kwh); net_at_unlock(); }