|
@@ -240,6 +240,16 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
|
|
+int delete_thrad_dtu_recv_data(void)
|
|
|
|
|
+{
|
|
|
|
|
+ LOG_W("delete_thrad_dtu_recv_data.");
|
|
|
|
|
+ rt_mq_delete(&rx_mq_dtu);
|
|
|
|
|
+// if(dtu_recv_data!=RT_NULL)
|
|
|
|
|
+// {
|
|
|
|
|
+// rt_thread_delete(dtu_recv_data);
|
|
|
|
|
+// }
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
/* 创建线程 */
|
|
/* 创建线程 */
|
|
|
int dtu_data_play(void)
|
|
int dtu_data_play(void)
|
|
|
{
|
|
{
|
|
@@ -266,7 +276,7 @@ int dtu_data_play(void)
|
|
|
);
|
|
);
|
|
|
#endif
|
|
#endif
|
|
|
/* 创建线程-指令接收解析*/
|
|
/* 创建线程-指令接收解析*/
|
|
|
- dtu_recv_data = rt_thread_create("thread_uart2",
|
|
|
|
|
|
|
+ dtu_recv_data = rt_thread_create("t_uart2",
|
|
|
dtu_thread_entry_recv, RT_NULL,
|
|
dtu_thread_entry_recv, RT_NULL,
|
|
|
DTU_THREAD_STACK_SIZE,
|
|
DTU_THREAD_STACK_SIZE,
|
|
|
DTU_THREAD_PRIORITY,
|
|
DTU_THREAD_PRIORITY,
|
|
@@ -1022,14 +1032,13 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
}
|
|
|
else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
|
|
else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("准备升级!!!");
|
|
|
|
|
- device_status.update_flag = 1;
|
|
|
|
|
- ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
|
|
|
|
|
- rt_kprintf("%s\n",makeJson_Warn("system will update","control"));
|
|
|
|
|
- rt_thread_delay(2000);
|
|
|
|
|
|
|
+ LOG_W("准备升级!!!");
|
|
|
DTU_Write("%s",makeJson_Warn("system will update","control"));
|
|
DTU_Write("%s",makeJson_Warn("system will update","control"));
|
|
|
- rt_thread_delay(20);
|
|
|
|
|
- rt_hw_cpu_reset();
|
|
|
|
|
|
|
+ rt_thread_delay(5000);
|
|
|
|
|
+ thread_delete_workloop();
|
|
|
|
|
+ thread_delete_adc();
|
|
|
|
|
+ device_status.update_flag = 1;
|
|
|
|
|
+ ymodem_ota(1,0);
|
|
|
}
|
|
}
|
|
|
else if (strstr(item_cmd->valuestring,"read")!=RT_NULL)
|
|
else if (strstr(item_cmd->valuestring,"read")!=RT_NULL)
|
|
|
{
|
|
{
|