|
|
@@ -23,8 +23,10 @@
|
|
|
#include "sound.h"
|
|
|
#include "ymodem.h"
|
|
|
#include <shell.h>
|
|
|
+#include <msh.h> /* msh_exec:屏幕 debug1 调试页控制台命令执行 */
|
|
|
#include "dtu_uart2.h"
|
|
|
#include <fal.h>
|
|
|
+#include <spi_flash_sfud.h> /* debug1 页外挂Flash信息(与 sys_monitor.c 相同方式读取) */
|
|
|
#include "sys_monitor.h"
|
|
|
#include "param_mirror.h"
|
|
|
#define DBG_ENABLE
|
|
|
@@ -539,7 +541,10 @@ void process_hex_payload(const char* hex_str, int req_id) {
|
|
|
* 现在:整包先喂入组装缓冲,按 '\n' 切出完整帧逐条交给 HMI_Decode(帧内容保留
|
|
|
* "\r\n",与旧行为一致);残段留待下次 read 拼接;超长无结束符的帧丢弃并告警。
|
|
|
*/
|
|
|
-#define HMI_FRAME_MAX 256
|
|
|
+/* 单帧上限:常规屏幕指令都很短;惟 debug1 "dbg:" 帧会送回整个文本框内容
|
|
|
+ * (含中文日志时按 UTF-8 3 字节/字计算,120 字符最坏约 380B + 前缀/结束符),
|
|
|
+ * 因此由 256 提升到 512(接收缓冲 rx_buffer 同为 512,配套一致)。 */
|
|
|
+#define HMI_FRAME_MAX 512
|
|
|
static char hmi_frame[HMI_FRAME_MAX + 1];
|
|
|
static rt_uint16_t hmi_frame_len = 0;
|
|
|
|
|
|
@@ -852,6 +857,8 @@ static void hmi_refresh_pages(const struct tm *ptm)
|
|
|
HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
|
|
|
//更新加热状态
|
|
|
HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
|
|
|
+ //测试模式加热状态
|
|
|
+ HMI_WRITE("sysTest.switchHeat.val=%d",device_status.heat_status);
|
|
|
//更新密码
|
|
|
HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
|
|
|
//更新时间设置中的参数
|
|
|
@@ -881,6 +888,7 @@ static void hmi_refresh_pages(const struct tm *ptm)
|
|
|
if(device_status.thsp<60) device_status.thsp = device_status.thsp * 60;
|
|
|
HMI_WRITE("thsp=%d",device_status.thsp);
|
|
|
HMI_WRITE("menu.cam_sta.val=%d",device_status.camsta);
|
|
|
+ HMI_WRITE("menu.mn.txt=\"%s\"",device_status.cam_model);
|
|
|
}
|
|
|
|
|
|
if(atoi(device_status.gps)==1){
|
|
|
@@ -979,6 +987,669 @@ static void hmi_refresh_work_proc(void)
|
|
|
hmi_write_num_or_blank("workSta.t6.txt=\"%s\"", device_status.clear_left, RT_FALSE); /* 清扫结束剩余(s) */
|
|
|
}
|
|
|
|
|
|
+/* ==================== 屏幕 debug1 调试页(2026-10-13 新增) ====================
|
|
|
+ * 对应陶晶驰(USART HMI)工程中的调试页 debug1,功能与协议如下:
|
|
|
+ * ① 信息区(t0 RT-Thread版本 / t1 内核 / t2 BSP型号 / t13 运行时长 / t5 BL版本 /
|
|
|
+ * t3 固件版本 / t4 编译时间 / t11+j0 CPU占用 / t12+j1 RAM占用 / t10 外挂Flash):
|
|
|
+ * 屏幕侧在该页定时器(或进入页面)下发 "getDebugData",固件整批刷新(HMI_WRITE 带重复过滤,
|
|
|
+ * 未变化的项不会重复占用串口带宽);
|
|
|
+ * ② 按钮区 b0~b9(屏幕弹起事件下发文本命令,以 "\r\n" 结束):
|
|
|
+ * reboot 重启(沿用既有分支 rt_hw_cpu_reset)
|
|
|
+ * bootloader 启动BL:置 stop_in_bootloader 并重启进入 BootLoader(沿用既有分支)
|
|
|
+ * startapp 启动APP:清除 stop_in_bootloader 并重启(下次直接启动 APP)
|
|
|
+ * dbg_on 打开调试:把 RT-Thread 控制台输出镜像到 debug1 底部文本框
|
|
|
+ * dbg_off 关闭调试:恢复原控制台设备
|
|
|
+ * dbg_clr 清空固件侧控制台缓存与屏幕文本框
|
|
|
+ * dbg_erase 擦除参数:恢复出厂默认参数(按供电类型走交流/电池两套默认值)
|
|
|
+ * dbg_restore 恢复固件:置 restore_pending + stop_in_bootloader 并重启进 BL,
|
|
|
+ * 由 BL 执行 df_area→app 恢复(BL 侧支持见交付说明;未支持时不会误动作)
|
|
|
+ * dbg:<命令> 把 <命令> 作为 msh 命令在本机执行,输出回传文本框(b4 发送按钮)
|
|
|
+ * ③ 调试控制台实现:注册只写"捕获设备" dbgcap,打开调试时 rt_console_set_device("dbgcap"),
|
|
|
+ * 此后 rt_kprintf / finsh / msh 的输出全部经其 write 回调缓存并推送屏幕文本框
|
|
|
+ * (换行按 TJC 官方约定用 "\r" 两字符转义下发,不能用 \n);同时经"转发设备"
|
|
|
+ * DBG1_CHAIN_DEV(默认 uart1) 原样转发,保证本机调试口日志不停流。命令执行放在
|
|
|
+ * 独立线程 dbg_exec_thread,避免 top 之类的长命令把屏幕刷新线程卡死。
|
|
|
+ * 注意(2026-10-13 修复):转发设备只 find 句柄、不自行 open/close,并在每次
|
|
|
+ * 控制台切换后由 dbg_chain_fixup() 补回接收模式位(详见该函数注释)——
|
|
|
+ * 否则 rt_serial_open 的 open_flag 覆盖会洗掉 INT_RX,导致本机口无法输入。
|
|
|
+ * ④ 屏幕文本框收发约定("单框收发"设计,与截图的底部 msh>> 框一致):
|
|
|
+ * - 固件每次下发的内容尾部都会附加一行提示符 "msh >> "(宏 DBG1_PROMPT);
|
|
|
+ * - 用户点框→键盘输入→按[发送](b4);b4 弹起事件发送:printh 64 62 67 3A("dbg:")
|
|
|
+ * + prints "debug1.<框名>.txt",0 + printh 0d 0a;
|
|
|
+ * - 固件收到 "dbg:"+整个框内容后,取**最后一个 ">>" 之后**的文本作为命令执行
|
|
|
+ * (无 ">>" 时按纯命令处理,兼容"独立输入框"的接法),执行结果回填框内。
|
|
|
+ * ⑤ 推送节流与页面联动:输出推送带最小间隔节流;且仅在"该页有心跳"(最近
|
|
|
+ * DBG1_PAGE_ALIVE_TICK 内收到过 getDebugData)时才推送——离开调试页后自动停推,
|
|
|
+ * 返回调试页后自动恢复(缓存不丢,回页即见最新内容)。
|
|
|
+ * 注意:打开调试期间本机 UART1 调试口日志经转发保留;控制台设备在"关闭调试"后恢复原样。
|
|
|
+ * 维护提示:屏幕控件名若变化,仅需改 DBG1_CON_OBJ 宏及下方各 HMI_WRITE 中的控件名。 */
|
|
|
+#define DBG1_CON_OBJ "msh" /* 底部调试文本框对象名(改名只需改这一处) */
|
|
|
+#define DBG1_PROMPT "msh >> " /* 文本框尾部提示符(兼作命令提取锚点) */
|
|
|
+#define DBG1_CHAIN_DEV "uart1" /* 日志转发设备(本机调试口);置 "" 可关闭转发 */
|
|
|
+#define DBG1_CAP_DEV_NAME "dbgcap" /* 控制台捕获设备名(仅固件内部使用) */
|
|
|
+#define DBG1_CON_RAW_MAX 200 /* 行缓存上限(约文本框一屏可见字符数,可调) */
|
|
|
+#define DBG1_CON_ESC_MAX 220 /* 单次下发转义后上限(受 HMI_WRITE 内部 256B 缓冲限制) */
|
|
|
+#define DBG1_CON_PUSH_MAX 120 /* 单次下发取缓存尾部长度(转义前)。受"b4 发送会回传整框"
|
|
|
+ * 约束:中文按 UTF-8 3B/字,120 字符最坏 360B,
|
|
|
+ * 加提示符与用户输入仍小于单帧上限 HMI_FRAME_MAX(512) */
|
|
|
+#define DBG1_CMD_MAX 100 /* 屏幕控制台单条命令最大长度 */
|
|
|
+#define DBG1_EXEC_PRIO 22 /* 调试命令执行线程优先级(低于屏幕线程) */
|
|
|
+#define DBG1_EXEC_STACK_SIZE 3072 /* 调试命令执行线程栈 */
|
|
|
+#define DBG1_FLUSH_MIN_TICK 30 /* 输出推送最小间隔(tick,10ms/tick;纯节流不丢行) */
|
|
|
+#define DBG1_PAGE_ALIVE_TICK 500 /* 调试页心跳存活窗口(5s):超过则暂停推送,离开页面不再占带宽 */
|
|
|
+#define DBG1_BSP_NAME "STM32F103RE" /* t2 BSP型号显示(按实际板卡调整) */
|
|
|
+#define DBG1_CORE_NAME "Cortex-M3" /* t1 内核显示(如需改成内核版本号改这里) */
|
|
|
+
|
|
|
+static char dbg_con_raw[DBG1_CON_RAW_MAX + 2]; /* 控制台行缓存(屏幕文本框内容源) */
|
|
|
+static rt_uint16_t dbg_con_len = 0;
|
|
|
+static rt_bool_t dbg_mirror_on = RT_FALSE; /* 控制台是否已镜像到屏幕(打开调试) */
|
|
|
+static char dbg_saved_console[RT_NAME_MAX + 1]; /* 打开调试前的控制台设备名 */
|
|
|
+static struct rt_device dbg_con_dev; /* 只写捕获设备(dbgcap) */
|
|
|
+static rt_bool_t dbg_con_dev_ready = RT_FALSE;
|
|
|
+static rt_device_t dbg_chain_dev = RT_NULL; /* 日志转发设备句柄(只 find,不持有引用;见 dbg_chain_fixup) */
|
|
|
+static volatile rt_tick_t s_dbg1_page_tick = 0; /* 最近一次收到 getDebugData 的时刻(0=从未) */
|
|
|
+
|
|
|
+static struct rt_thread dbg_exec_thread;
|
|
|
+static rt_uint8_t dbg_exec_stack[DBG1_EXEC_STACK_SIZE];
|
|
|
+static struct rt_semaphore dbg_exec_sem;
|
|
|
+static char dbg_cmd_buf[DBG1_CMD_MAX + 1];
|
|
|
+static volatile rt_uint8_t dbg_exec_busy = 0;
|
|
|
+static rt_bool_t dbg_exec_inited = RT_FALSE;
|
|
|
+static rt_bool_t dbg_exec_ready = RT_FALSE;
|
|
|
+
|
|
|
+/* ---------- 控制台行缓存与屏幕推送 ---------- */
|
|
|
+static void dbg_con_append(const char *s, rt_uint16_t n)
|
|
|
+{
|
|
|
+ if (n == 0)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ /* 缓存满:丢弃最旧内容(优先从行边界截断),保留最新输出 */
|
|
|
+ if ((rt_uint32_t)dbg_con_len + n > DBG1_CON_RAW_MAX)
|
|
|
+ {
|
|
|
+ rt_uint16_t cut = (dbg_con_len > (DBG1_CON_RAW_MAX / 3)) ? (dbg_con_len - DBG1_CON_RAW_MAX / 3) : 0;
|
|
|
+
|
|
|
+ while (cut < dbg_con_len && dbg_con_raw[cut] != '\n')
|
|
|
+ {
|
|
|
+ cut++;
|
|
|
+ }
|
|
|
+ cut = (cut < dbg_con_len) ? (cut + 1) : dbg_con_len;
|
|
|
+ if (cut > 0)
|
|
|
+ {
|
|
|
+ rt_memmove(dbg_con_raw, dbg_con_raw + cut, dbg_con_len - cut);
|
|
|
+ dbg_con_len -= cut;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (n > DBG1_CON_RAW_MAX - dbg_con_len) /* 单次超长:只保留尾部 */
|
|
|
+ {
|
|
|
+ s += (n - (DBG1_CON_RAW_MAX - dbg_con_len));
|
|
|
+ n = DBG1_CON_RAW_MAX - dbg_con_len;
|
|
|
+ }
|
|
|
+ rt_memcpy(dbg_con_raw + dbg_con_len, s, n);
|
|
|
+ dbg_con_len += n;
|
|
|
+ dbg_con_raw[dbg_con_len] = '\0';
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_con_puts(const char *s)
|
|
|
+{
|
|
|
+ dbg_con_append(s, (rt_uint16_t)rt_strlen(s));
|
|
|
+}
|
|
|
+
|
|
|
+/* 把行缓存转义后推送到屏幕文本框。
|
|
|
+ * TJC 字符串转义(官方 wiki 约定):换行 -> "\r"(\ 和 r 两个字符,不要用 \n);双引号 -> \"。
|
|
|
+ * 下发内容 = [缓存尾部] + 换行 + 提示符 DBG1_PROMPT —— 提示符固定收尾,用户直接在框尾
|
|
|
+ * 输入命令后按[发送],固件即可按"最后一个 >> 之后"提取命令(见 dbg_exec_submit)。
|
|
|
+ * force=RT_FALSE 时按 DBG1_FLUSH_MIN_TICK 做最小间隔节流(只影响推送时机,不丢内容);
|
|
|
+ * 页面心跳消失(离开调试页)超过 DBG1_PAGE_ALIVE_TICK 时暂存不推,回页后自动恢复。 */
|
|
|
+static void dbg_con_flush(rt_bool_t force)
|
|
|
+{
|
|
|
+ static rt_tick_t s_last_flush = 0;
|
|
|
+ char esc[DBG1_CON_ESC_MAX + 1];
|
|
|
+ rt_uint16_t i, n = 0, raw_len = dbg_con_len;
|
|
|
+ const char *p = dbg_con_raw;
|
|
|
+
|
|
|
+ if (raw_len == 0 || rt_interrupt_get_nest() != 0) /* 中断上下文不推送,等下次 */
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ /* 页面联动:从未收到心跳或心跳已停(离开调试页)时暂不推送 */
|
|
|
+ if (s_dbg1_page_tick == 0 ||
|
|
|
+ (rt_tick_get() - s_dbg1_page_tick) > DBG1_PAGE_ALIVE_TICK)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (force == RT_FALSE && (rt_tick_get() - s_last_flush) < DBG1_FLUSH_MIN_TICK)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ s_last_flush = rt_tick_get();
|
|
|
+
|
|
|
+ if (raw_len > DBG1_CON_PUSH_MAX) /* 超长只保留尾部(屏幕一屏可见有限) */
|
|
|
+ {
|
|
|
+ p += (raw_len - DBG1_CON_PUSH_MAX);
|
|
|
+ raw_len = DBG1_CON_PUSH_MAX;
|
|
|
+ }
|
|
|
+ for (i = 0; i < raw_len && n < DBG1_CON_ESC_MAX - 16; i++)
|
|
|
+ {
|
|
|
+ char c = p[i];
|
|
|
+
|
|
|
+ if (c == '\n')
|
|
|
+ {
|
|
|
+ if (n < DBG1_CON_ESC_MAX - 16) { esc[n++] = '\\'; esc[n++] = 'r'; }
|
|
|
+ }
|
|
|
+ else if (c == '"')
|
|
|
+ {
|
|
|
+ if (n < DBG1_CON_ESC_MAX - 16) { esc[n++] = '\\'; esc[n++] = '"'; }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ esc[n++] = c;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (n > 0 && esc[n - 1] == '\\') /* 截断落在转义符中间时丢弃半个转义 */
|
|
|
+ {
|
|
|
+ n--;
|
|
|
+ }
|
|
|
+ /* 追加换行 + 提示符(预留空间已在循环上限扣除) */
|
|
|
+ esc[n++] = '\\';
|
|
|
+ esc[n++] = 'r';
|
|
|
+ for (i = 0; DBG1_PROMPT[i] != '\0' && n < DBG1_CON_ESC_MAX; i++)
|
|
|
+ {
|
|
|
+ esc[n++] = DBG1_PROMPT[i];
|
|
|
+ }
|
|
|
+ esc[n] = '\0';
|
|
|
+ HMI_WRITE("debug1." DBG1_CON_OBJ ".txt=\"%s\"", esc);
|
|
|
+}
|
|
|
+
|
|
|
+/* ---------- 控制台捕获设备(只写,替代 uart1 作为 rt_console_set_device 目标) ---------- */
|
|
|
+static rt_err_t dbg_con_dev_open(rt_device_t dev, rt_uint16_t oflag)
|
|
|
+{
|
|
|
+ (void)dev; (void)oflag;
|
|
|
+ return RT_EOK;
|
|
|
+}
|
|
|
+
|
|
|
+static rt_err_t dbg_con_dev_close(rt_device_t dev)
|
|
|
+{
|
|
|
+ (void)dev;
|
|
|
+ return RT_EOK;
|
|
|
+}
|
|
|
+
|
|
|
+static rt_size_t dbg_con_dev_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
|
|
|
+{
|
|
|
+ (void)dev; (void)pos; (void)buffer; (void)size;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+/* 捕获 rt_kprintf/finsh/msh 的全部输出:① 转发到 DBG1_CHAIN_DEV(本机调试口,保持日志不停流);
|
|
|
+ * ② 过滤 ANSI 转义与编辑控制字符后按行入缓存,行尾或节流点推送屏幕(页面心跳存在时)。 */
|
|
|
+static rt_size_t dbg_con_dev_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
|
|
+{
|
|
|
+ static rt_uint8_t s_esc = 0; /* ANSI 转义过滤状态机:0-普通 1-已见ESC 2-ESC[ 序列 */
|
|
|
+ const char *p = (const char *)buffer;
|
|
|
+ rt_size_t i;
|
|
|
+
|
|
|
+ (void)dev; (void)pos;
|
|
|
+
|
|
|
+ /* ① 本机调试口转发(best effort:设备未打开则静默跳过) */
|
|
|
+ if (dbg_chain_dev != RT_NULL)
|
|
|
+ {
|
|
|
+ rt_device_write(dbg_chain_dev, 0, buffer, size);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (i = 0; i < size; i++)
|
|
|
+ {
|
|
|
+ char c = p[i];
|
|
|
+
|
|
|
+ if (s_esc == 0)
|
|
|
+ {
|
|
|
+ if ((rt_uint8_t)c == 0x1B) { s_esc = 1; continue; }
|
|
|
+ }
|
|
|
+ else if (s_esc == 1)
|
|
|
+ {
|
|
|
+ s_esc = (c == '[') ? 2 : 0;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if ((rt_uint8_t)c >= 0x40 && (rt_uint8_t)c <= 0x7E) s_esc = 0;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (c == '\n')
|
|
|
+ {
|
|
|
+ dbg_con_append("\n", 1);
|
|
|
+ if (dbg_mirror_on || dbg_exec_busy) dbg_con_flush(RT_FALSE);
|
|
|
+ }
|
|
|
+ else if (c == '\t')
|
|
|
+ {
|
|
|
+ dbg_con_append(" ", 1);
|
|
|
+ }
|
|
|
+ else if (c == '\r' || (rt_uint8_t)c < 0x20 || (rt_uint8_t)c == 0x7F)
|
|
|
+ {
|
|
|
+ /* \r 与其它控制字符(含 finsh 编辑用的 \b)不显示 */
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ dbg_con_append(&c, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return size;
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_con_dev_init(void)
|
|
|
+{
|
|
|
+ if (dbg_con_dev_ready)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ rt_memset(&dbg_con_dev, 0, sizeof(dbg_con_dev));
|
|
|
+ dbg_con_dev.type = RT_Device_Class_Char;
|
|
|
+ dbg_con_dev.rx_indicate = RT_NULL;
|
|
|
+ dbg_con_dev.tx_complete = RT_NULL;
|
|
|
+ dbg_con_dev.init = RT_NULL;
|
|
|
+ dbg_con_dev.open = dbg_con_dev_open;
|
|
|
+ dbg_con_dev.close = dbg_con_dev_close;
|
|
|
+ dbg_con_dev.read = dbg_con_dev_read;
|
|
|
+ dbg_con_dev.write = dbg_con_dev_write;
|
|
|
+ dbg_con_dev.control = RT_NULL;
|
|
|
+ if (rt_device_register(&dbg_con_dev, DBG1_CAP_DEV_NAME, RT_DEVICE_FLAG_STREAM) == RT_EOK)
|
|
|
+ {
|
|
|
+ dbg_con_dev_ready = RT_TRUE;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* ---------- 本机调试口"读路径保护"(2026-10-13 修复:打开调试后串口无法输入) ----------
|
|
|
+ * 现象:点"打开调试"后,PC 上的调试串口(本机口 uart1)敲键盘无任何反应。
|
|
|
+ * 根因(已读内核源码取证):
|
|
|
+ * RT-Thread 4.0.2 的 rt_serial_open() 用 `dev->open_flag = oflag & 0xff` 无条件覆盖
|
|
|
+ * 设备标志位(components/drivers/serial/serial.c:593),而
|
|
|
+ * RT_DEVICE_FLAG_INT_RX(0x100) 高于 0xff —— 任何一次"不带 INT_RX 的 open"
|
|
|
+ * (如 rt_console_set_device() 内部的 OFLAG_RDWR|STREAM)都会把接收模式位洗掉。
|
|
|
+ * 而接收路径 rt_serial_read() 按该位选模式(serial.c:803):位丢失后
|
|
|
+ * tshell 的 read() 掉进 _serial_poll_rx 轮询分支(stm32_getc 直读 RDR 寄存器),
|
|
|
+ * 字符却早已被 RX 中断搬进 fifo —— fifo 里的输入永远读不出来,即"无法输入"。
|
|
|
+ * 处理:uart1 的 fifo/RX 中断本身不受影响(引用计数从未归零,device.c 的 close
|
|
|
+ * 只在 ref 减到 0 时才真正关闭设备),**唯一要做的就是把接收模式位补回 open_flag**:
|
|
|
+ * ① dbg_chain_fixup():记录 uart1 原始接收模式位(INT_RX/DMA_RX)并补回;
|
|
|
+ * ② 每次控制台切换(打开/关闭调试、屏幕命令的临时切换)之后都调用一次;
|
|
|
+ * ③ 调试页心跳(每秒 getDebugData)也调用 —— 即使其它代码误改,1 秒内自愈。
|
|
|
+ * 另:不再自行 open/close 转发设备(旧实现的 open 正是肇事者,close 还会错配引用
|
|
|
+ * 计数),转发只需 rt_device_write 时设备已被 finsh/console 持有引用即可。 */
|
|
|
+static rt_uint16_t dbg_chain_rx_flag = 0; /* 本机口的接收模式位(INT_RX/DMA_RX),首次读取后固定 */
|
|
|
+
|
|
|
+static void dbg_chain_fixup(void)
|
|
|
+{
|
|
|
+ struct rt_serial_device *ser;
|
|
|
+
|
|
|
+ if (DBG1_CHAIN_DEV[0] == '\0') /* 置 "" 关闭转发(编译期常量) */
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (dbg_chain_dev == RT_NULL)
|
|
|
+ {
|
|
|
+ dbg_chain_dev = rt_device_find(DBG1_CHAIN_DEV);
|
|
|
+ if (dbg_chain_dev == RT_NULL)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ser = (struct rt_serial_device *)dbg_chain_dev;
|
|
|
+
|
|
|
+ if (dbg_chain_rx_flag == 0)
|
|
|
+ {
|
|
|
+ /* 首次:从当前 open_flag 读接收模式(uart1 无 DMA 配置,默认 INT_RX) */
|
|
|
+ dbg_chain_rx_flag = dbg_chain_dev->open_flag &
|
|
|
+ (RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_DMA_RX);
|
|
|
+ if (dbg_chain_rx_flag == 0)
|
|
|
+ {
|
|
|
+ dbg_chain_rx_flag = RT_DEVICE_FLAG_INT_RX;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (ser->serial_rx == RT_NULL)
|
|
|
+ {
|
|
|
+ /* 接收 fifo 不存在(设备曾被整体关闭过)→ 重新 open 重建 fifo 并重开 RX 中断。
|
|
|
+ * open 走"首次打开"分支,会 malloc fifo 并执行 SET_INT(见 serial.c:596-615),
|
|
|
+ * 且 open 的 oflag 已带接收位,open_flag 自动正确。 */
|
|
|
+ rt_device_open(dbg_chain_dev, RT_DEVICE_OFLAG_RDWR | dbg_chain_rx_flag | RT_DEVICE_FLAG_STREAM);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 补回接收模式位(仅设备框架层标志,不动硬件;fifo 数据原样可读) */
|
|
|
+ dbg_chain_dev->open_flag |= dbg_chain_rx_flag;
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_console_save(void)
|
|
|
+{
|
|
|
+ rt_device_t cur = rt_console_get_device();
|
|
|
+
|
|
|
+ /* 已处于捕获设备(如执行线程临时切换期间被并发调用)时不覆盖记录,
|
|
|
+ * 否则"关闭调试"会恢复到 dbgcap 上,永远回不到真实控制台 */
|
|
|
+ if (cur != RT_NULL && rt_strcmp(cur->parent.name, DBG1_CAP_DEV_NAME) == 0)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (cur != RT_NULL) rt_strncpy(dbg_saved_console, cur->parent.name, RT_NAME_MAX);
|
|
|
+ else rt_strncpy(dbg_saved_console, "uart1", RT_NAME_MAX);
|
|
|
+ dbg_saved_console[RT_NAME_MAX] = '\0';
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_console_restore(void)
|
|
|
+{
|
|
|
+ if (dbg_saved_console[0] != '\0') rt_console_set_device(dbg_saved_console);
|
|
|
+ else rt_console_set_device("uart1");
|
|
|
+}
|
|
|
+
|
|
|
+/* ---------- 屏幕控制台:命令执行(独立线程,防长命令卡死屏幕线程) ---------- */
|
|
|
+static rt_bool_t dbg_cmd_is_blocking(const char *cmd)
|
|
|
+{
|
|
|
+ while (*cmd == ' ' || *cmd == '\t')
|
|
|
+ {
|
|
|
+ cmd++;
|
|
|
+ }
|
|
|
+ /* top/Msh_DisplaySysMonitor 为持续刷新命令,在屏幕控制台里无法按键退出,直接拒绝 */
|
|
|
+ if (rt_strncmp(cmd, "top", 3) == 0 && (cmd[3] == '\0' || cmd[3] == ' '))
|
|
|
+ {
|
|
|
+ return RT_TRUE;
|
|
|
+ }
|
|
|
+ if (rt_strncmp(cmd, "Msh_DisplaySysMonitor", 21) == 0)
|
|
|
+ {
|
|
|
+ return RT_TRUE;
|
|
|
+ }
|
|
|
+ return RT_FALSE;
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_exec_run(void)
|
|
|
+{
|
|
|
+ rt_bool_t switched = RT_FALSE;
|
|
|
+ char cmd[DBG1_CMD_MAX + 1];
|
|
|
+
|
|
|
+ rt_memcpy(cmd, dbg_cmd_buf, DBG1_CMD_MAX + 1);
|
|
|
+ cmd[DBG1_CMD_MAX] = '\0';
|
|
|
+
|
|
|
+ if (dbg_cmd_is_blocking(cmd))
|
|
|
+ {
|
|
|
+ dbg_con_puts("(该命令为持续刷新命令,不支持屏幕控制台执行)\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 未开镜像时临时把控制台切到捕获设备,保证 msh 输出可被捕获 */
|
|
|
+ if (dbg_mirror_on == RT_FALSE)
|
|
|
+ {
|
|
|
+ dbg_con_dev_init();
|
|
|
+ if (rt_device_find(DBG1_CAP_DEV_NAME) == RT_NULL)
|
|
|
+ {
|
|
|
+ dbg_con_puts("(捕获设备未就绪,命令未执行)\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ dbg_console_save();
|
|
|
+ rt_console_set_device(DBG1_CAP_DEV_NAME); /* 转发只需设备引用,无需自行 open */
|
|
|
+ switched = RT_TRUE;
|
|
|
+ }
|
|
|
+
|
|
|
+ dbg_con_puts("msh> ");
|
|
|
+ dbg_con_puts(cmd);
|
|
|
+ dbg_con_append("\n", 1);
|
|
|
+ dbg_con_flush(RT_FALSE);
|
|
|
+
|
|
|
+ msh_exec(cmd, rt_strlen(cmd)); /* 输出经控制台进入捕获设备 -> 行缓存 -> 屏幕 */
|
|
|
+
|
|
|
+ if (switched)
|
|
|
+ {
|
|
|
+ dbg_console_restore(); /* 恢复控制台;其内部 open 会洗掉接收位 */
|
|
|
+ dbg_chain_fixup(); /* 补回本机口接收模式位,保 tshell 输入 */
|
|
|
+ }
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_exec_thread_entry(void *parameter)
|
|
|
+{
|
|
|
+ (void)parameter;
|
|
|
+ while (1)
|
|
|
+ {
|
|
|
+ if (rt_sem_take(&dbg_exec_sem, RT_WAITING_FOREVER) != RT_EOK)
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ dbg_exec_busy = 1;
|
|
|
+ dbg_exec_run();
|
|
|
+ dbg_exec_busy = 0;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_exec_init(void)
|
|
|
+{
|
|
|
+ if (dbg_exec_inited)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ dbg_exec_inited = RT_TRUE;
|
|
|
+ rt_sem_init(&dbg_exec_sem, "dbgsem", 0, RT_IPC_FLAG_FIFO);
|
|
|
+ if (rt_thread_init(&dbg_exec_thread, "dbgexec", dbg_exec_thread_entry, RT_NULL,
|
|
|
+ dbg_exec_stack, sizeof(dbg_exec_stack), DBG1_EXEC_PRIO, 10) == RT_EOK)
|
|
|
+ {
|
|
|
+ rt_thread_startup(&dbg_exec_thread);
|
|
|
+ dbg_exec_ready = RT_TRUE;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* 从 "dbg:" 之后的载荷中提取命令并提交执行线程。
|
|
|
+ * 载荷 = 屏幕文本框的整个内容("单框收发"设计),提取规则:
|
|
|
+ * 取**最后一个 ">>"** 之后的文本作为命令(框尾固定有提示符 "msh >> ",用户在其后输入);
|
|
|
+ * 载荷中不含 ">>" 时按"纯命令"处理(兼容另接独立命令输入框的用法);
|
|
|
+ * 再裁剪:跳过前导空白、截至行尾/上限、去尾部空白。 */
|
|
|
+static void dbg_exec_submit(const char *payload)
|
|
|
+{
|
|
|
+ const char *cmd = payload;
|
|
|
+ const char *p = payload;
|
|
|
+ const char *last = RT_NULL;
|
|
|
+ rt_uint16_t n = 0;
|
|
|
+
|
|
|
+ dbg_exec_init();
|
|
|
+
|
|
|
+ while ((p = rt_strstr(p, ">>")) != RT_NULL) /* 定位最后一个 ">>" */
|
|
|
+ {
|
|
|
+ last = p;
|
|
|
+ p += 2;
|
|
|
+ }
|
|
|
+ if (last != RT_NULL)
|
|
|
+ {
|
|
|
+ cmd = last + 2;
|
|
|
+ }
|
|
|
+ while (*cmd == ' ' || *cmd == '\t') /* 跳过提示符后的空白 */
|
|
|
+ {
|
|
|
+ cmd++;
|
|
|
+ }
|
|
|
+ while (cmd[n] != '\0' && cmd[n] != '\r' && cmd[n] != '\n' && n < DBG1_CMD_MAX)
|
|
|
+ {
|
|
|
+ dbg_cmd_buf[n] = cmd[n];
|
|
|
+ n++;
|
|
|
+ }
|
|
|
+ while (n > 0 && (dbg_cmd_buf[n - 1] == ' ' || dbg_cmd_buf[n - 1] == '\t'))
|
|
|
+ {
|
|
|
+ n--;
|
|
|
+ }
|
|
|
+ dbg_cmd_buf[n] = '\0';
|
|
|
+ if (n == 0)
|
|
|
+ {
|
|
|
+ return; /* 空命令(只发了提示符)不处理 */
|
|
|
+ }
|
|
|
+ if (dbg_exec_ready == RT_FALSE)
|
|
|
+ {
|
|
|
+ dbg_con_puts("(调试执行线程创建失败)\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (dbg_exec_busy)
|
|
|
+ {
|
|
|
+ dbg_con_puts("(上一条命令仍在执行,请稍候)\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ rt_sem_release(&dbg_exec_sem);
|
|
|
+}
|
|
|
+
|
|
|
+/* ---------- debug1 按钮处理 ---------- */
|
|
|
+static void dbg_console_on(void)
|
|
|
+{
|
|
|
+ dbg_con_dev_init();
|
|
|
+ if (rt_device_find(DBG1_CAP_DEV_NAME) == RT_NULL)
|
|
|
+ {
|
|
|
+ dbg_con_puts("(捕获设备注册失败,无法打开屏幕调试)\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (dbg_mirror_on == RT_FALSE)
|
|
|
+ {
|
|
|
+ dbg_console_save(); /* 记录当前控制台(uart1) */
|
|
|
+ rt_console_set_device(DBG1_CAP_DEV_NAME); /* 输出切到捕获设备;日志仍转发本机口 */
|
|
|
+ dbg_chain_fixup(); /* 保住本机口接收模式位,PC 输入不受影响 */
|
|
|
+ dbg_mirror_on = RT_TRUE;
|
|
|
+ }
|
|
|
+ dbg_con_puts("--- 屏幕调试已打开:日志同步到本框;在提示符后输入命令按[发送] ---\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_console_off(void)
|
|
|
+{
|
|
|
+ if (dbg_mirror_on)
|
|
|
+ {
|
|
|
+ dbg_console_restore(); /* 恢复控制台:内部 open 会洗掉接收模式位 */
|
|
|
+ dbg_mirror_on = RT_FALSE;
|
|
|
+ dbg_chain_fixup(); /* 必须补回,否则恢复后本机口无法输入 */
|
|
|
+ }
|
|
|
+ dbg_con_puts("--- 屏幕调试已关闭(控制台已恢复) ---\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_con_clear(void)
|
|
|
+{
|
|
|
+ dbg_con_len = 0;
|
|
|
+ dbg_con_raw[0] = '\0';
|
|
|
+ /* 复位重复过滤表:否则本调用点缓存仍是上次发出的内容,
|
|
|
+ * 二次点击"清空"(期间文本框已被日志刷新)会被去重逻辑跳过 */
|
|
|
+ hmi_dedupe_reset();
|
|
|
+ HMI_WRITE("debug1." DBG1_CON_OBJ ".txt=\"" DBG1_PROMPT "\""); /* 清空后仅保留提示符便于继续输入 */
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_erase_params(void)
|
|
|
+{
|
|
|
+ LOG_I("debug1: 擦除参数(恢复出厂默认)");
|
|
|
+ if (device_status.Power_Type == 1) ResetParamDefault_DC(); /* 电池供电默认值 */
|
|
|
+ else ResetParamDefault(); /* 交流供电默认值 */
|
|
|
+ dbg_con_puts("--- 参数已恢复出厂默认值 ---\n");
|
|
|
+ dbg_con_flush(RT_TRUE);
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_start_app(void)
|
|
|
+{
|
|
|
+ LOG_I("debug1: 启动APP(清除BL停留标志), 重启");
|
|
|
+ device_status.stop_in_bootloader = 0;
|
|
|
+ ef_set_env_blob("stop_in_bootloader", &device_status.stop_in_bootloader,
|
|
|
+ sizeof(device_status.stop_in_bootloader));
|
|
|
+ rt_thread_mdelay(200);
|
|
|
+ rt_hw_cpu_reset();
|
|
|
+}
|
|
|
+
|
|
|
+static void dbg_restore_fw(void)
|
|
|
+{
|
|
|
+ uint8_t pending = 1;
|
|
|
+
|
|
|
+ LOG_I("debug1: 恢复固件(置标志并重启进BL)");
|
|
|
+ /* APP 正在 app 分区运行,不能自擦运行分区;置标志重启进 BL 恢复。
|
|
|
+ * restore_pending:供 BL 读取(BL 支持后自动执行 df_area→app 恢复)。 */
|
|
|
+ device_status.stop_in_bootloader = 1;
|
|
|
+ ef_set_env_blob("stop_in_bootloader", &device_status.stop_in_bootloader,
|
|
|
+ sizeof(device_status.stop_in_bootloader));
|
|
|
+ ef_set_env_blob("restore_pending", &pending, sizeof(pending));
|
|
|
+ rt_thread_mdelay(200);
|
|
|
+ rt_hw_cpu_reset();
|
|
|
+}
|
|
|
+
|
|
|
+/* debug1 页指令分发:返回 RT_TRUE 表示指令属于 debug1 并已处理。
|
|
|
+ * 注意:调用点必须放在 HMI_Decode 的 if/else 链最前 —— "dbg:<命令>" 的
|
|
|
+ * 命令内容里可能包含 reboot/clear 等既有分支的关键字,不能让它们先匹配。
|
|
|
+ * 另:能收到本页按钮指令即证明用户停留在调试页,匹配成功时顺带刷新页面心跳
|
|
|
+ * (s_dbg1_page_tick),使按钮在未配 1 秒心跳定时器时也能独立工作。 */
|
|
|
+static rt_bool_t hmi_debug1_handle(const char *frame)
|
|
|
+{
|
|
|
+ if (rt_strncmp(frame, "dbg:", 4) == 0) /* b4 发送:执行控制台命令 */
|
|
|
+ {
|
|
|
+ s_dbg1_page_tick = rt_tick_get();
|
|
|
+ dbg_exec_submit(frame + 4);
|
|
|
+ return RT_TRUE;
|
|
|
+ }
|
|
|
+ if (strstr(frame, "dbg_on") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_console_on(); return RT_TRUE; }
|
|
|
+ if (strstr(frame, "dbg_off") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_console_off(); return RT_TRUE; }
|
|
|
+ if (strstr(frame, "dbg_clr") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_con_clear(); return RT_TRUE; }
|
|
|
+ if (strstr(frame, "dbg_erase") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_erase_params(); return RT_TRUE; }
|
|
|
+ if (strstr(frame, "dbg_restore") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_restore_fw(); return RT_TRUE; }
|
|
|
+ if (strstr(frame, "startapp") != RT_NULL) { s_dbg1_page_tick = rt_tick_get(); dbg_start_app(); return RT_TRUE; }
|
|
|
+ return RT_FALSE;
|
|
|
+}
|
|
|
+
|
|
|
+/* ---------- debug1 信息区整批刷新("getDebugData" 触发) ---------- */
|
|
|
+static void hmi_refresh_debug1(void)
|
|
|
+{
|
|
|
+ char buf[48];
|
|
|
+ rt_uint32_t total = 0, used = 0, max_used = 0, sec, pct = 0;
|
|
|
+ sfud_flash_t nor;
|
|
|
+
|
|
|
+ sys_monitor_refresh(); /* CPU 利用率 / 运行时长(非阻塞,任意线程可用) */
|
|
|
+
|
|
|
+ /* t0 RT-Thread版本 / t1 内核 / t2 BSP型号 */
|
|
|
+ rt_snprintf(buf, sizeof(buf), "%d.%d.%d", (int)RT_VERSION, (int)RT_SUBVERSION, (int)RT_REVISION);
|
|
|
+ HMI_WRITE("debug1.t0.txt=\"%s\"", buf);
|
|
|
+ HMI_WRITE("debug1.t1.txt=\"%s\"", DBG1_CORE_NAME);
|
|
|
+ HMI_WRITE("debug1.t2.txt=\"%s\"", DBG1_BSP_NAME);
|
|
|
+
|
|
|
+ /* t13 运行时长(天 时:分) */
|
|
|
+ sec = (rt_uint32_t)(rt_tick_get() / RT_TICK_PER_SECOND);
|
|
|
+ rt_snprintf(buf, sizeof(buf), "%lu:%02lu:%d",
|
|
|
+ (unsigned long)((sec % 86400) / 3600),
|
|
|
+ (unsigned long)((sec % 3600) / 60),sec);
|
|
|
+ HMI_WRITE("debug1.t13.txt=\"%s\"", buf);
|
|
|
+
|
|
|
+ /* 版本区:t5 BL版本 / t3 固件版本 / t4 编译时间 */
|
|
|
+ HMI_WRITE("debug1.t5.txt=\"%s\"", device_status.driver_bl);
|
|
|
+ HMI_WRITE("debug1.t3.txt=\"%s\"", device_status.driver);
|
|
|
+ HMI_WRITE("debug1.t4.txt=\"%s\"", device_status.driver_compile);
|
|
|
+
|
|
|
+ /* CPU:t11 文本 + j0 进度条(0-100) */
|
|
|
+ HMI_WRITE("debug1.t11.txt=\"%d%%\"", system_status.cpu_usage);
|
|
|
+ HMI_WRITE("debug1.j0.val=%d", system_status.cpu_usage);
|
|
|
+
|
|
|
+ /* RAM:t12 文本 + j1 进度条(0-100) */
|
|
|
+ rt_memory_info(&total, &used, &max_used);
|
|
|
+ if (total > 0)
|
|
|
+ {
|
|
|
+ pct = (rt_uint32_t)used * 100 / total;
|
|
|
+ rt_snprintf(buf, sizeof(buf), "%lu%%", (unsigned long)pct);
|
|
|
+ HMI_WRITE("debug1.t12.txt=\"%s\"", buf);
|
|
|
+ HMI_WRITE("debug1.j1.val=%d", (int)pct);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ HMI_WRITE("debug1.t12.txt=\"%s\"", "N/A");
|
|
|
+ HMI_WRITE("debug1.j1.val=%d", 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* t10 外挂Flash(SFUD 探测结果:型号 + 容量) */
|
|
|
+ nor = rt_sfud_flash_find_by_dev_name(FAL_USING_NOR_FLASH_DEV_NAME);
|
|
|
+ if (nor != RT_NULL)
|
|
|
+ {
|
|
|
+ rt_snprintf(buf, sizeof(buf), "%s %uMB", nor->chip.name,
|
|
|
+ (unsigned)(nor->chip.capacity / (1024 * 1024)));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ rt_snprintf(buf, sizeof(buf), "未检测到");
|
|
|
+ }
|
|
|
+ HMI_WRITE("debug1.t10.txt=\"%s\"", buf);
|
|
|
+}
|
|
|
+
|
|
|
/* 屏幕版本握手串变化检测。
|
|
|
* 说明:屏幕心跳里 SwversionV** 可能与 getFullData 一样每秒都发,
|
|
|
* 若每次都复位重复过滤表会让去重完全失效;因此只在"版本串发生变化"时复位
|
|
|
@@ -1010,13 +1681,31 @@ static rt_bool_t hmi_ver_changed(const char *frame)
|
|
|
|
|
|
static void HMI_Decode(void)
|
|
|
{
|
|
|
+ char tmp[128];
|
|
|
time_t now = time(RT_NULL);
|
|
|
static struct tm tm;
|
|
|
gmtime_r(&now, &tm);
|
|
|
char *json_temp;
|
|
|
char *var=NULL;
|
|
|
if(device_status.refresh_num==0) device_status.refresh_num = 10;
|
|
|
- if(strstr(rx_buffer,"SwversionV") != NULL || strstr(rx_buffer,"getFullData") != NULL)
|
|
|
+ /* ---- 屏幕 debug1 调试页:心跳刷新(getDebugData)+ 按钮/控制台指令 ----
|
|
|
+ * 必须放在 if/else 链最前:dbg:<命令> 的内容里可能包含 reboot/clear 等
|
|
|
+ * 既有分支的关键字,让它们先匹配会导致误动作。 */
|
|
|
+ if (strstr(rx_buffer, "getDebugData") != RT_NULL)
|
|
|
+ {
|
|
|
+ s_dbg1_page_tick = rt_tick_get(); /* 调试页心跳:离开该页(超时)后暂停日志推送 */
|
|
|
+ dbg_chain_fixup(); /* 自愈:本机口接收位若被其它路径改动,1 秒内自动恢复 */
|
|
|
+ HMI_BATCH_BEGIN();
|
|
|
+ hmi_refresh_debug1();
|
|
|
+ dbg_con_flush(RT_FALSE); /* 回页/持续在页:把最新控制台内容补推一次(带去重) */
|
|
|
+ HMI_BATCH_END();
|
|
|
+ }
|
|
|
+ else if (hmi_debug1_handle(rx_buffer))
|
|
|
+ {
|
|
|
+ /* debug1 指令已处理(dbg:/dbg_on/dbg_off/dbg_clr/dbg_erase/dbg_restore/startapp),
|
|
|
+ * 页面心跳已在处理函数内随之刷新。 */
|
|
|
+ }
|
|
|
+ else if(strstr(rx_buffer,"SwversionV") != NULL || strstr(rx_buffer,"getFullData") != NULL)
|
|
|
{
|
|
|
/* 屏幕版本握手串变化(换型号/换页面工程) → 复位重复过滤表,立即整页全量刷新 */
|
|
|
if (strstr(rx_buffer,"SwversionV") != NULL && hmi_ver_changed(rx_buffer))
|
|
|
@@ -1563,10 +2252,9 @@ static void HMI_Decode(void)
|
|
|
}
|
|
|
}
|
|
|
//2022/06/23,add:
|
|
|
- rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
|
|
|
- json_temp = makeJson_Warn(device_status.json_w_clock, "修改工作时间");
|
|
|
- if(atoi(device_status.net)==0)
|
|
|
- DTU_Write("%s",json_temp);
|
|
|
+ rt_sprintf(tmp,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
|
|
|
+ json_temp = makeJson_Warn(tmp, "修改工作时间");
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
rt_thread_delay(2000);
|
|
|
MA_save();
|
|
|
@@ -1760,10 +2448,9 @@ static void HMI_Decode(void)
|
|
|
ResetParamDefault_DC();
|
|
|
rt_thread_delay(1000);
|
|
|
//2022/06/23,add:
|
|
|
- rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:电池供电,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
- json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
|
|
|
- if(atoi(device_status.net)==0)
|
|
|
- DTU_Write("%s",json_temp);
|
|
|
+ rt_sprintf(tmp,"屏幕操作:系统重置:电池供电,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
+ json_temp = makeJson_Warn(tmp, "系统重置");
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
|
|
|
}
|
|
|
@@ -1773,10 +2460,9 @@ static void HMI_Decode(void)
|
|
|
ResetParamDefault();
|
|
|
rt_thread_delay(1000);
|
|
|
//2022/06/23,add:
|
|
|
- rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:交流供电,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
- json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
|
|
|
- if(atoi(device_status.net)==0)
|
|
|
- DTU_Write("%s",json_temp);
|
|
|
+ rt_sprintf(tmp,"屏幕操作:系统重置:交流供电,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
+ json_temp = makeJson_Warn(tmp, "系统重置");
|
|
|
+ DTU_Write("%s",json_temp);
|
|
|
rt_free(json_temp);
|
|
|
|
|
|
}
|
|
|
@@ -2476,9 +3162,6 @@ void Check_ParamConfig(void)
|
|
|
ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),NULL); //开关机状态
|
|
|
ef_get_env_blob("env_t",&device_status.tempture,sizeof(device_status.tempture),NULL); //环境温度
|
|
|
ef_get_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity),NULL); //环境湿度
|
|
|
- ef_get_env_blob("json_w_clock",&device_status.json_w_clock,sizeof(device_status.json_w_clock),NULL); //时间
|
|
|
- ef_get_env_blob("json_w_reset",&device_status.json_w_reset,sizeof(device_status.json_w_reset),NULL); //重置
|
|
|
- ef_get_env_blob("json_w_platform",&device_status.json_w_platform,sizeof(device_status.json_w_platform),NULL);//平台
|
|
|
ef_get_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL); //版本类型
|
|
|
ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL); //BL版本号 进BL的时候存储到FLASH
|
|
|
ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL); //平台地址
|
|
|
@@ -2872,6 +3555,11 @@ void Debug_log_OFF(void)
|
|
|
{
|
|
|
rt_console_set_device("uart1");
|
|
|
finsh_set_device("uart1");
|
|
|
+ /* 同族加固(2026-10-13):rt_console_set_device 恢复时的 open 会按
|
|
|
+ * `open_flag = oflag & 0xff` 洗掉 uart1 的 INT_RX 位,而 finsh 在
|
|
|
+ * "uart1 已是 shell 设备"时直接 return 不补位 → 控制台切回后本机口无法输入。
|
|
|
+ * 统一由 dbg_chain_fixup() 把接收模式位补回(详见该函数注释)。 */
|
|
|
+ dbg_chain_fixup();
|
|
|
/* 线程已存在时不再重复创建(原实现每次调用都会新建线程且不回收,造成线程泄漏) */
|
|
|
if (hmi1 == RT_NULL)
|
|
|
{
|