From 1cc146dd0eb32fd7082e9ff4f194dfba9d1903d8 Mon Sep 17 00:00:00 2001 From: helei Date: Sun, 13 Sep 2026 21:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=94=B5=E5=99=A8=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=B9=B3=E5=8F=B0=E5=BA=94=E7=AD=94=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=B8=AD=E6=96=87:=E8=B4=9F=E8=BD=BD=E6=96=AD?= =?UTF-8?q?=E5=BC=80=E6=88=96=E7=BB=A7=E7=94=B5=E5=99=A8=E6=8D=9F=E5=9D=8F?= =?UTF-8?q?(UTF-8=E8=BD=AC=E4=B9=89,=E6=9D=BF=E8=BD=BDsw1~4+=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=9D=BFsw5~8=E5=85=A8=E9=83=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- STM32F103_App1/HardWare/RELAY/ext_relay.c | 2 +- STM32F103_App1/HardWare/RELAY/relay.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/STM32F103_App1/HardWare/RELAY/ext_relay.c b/STM32F103_App1/HardWare/RELAY/ext_relay.c index c3b2831..7451446 100644 --- a/STM32F103_App1/HardWare/RELAY/ext_relay.c +++ b/STM32F103_App1/HardWare/RELAY/ext_relay.c @@ -378,7 +378,7 @@ void ext_relay_process(void) log_warn("> EXT: SW%d %s未生效 (输出=%02X 反馈=%02X 故障=%02X, 命令前输出=%d 反馈=%d)", cmd_ch + 4, cmd_on ? "开" : "关", s_state, s_fb, s_fault, cmd_state_before, cmd_fb_before); - ext_respond(0, "Load unpowered / relay failure !"); /* 与板载失败文案一致 */ + ext_respond(0, "\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"); /* 负载断开或继电器损坏(UTF-8 字节, 与板载文案一致) */ } cmd_txn = TXN_NONE; ext_save_state(); /* 断电记忆: 以实际输出状态落盘 */ diff --git a/STM32F103_App1/HardWare/RELAY/relay.c b/STM32F103_App1/HardWare/RELAY/relay.c index 7ddd7cc..b5910e8 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 字节转义; 直接写中文=GBK 平台会乱码), 其余路保持英文 */ - 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 !"; + /* 反馈失败应答平台文案: 负载断开或继电器损坏(UTF-8 字节转义, 平台只认 UTF-8) */ + const char *failmsg = "\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"; if (RELAY_FB_ENABLE) { if (MqttInfoStr.Relay_State[ch]) { if (relay_cmd_fb_before == FB_INACTIVE && fb_after == FB_ACTIVE) {