diff --git a/V1.5/STM32F103_App1/HardWare/LOG/log_cn.c b/V1.5/STM32F103_App1/HardWare/LOG/log_cn.c index 7c119e0..99d8354 100644 --- a/V1.5/STM32F103_App1/HardWare/LOG/log_cn.c +++ b/V1.5/STM32F103_App1/HardWare/LOG/log_cn.c @@ -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"; diff --git a/V1.5/STM32F103_App1/HardWare/LOG/log_cn.h b/V1.5/STM32F103_App1/HardWare/LOG/log_cn.h index 8766d3f..1c3c1cf 100644 --- a/V1.5/STM32F103_App1/HardWare/LOG/log_cn.h +++ b/V1.5/STM32F103_App1/HardWare/LOG/log_cn.h @@ -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 */ diff --git a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c index 6e9b838..4417f9d 100644 --- a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c +++ b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c @@ -228,15 +228,21 @@ 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); - log_info(FMT_UPTIME, - (unsigned)(mins / 1440), - (unsigned)((mins % 1440) / 60), - (unsigned)(mins % 60)); + 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), + (unsigned)(mins % 60)); + } } } }