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

V1.5: 运行时间日志后追加电能显示（计量芯片在线时）

This commit is contained in:
helei 2026-08-14 23:50:50 +08:00
parent 1345242fc6
commit e8ee21b41f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
V1.5/STM32F103_App1/HardWare/LOG/log_cn.c
View File

@ -3,3 +3,4 @@
/* 本文件为 UTF-8 编码：ARMCC 原样输出字符串字面量的字节，
* 串口收到即为 UTF-8（串口工具编码选 UTF-8 即可正确显示中文） */
const char FMT_UPTIME[] = "> 运行时间: %u天--%02u小时--%02u分钟";
const char FMT_UPTIME_EN[] = "> 运行时间: %u天--%02u小时--%02u分钟 电能: %.2fkWh";

1
V1.5/STM32F103_App1/HardWare/LOG/log_cn.h
View File

@ -3,5 +3,6 @@
/* 中文日志格式串（UTF-8 编码，定义在 log_cn.c —— 串口工具编码选 UTF-8 即可正确显示） */
extern const char FMT_UPTIME[]; /* "> 运行时间: %u天--%02u小时--%02u分钟" */
extern const char FMT_UPTIME_EN[]; /* 运行时间 + 电能 */
#endif /* LOG_CN_H */

14
V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
View File

@ -228,11 +228,16 @@ static void sys_task(void *arg)
if (now - up_print >= 60000) {
up_print = now;
if (g_net_mqtt_ready) {
/* 每分钟随心跳上报一次累计电量（标识符 energy） */
if (hlw8032_online()) {
NET_publish_energy(hlw8032_get_energy_kwh());
}
uint32_t mins = (uint32_t)(up_ms / 60000);
if (hlw8032_online()) {
/* 每分钟随心跳上报一次累计电量（标识符 energy），日志同步显示 */
float kwh = hlw8032_get_energy_kwh();
NET_publish_energy(kwh);
log_info(FMT_UPTIME_EN,
(unsigned)(mins / 1440),
(unsigned)((mins % 1440) / 60),
(unsigned)(mins % 60), (double)kwh);
} else {
log_info(FMT_UPTIME,
(unsigned)(mins / 1440),
(unsigned)((mins % 1440) / 60),
@ -240,6 +245,7 @@ static void sys_task(void *arg)
}
}
}
}
vTaskDelay(20);
}