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

试验: sw2失败应答改为直接写中文(GBK字节),验证平台是否兼容GBK;乱码则回退UTF-8转义

This commit is contained in:
helei 2026-09-13 21:14:38 +08:00
parent 39232ddcd4
commit b115dcaa65
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 字节), 其余路保持英文 */ /* 测试: 仅第 2 路反馈失败应答改中文(直接写中文=GBK 字节, 其余路保持英文; 平台乱码则回退 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 = (ch == 2) ? "负载断开或继电器损坏" : "Load unpowered / relay failure !";
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) {

2
STM32F103_App1/HardWare/SYSINIT/app_loop.c
View File

@ -115,7 +115,7 @@ void app_init(void)
s_qr_showing = 1; s_qr_showing = 1;
oled_show_qrcode(MqttInfoStr.ClientID); oled_show_qrcode(MqttInfoStr.ClientID);
log_info("> OLED: 开机显示设备ID二维码 10s"); log_info("> OLED: 开机显示设备ID二维码 10s");
bg_delay(10000); bg_delay(1000);
s_qr_showing = 0; s_qr_showing = 0;
oled_clear(); oled_clear();
} }