From b115dcaa651c0a3ca8866dbe6b9fff0b9826fe2f Mon Sep 17 00:00:00 2001 From: helei Date: Sun, 13 Sep 2026 21:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C:=20sw2=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=BA=94=E7=AD=94=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5=E5=86=99?= =?UTF-8?q?=E4=B8=AD=E6=96=87(GBK=E5=AD=97=E8=8A=82),=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=98=AF=E5=90=A6=E5=85=BC=E5=AE=B9GBK;?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E5=88=99=E5=9B=9E=E9=80=80UTF-8=E8=BD=AC?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- STM32F103_App1/HardWare/RELAY/relay.c | 4 ++-- STM32F103_App1/HardWare/SYSINIT/app_loop.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/STM32F103_App1/HardWare/RELAY/relay.c b/STM32F103_App1/HardWare/RELAY/relay.c index c8859b6..cc9b1f2 100644 --- a/STM32F103_App1/HardWare/RELAY/relay.c +++ b/STM32F103_App1/HardWare/RELAY/relay.c @@ -34,8 +34,8 @@ void relayCmdProcess(void) /* 等待继电器反馈电路稳定 */ if (HAL_GetTick() - relay_cmd_tick < 100) return; fb_after = relayReadFb(ch); - /* 测试: 仅第 2 路反馈失败应答改中文(UTF-8 字节), 其余路保持英文 */ - const char *failmsg = (ch == 2) ? "\xE8\xB4\x9F\xE8\xBD\xBD\xE6\x96\xAD\xE5\xBC\x80\xE6\x88\x96\xE7\xBB\xA7\xE7\x94\xB5\xE5\x99\xA8\xE6\x8D\x9F\xE5\x9D\x8F" : "Load unpowered / relay failure !"; + /* 测试: 仅第 2 路反馈失败应答改中文(直接写中文=GBK 字节, 其余路保持英文; 平台乱码则回退 UTF-8 转义) */ + const char *failmsg = (ch == 2) ? "负载断开或继电器损坏" : "Load unpowered / relay failure !"; if (RELAY_FB_ENABLE) { if (MqttInfoStr.Relay_State[ch]) { if (relay_cmd_fb_before == FB_INACTIVE && fb_after == FB_ACTIVE) { diff --git a/STM32F103_App1/HardWare/SYSINIT/app_loop.c b/STM32F103_App1/HardWare/SYSINIT/app_loop.c index ae356ca..4143921 100644 --- a/STM32F103_App1/HardWare/SYSINIT/app_loop.c +++ b/STM32F103_App1/HardWare/SYSINIT/app_loop.c @@ -115,7 +115,7 @@ void app_init(void) s_qr_showing = 1; oled_show_qrcode(MqttInfoStr.ClientID); log_info("> OLED: 开机显示设备ID二维码 10s"); - bg_delay(10000); + bg_delay(1000); s_qr_showing = 0; oled_clear(); }