helei
/
shuichan_old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V1.5: energy同时随状态大报文上报(sw1/weight同包,平台对独立单字段energy报文不处理的备选通道)

This commit is contained in:
helei 2026-08-15 07:20:46 +08:00
parent 0cf47b6d57
commit 6e98017248
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
V1.5/STM32F103_App1/HardWare/NETWORK/network.c
View File

@ -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();
}