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

继电器反馈失败平台应答统一中文:负载断开或继电器损坏(UTF-8转义,板载sw1~4+扩展板sw5~8全部)

This commit is contained in:
helei 2026-09-13 21:29:55 +08:00
parent 105a1dd6ce
commit 1cc146dd0e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32F103_App1/HardWare/RELAY/ext_relay.c
View File

@ -378,7 +378,7 @@ void ext_relay_process(void)
log_warn("> EXT: SW%d %s未生效 (输出=%02X 反馈=%02X 故障=%02X, 命令前输出=%d 反馈=%d)", log_warn("> EXT: SW%d %s未生效 (输出=%02X 反馈=%02X 故障=%02X, 命令前输出=%d 反馈=%d)",
cmd_ch + 4, cmd_on ? "开" : "关", s_state, s_fb, s_fault, cmd_ch + 4, cmd_on ? "开" : "关", s_state, s_fb, s_fault,
cmd_state_before, cmd_fb_before); 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; cmd_txn = TXN_NONE;
ext_save_state(); /* 断电记忆: 以实际输出状态落盘 */ ext_save_state(); /* 断电记忆: 以实际输出状态落盘 */

4
STM32F103_App1/HardWare/RELAY/relay.c
View File

@ -34,8 +34,8 @@ void relayCmdProcess(void)
/* 等待继电器反馈电路稳定 */ /* 等待继电器反馈电路稳定 */
if (HAL_GetTick() - relay_cmd_tick < 100) return; if (HAL_GetTick() - relay_cmd_tick < 100) return;
fb_after = relayReadFb(ch); fb_after = relayReadFb(ch);
/* 测试: 仅第 2 路反馈失败应答改中文(UTF-8 字节转义; 直接写中文=GBK 平台会乱码), 其余路保持英文 */ /* 反馈失败应答平台文案: 负载断开或继电器损坏(UTF-8 字节转义, 平台只认 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 !"; 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 (RELAY_FB_ENABLE) {
if (MqttInfoStr.Relay_State[ch]) { if (MqttInfoStr.Relay_State[ch]) {
if (relay_cmd_fb_before == FB_INACTIVE && fb_after == FB_ACTIVE) { if (relay_cmd_fb_before == FB_INACTIVE && fb_after == FB_ACTIVE) {