|
|
@@ -61,6 +61,153 @@ int thread_restart_workloop(void)
|
|
|
result = Work_Loop_Task();
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+/***************************************************************************/
|
|
|
+/* ==================== OTA 升级前的线程清理 ==================== */
|
|
|
+
|
|
|
+#define OTA_THREAD_MAX 24
|
|
|
+
|
|
|
+/* 保留名单: 这几类线程删掉反而会让升级失败 */
|
|
|
+static const char *g_ota_keep[] =
|
|
|
+{
|
|
|
+ "syswatch", /* 喂狗线程: 删了 5s 后硬件看门狗就复位, 升级必中断 */
|
|
|
+ "tshell", /* 控制台 */
|
|
|
+ "tidle",
|
|
|
+ "main",
|
|
|
+};
|
|
|
+
|
|
|
+/* 需要停掉的业务线程(写完整名即可, 比较时自动按 RT_NAME_MAX-1 截断)。
|
|
|
+ *
|
|
|
+ * 为什么用"前缀匹配 + 遍历"而不是 rt_thread_find(全名):
|
|
|
+ * rtconfig.h 里 RT_NAME_MAX = 8, 线程名被内核截断到 7 个字符 ——
|
|
|
+ * "Control_Clear_thread_entry" / "Control_Heat_thread_entry" 都变成 "Control";
|
|
|
+ * "DTU_Uart_thread_send" / "DTU_Uart_thread_recv" 都截成 "DTU_Uar",
|
|
|
+ * 而 recv 正是执行升级的当前线程, 用 rt_thread_find 有可能把调用者自己删掉。
|
|
|
+ * 所以改成遍历线程对象链表, 并显式跳过 rt_thread_self()。 */
|
|
|
+static const char *g_ota_stop[] =
|
|
|
+{
|
|
|
+ "work_loop_thread", /* 工作流程 */
|
|
|
+ "work_status_check_thread", /* WorkCheck */
|
|
|
+ "Control_Clear_thread_entry", /* 清扫, 会驱动电机 */
|
|
|
+ "Control_Heat_thread_entry", /* 恒温 */
|
|
|
+ "sht30_collect_thread", /* 光控/温控, 每 5s 打一行 LOG_I */
|
|
|
+ "Power Check thread", /* 每秒读电流/电压 */
|
|
|
+ "Hmi_Fresh_thread", /* 屏幕刷新 */
|
|
|
+ "Ctr motor", /* 仓门/光源, 带 rt_kprintf */
|
|
|
+ "sys_monitor", /* CPU/统计 */
|
|
|
+ "DTU_Uart_thread_send", /* DTU 发送 (recv 是自身, 会被跳过) */
|
|
|
+ "md_m_poll", /* modbus 轮询 */
|
|
|
+ "md_m_send", /* modbus 发送 */
|
|
|
+ "usage", /* cpu_usage 临时线程 */
|
|
|
+};
|
|
|
+
|
|
|
+/* 名字前缀比较: 内核只存了前 RT_NAME_MAX-1 个字符, 所以最多比这么多 */
|
|
|
+static int ota_name_match(const char *thread_name, const char *prefix)
|
|
|
+{
|
|
|
+ rt_size_t n;
|
|
|
+
|
|
|
+ if (thread_name == RT_NULL || prefix == RT_NULL || thread_name[0] == '\0')
|
|
|
+ {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ n = rt_strlen(prefix);
|
|
|
+ if (n > RT_NAME_MAX - 1)
|
|
|
+ {
|
|
|
+ n = RT_NAME_MAX - 1;
|
|
|
+ }
|
|
|
+ if (n == 0)
|
|
|
+ {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ return (rt_strncmp(thread_name, prefix, n) == 0) ? 1 : 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int ota_in_list(const char *thread_name, const char **list, int cnt)
|
|
|
+{
|
|
|
+ int i;
|
|
|
+
|
|
|
+ for (i = 0; i < cnt; i++)
|
|
|
+ {
|
|
|
+ if (ota_name_match(thread_name, list[i]))
|
|
|
+ {
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * OTA 升级前把所有业务线程停掉, 只留 tshell / idle / syswatch。
|
|
|
+ *
|
|
|
+ * 为什么必须停:
|
|
|
+ * 1) ymodem_ota() 会把 console 切到 uart2(ymodem_ota.c:117), 之后**任何线程**
|
|
|
+ * 的 LOG_xxx / rt_kprintf 都会打进 uart2, 直接污染 ymodem 字节流 -> 校验失败;
|
|
|
+ * 2) sht30 / Power Check 持续读 ADC, 抢 CPU 会让 ymodem 丢字节;
|
|
|
+ * 3) Control_Clear / Control_Heat / Ctr motor 会驱动电机, 升级过程中不该动机械部件。
|
|
|
+ *
|
|
|
+ * 实现说明: 本工程的线程**没有** `update_flag==1 break` 这类自退机制, 所以这里
|
|
|
+ * 不做"置标志 + 等它自己退", 直接遍历 + 强删。强删时若线程正持有 IPC 或外设锁,
|
|
|
+ * 由于紧接着就进 ymodem、结束即 rt_hw_cpu_reset(), 不会影响升级本身。
|
|
|
+ * ★ 全程不改 device_status.update_flag —— 那个值一旦被落盘, 下次开机会被
|
|
|
+ * Check_ParamConfig 判成"有升级请求"而再进 OTA。
|
|
|
+ *
|
|
|
+ * @return 实际删除的线程数; 负值为错误
|
|
|
+ */
|
|
|
+int thread_stop_all_for_ota(void)
|
|
|
+{
|
|
|
+ struct rt_object_information *info;
|
|
|
+ rt_list_t *node;
|
|
|
+ rt_thread_t victims[OTA_THREAD_MAX];
|
|
|
+ rt_thread_t self;
|
|
|
+ int nv = 0, i, done = 0;
|
|
|
+
|
|
|
+ info = rt_object_get_information(RT_Object_Class_Thread);
|
|
|
+ if (info == RT_NULL)
|
|
|
+ {
|
|
|
+ LOG_E("[ota] thread object information NOT found");
|
|
|
+ return -RT_ERROR;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 收集待停线程。必须"先收集后删除": rt_thread_delete 会摘掉链表节点,
|
|
|
+ 边遍历边删会把 object_list 走坏 */
|
|
|
+ self = rt_thread_self();
|
|
|
+ rt_enter_critical();
|
|
|
+ rt_list_for_each(node, &info->object_list)
|
|
|
+ {
|
|
|
+ rt_thread_t t = rt_list_entry(node, struct rt_thread, list);
|
|
|
+
|
|
|
+ if (t == self) /* 不能删自己 */
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (ota_in_list(t->name, g_ota_keep, sizeof(g_ota_keep) / sizeof(g_ota_keep[0])))
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!ota_in_list(t->name, g_ota_stop, sizeof(g_ota_stop) / sizeof(g_ota_stop[0])))
|
|
|
+ {
|
|
|
+ continue; /* 不在名单里, 不动 */
|
|
|
+ }
|
|
|
+ if (nv < OTA_THREAD_MAX)
|
|
|
+ {
|
|
|
+ victims[nv++] = t;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ rt_exit_critical();
|
|
|
+
|
|
|
+ /* 逐个删除 */
|
|
|
+ for (i = 0; i < nv; i++)
|
|
|
+ {
|
|
|
+ if (rt_thread_delete(victims[i]) == RT_EOK)
|
|
|
+ {
|
|
|
+ done++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ LOG_I("[ota] stopped %d of %d candidate thread(s)", done, nv);
|
|
|
+ return done;
|
|
|
+}
|
|
|
+
|
|
|
/**************************1.0定制2000W*************************************/
|
|
|
uint8_t ctr_Fan_PUT(uint8_t status_ws)
|
|
|
{
|