zhunk 7 месяцев назад
Родитель
Сommit
52dba67805

+ 7 - 7
Application_cbd_apm32f1/applications/control.c

@@ -930,12 +930,7 @@ void WorkTask_BZYV2(void)
         ctr_router(OFF);
         if(device_status.work_done==1){
             turnlimit();                           //卷带电机转一圈
-            slide_para.en_slide = 5;               //滑台复位
-            while(slide_para.en_slide!=0){
-                LOG_D("等待电机完成复位!");
-                rt_thread_delay(100);
-            }
-
+            rt_thread_delay(2000);
             char *take_start = makeJson_Warn("start", "autofocus");
             DTU_Write(take_start);
             rt_free(take_start);
@@ -1178,7 +1173,12 @@ int slide_Fresh(void)
     }
     return ret;
 }
-
+void reboot(void)
+{
+    LOG_W("手动触发重启!");
+    rt_hw_cpu_reset();
+}
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);
 MSH_CMD_EXPORT(ctr_led,sample:ctr_led <ON|OFF>);
+MSH_CMD_EXPORT(reboot,reboot);
 //INIT_APP_EXPORT(Control_heat);

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -16,7 +16,7 @@
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "2.6.16"                   //孢子仪
+#define VERSION_BZY         "2.7.17"                   //孢子仪
 
 /*********************************************************************/
 typedef struct  _packed

+ 354 - 59
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -49,6 +49,7 @@ struct rx_msg
 };
 /* 消息队列句柄 */
 static struct rt_semaphore rx_sem;    /* 用于接收消息的信号量 */
+static struct rt_mutex dtu_write_mutex;  /* DTU写互斥锁,防止多线程串口发送冲突 */
 rt_thread_t dtu_recv_data = RT_NULL;
 rt_thread_t dtu_send_data = RT_NULL;
 
@@ -100,7 +101,9 @@ void DTU_Write(char *fmt, ...)
     va_end(ap);
     if (str_length > 2048 - 1)
         str_length = 2048 - 1;
+    rt_mutex_take(&dtu_write_mutex, RT_WAITING_FOREVER);
     rt_device_write(dtuserial, 0, dtu_str, str_length);
+    rt_mutex_release(&dtu_write_mutex);
     LOG_D("DTU_Write:%s",dtu_str);
 }
 /* 接收数据回调函数 */
@@ -200,32 +203,15 @@ int dtu_data_play(void)
     lwjson_stream_init(&lwparser, NULL);
     rt_err_t rm_dtu_result;
     DTU_uart2_init();
-    //初始化消息队列
-    //rm_dtu_result = rt_mq_init(&rx_mq_dtu, "dtu", &data_arry.msg_pool[0], 512 - sizeof(void*), sizeof(data_arry.msg_pool), RT_IPC_FLAG_FIFO);
-//    if(rm_dtu_result==RT_EOK)
-//    {
-//        rt_kprintf("消息队列创建成功!!");
-//    }
-//    else {
-//        rt_kprintf("消息队列创建失败!!");
-//    }
+    rm_dtu_result = rt_mutex_init(&dtu_write_mutex, "dtu_mtx", RT_IPC_FLAG_FIFO);
+    if (rm_dtu_result != RT_EOK)
+    {
+        LOG_E("dtu_write_mutex init failed!");
+    }
     /* 初始化信号量 */
     rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
-
     /* 设置接收回调函数 */
     rt_device_set_rx_indicate(dtuserial, dtu_input);
-    #if 0
-    /*创建线程-指令发送*/
-    dtu_send_data = rt_thread_create("DTU_thread",
-                                    dtu_thread_entry_send,RT_NULL,
-                                    DTU_THREAD_STACK_SIZE,
-                                    3,                              //优先级高是为了保证数据上传的频率的精确度
-                                    20          //时间片
-            );
-    /* 如果获得线程控制块,启动这个线程 */
-    if(dtu_send_data!=RT_NULL)
-        rt_thread_startup(dtu_send_data);
-    #endif
     /* 创建线程-指令接收解析*/
     dtu_recv_data = rt_thread_create("t_uart2",
             dtu_thread_entry_recv, RT_NULL,
@@ -465,6 +451,308 @@ char *makeJson_C01_Warn(uint16_t code,double process)
     cJSON_Delete(pJsonRoot);
     return w;
 }
+
+/**
+ * @brief 创建JSON-RPC 2.0请求字符串
+ * @param method 方法名(必须)
+ * @param params 参数对象(可选)
+ * @param id 请求ID(可选,NULL表示通知)
+ * @return 返回JSON字符串,需要调用者释放,失败返回NULL
+ */
+char* makeJsonRpc2_0(const char* method, cJSON* params, int id)
+{
+    // 参数检查
+    if (method == NULL || method[0] == '\0') {
+        fprintf(stderr, "Error: method cannot be NULL or empty\n");
+        return NULL;
+    }
+
+    cJSON* root = cJSON_CreateObject();
+    if (root == NULL) {
+        fprintf(stderr, "Error: Failed to create JSON object\n");
+        return NULL;
+    }
+
+    // 添加 jsonrpc 版本
+    if (!cJSON_AddStringToObject(root, "jsonrpc", "2.0")) {
+        cJSON_Delete(root);
+        return NULL;
+    }
+
+    // 添加 method
+    if (!cJSON_AddStringToObject(root, "method", method)) {
+        cJSON_Delete(root);
+        return NULL;
+    }
+
+    // 添加 params(如果有)
+    if (params != NULL) {
+        // 注意:这里不复制params,调用者需要保证params在函数调用期间有效
+        cJSON_AddItemToObject(root, "params", params);
+    }
+
+    cJSON_AddNumberToObject(root, "id", id);
+    // 生成JSON字符串
+    char* json_str = cJSON_PrintUnformatted(root);
+
+    // 清理
+    cJSON_Delete(root);
+
+    return json_str;
+}
+
+void parse_param_to_mcu(cJSON* Params)
+{
+    if(Params!=NULL)
+    {
+        cJSON* value = NULL;
+        value = cJSON_GetObjectItem(Params,"reboot_time");
+        if(value!=NULL){
+            device_status.rebootcnt = value->valueint;
+            ef_set_env_blob("reboot_time", &device_status.rebootcnt, sizeof(device_status.rebootcnt));
+        }
+
+        value = cJSON_GetObjectItem(Params,"ds");
+        if(value!=NULL){
+            device_status.ds = value->valueint;
+            ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collecting_sh1");
+        if(value!=NULL){
+            device_status.collecting_sh1 = value->valueint;
+            ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_sh1");
+        if(value!=NULL){
+            device_status.collt_min_sh1 = value->valueint;
+            ef_set_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1));
+        }
+
+
+        value = cJSON_GetObjectItem(Params,"collecting_eh1");
+        if(value!=NULL){
+            device_status.collecting_eh1 = value->valueint;
+            ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_eh1");
+        if(value!=NULL){
+            device_status.collt_min_eh1 = value->valueint;
+            ef_set_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collecting_sh2");
+        if(value!=NULL){
+            device_status.collecting_sh2 = value->valueint;
+            ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_sh2");
+        if(value!=NULL){
+            device_status.collt_min_sh2 = value->valueint;
+            ef_set_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collecting_eh2");
+        if(value!=NULL){
+            device_status.collecting_eh2 = value->valueint;
+            ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_eh2");
+        if(value!=NULL){
+            device_status.collt_min_eh2 = value->valueint;
+            ef_set_env_blob("collt_min_eh2", &device_status.collt_min_eh2, sizeof(device_status.collt_min_eh2));
+        }
+
+
+        value = cJSON_GetObjectItem(Params,"collecting_sh3");
+        if(value!=NULL){
+            device_status.collecting_sh3 = value->valueint;
+            ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_sh3");
+        if(value!=NULL){
+            device_status.collt_min_sh3 = value->valueint;
+            ef_set_env_blob("collt_min_sh3", &device_status.collt_min_sh3, sizeof(device_status.collt_min_sh3));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collecting_eh3");
+        if(value!=NULL){
+            device_status.tph = value->valueint;
+            ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
+        }
+
+        value = cJSON_GetObjectItem(Params,"collt_min_eh3");
+        if(value!=NULL){
+            device_status.collt_min_eh3 = value->valueint;
+            ef_set_env_blob("collt_min_eh3", &device_status.collt_min_eh3, sizeof(device_status.collt_min_eh3));
+        }
+
+        value = cJSON_GetObjectItem(Params,"tpl");
+        if(value!=NULL){
+            device_status.tpl = value->valueint;
+            ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
+        }
+
+        value = cJSON_GetObjectItem(Params,"tph");
+        if(value!=NULL){
+            device_status.tph = value->valueint;
+            ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
+        }
+
+
+        value = cJSON_GetObjectItem(Params,"x_init_dis");
+        if(value!=NULL){
+            device_status.x_init_dis = value->valueint;
+            ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
+        }
+
+        value = cJSON_GetObjectItem(Params,"y_init_dis");
+        if(value!=NULL){
+            device_status.y_init_dis = value->valueint;
+            ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
+        }
+
+    }else{
+        LOG_E("Params is NULL!");
+    }
+}
+
+//备份MCU参数到RTU
+void backup_param_to_rtu(void)
+{
+    cJSON* proot = cJSON_CreateObject();
+    if (proot == NULL) {
+        LOG_E("Error: Failed to create JSON object\n");
+        return;
+    }
+
+    // MCU重启次数
+    if (!cJSON_AddNumberToObject(proot, "reboot_time", device_status.rebootcnt)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    // 开关机状态
+    if (!cJSON_AddNumberToObject(proot, "ds", device_status.ds)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第一段开始时间-小时
+    if (!cJSON_AddNumberToObject(proot, "collecting_sh1", device_status.collecting_sh1)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第一段开始时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_sh1", device_status.collt_min_sh1)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第一段结束时间
+    if (!cJSON_AddNumberToObject(proot, "collecting_eh1", device_status.collecting_eh1)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第一段结束时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_eh1", device_status.collt_min_eh1)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第二段开始时间
+    if (!cJSON_AddNumberToObject(proot, "collecting_sh2", device_status.collecting_sh2)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第二段开始时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_sh2", device_status.collt_min_sh2)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第二段结束时间
+    if (!cJSON_AddNumberToObject(proot, "collecting_eh2", device_status.collecting_eh2)) {
+        cJSON_Delete(proot);
+        return;
+    }
+    //第二段结束时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_eh2", device_status.collt_min_eh2)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第三段开始时间
+    if (!cJSON_AddNumberToObject(proot, "collecting_sh3", device_status.collecting_sh3)) {
+        cJSON_Delete(proot);
+        return;
+    }
+    //第三段开始时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_sh3", device_status.collt_min_sh3)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //第三段结束时间
+    if (!cJSON_AddNumberToObject(proot, "collecting_eh3", device_status.collecting_eh3)) {
+        cJSON_Delete(proot);
+        return;
+    }
+    //第三段结束时间-分钟
+    if (!cJSON_AddNumberToObject(proot, "collt_min_eh3", device_status.collt_min_eh3)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //低温保护阈值
+    if (!cJSON_AddNumberToObject(proot, "tpl", device_status.tpl)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //高温保护阈值
+    if (!cJSON_AddNumberToObject(proot, "tph", device_status.tph)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //X轴校准坐标
+    if (!cJSON_AddNumberToObject(proot, "x_init_dis", device_status.x_init_dis)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    //Y轴校准坐标
+    if (!cJSON_AddNumberToObject(proot, "y_init_dis", device_status.y_init_dis)) {
+        cJSON_Delete(proot);
+        return;
+    }
+
+    char* temp = makeJsonRpc2_0("sync_param", proot, 1);
+    if(temp){
+        DTU_Write(temp);
+        free(temp);
+    }
+    //cJSON_Delete(proot);
+}
+
+void recover_param_from_rtu(void)
+{
+    char* temp1 = makeJsonRpc2_0("recover_param", NULL, 1);
+    if(temp1){
+        DTU_Write(temp1);
+        rt_free(temp1);
+    }
+}
+
 /*生成JSON数据*/
 char * makeJson()
 {
@@ -668,8 +956,11 @@ int parseDtu(char *json_string)
     cJSON* movz = NULL;
     cJSON* calibrate = NULL;
     cJSON* speed = NULL;
-    rt_kprintf("解析串口接受区数据:%s\n",json_string);
-    //LOG_I("解析串口接受区数据:%s",json_string);
+    cJSON* JSONRPC = NULL;
+    cJSON* METHOD = NULL;
+    cJSON* PARAMS = NULL;
+    cJSON* RESULT = NULL;
+    LOG_I("解析串口缓冲区数据:%s",json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
     {
@@ -679,6 +970,22 @@ int parseDtu(char *json_string)
     }
     else
     {
+          JSONRPC = cJSON_GetObjectItem(root,"jsonrpc");
+          METHOD = cJSON_GetObjectItem(root,"method");
+          PARAMS = cJSON_GetObjectItem(root,"params");
+          RESULT = cJSON_GetObjectItem(root,"result");
+          if (JSONRPC != NULL && METHOD != NULL && METHOD->type == cJSON_String) {
+              if(strcmp(METHOD->valuestring,"sync_param")==0) {
+                  if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
+                      parse_param_to_mcu(PARAMS);
+                  }
+              }
+              else{
+                  LOG_W("未知的命令: %s", METHOD->valuestring);
+              }
+          }
+
+
           item_cmd = cJSON_GetObjectItem(root,"cmd");
           item_ext=cJSON_GetObjectItem(root,"ext");
           item_focus = cJSON_GetObjectItem(root,"focus");
@@ -978,28 +1285,32 @@ int parseDtu(char *json_string)
                       LOG_I("相机状态:%d",device_status.camsta);
                   }
 
-                  if(strstr(device_status.imei,imei->valuestring)==RT_NULL)
+                  if(imei!=RT_NULL)
                   {
-                       rt_kprintf("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);
-                       rt_sprintf(device_status.imei, "%s",imei->valuestring);
-                       ef_set_env_blob("imei", &device_status.imei, sizeof(device_status.imei));  //IMEI
+                     if(strstr(device_status.imei,imei->valuestring)==RT_NULL&&strcmp(imei->valuestring, "") != 0)
+                     {
+                         LOG_I("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);
+                         rt_sprintf(device_status.imei, "%s",imei->valuestring);
+                         ef_set_env_blob("imei", &device_status.imei, sizeof(device_status.imei));  //IMEI
+                     }
+                     else {
+                         LOG_I("IMEI not change:%s-%s",imei->valuestring,device_status.imei);
+                     }
                   }
-                  else {
-                      rt_sprintf(device_status.imei,"%s",imei->valuestring);
-                      rt_kprintf("IMEI not change:%s-%s",imei->valuestring,device_status.imei);
-                 }
                   //如果DTU的ICCID和FLash中的不一样,保存到FLASH
-                  if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
+                  if(iccid!=RT_NULL)
                   {
-                      rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
-                      rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
-                      ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid));  //Iccid
-                  }
-                  else {
-                      rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
-                      rt_kprintf("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
+                    //如果DTU的ICCID和FLash中的不一样,保存到FLASH
+                    if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL&&strcmp(iccid->valuestring, "") != 0)
+                    {
+                        LOG_I("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
+                        rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
+                        ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid));  //Iccid
+                    }
+                    else {
+                        LOG_I("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
+                    }
                   }
-
                   if(datetime!=RT_NULL){
                       LOG_I("DTU时间:%s",datetime->valuestring);
                       int year, month, day, hour, minute, second;
@@ -1122,24 +1433,7 @@ int parseDtu(char *json_string)
                       sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
                       LOG_I("当前平台2:%s",mqttcfg2->valuestring);
                   }
-                  if( device_status.num_updata==0)
-                  {
-                      Beep_Tip(100);
-                      UpLoad_Data();
-                  }
-                  else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
-                  {
-                      if(strstr(device_status.project,"cgo")!=RT_NULL||strstr(device_status.project,"Android11")!=RT_NULL)
-                      {
-                          UpLoad_Data();
-                      }
-                      else
-                      {
-                          rt_thread_delay(2000);
-                          UpLoad_Data();
-                      }
-                  }
-                  device_status.hmi_fresh = 0;
+                  UpLoad_Data();
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
               {
@@ -1404,6 +1698,7 @@ int parseDtu(char *json_string)
                               }
 
                           }
+                   backup_param_to_rtu();
                }
           }
         cJSON_Delete(root);

+ 5 - 1
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -9,7 +9,7 @@
  */
 #ifndef APPLICATIONS_INC_DTU_UART2_H_
 #define APPLICATIONS_INC_DTU_UART2_H_
-
+#include "cJSON.h"
 #define DTU_UART_NAME "uart2"  /*串口设备名称*/
 #define MAX_DTU_SIZE 1024
 typedef struct{
@@ -39,4 +39,8 @@ char *makeJson_Config_BDH(char * deviceId);
 char *makeJson_selfCheck_(uint8_t sta);
 char *makeJson_Cam(char * s,char *t);
 char *makeJson_C01_Warn(uint16_t code,double process);
+
+char* makeJsonRpc2_0(const char* method, cJSON* params, int id);
+void backup_param_to_rtu(void);
+void recover_param_from_rtu(void);
 #endif /* APPLICATIONS_INC_DTU_UART2_H_ */

+ 47 - 32
Application_cbd_apm32f1/applications/hmi.c

@@ -46,7 +46,7 @@
 static char msg_pool[512];
 
 static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
-
+static rt_bool_t flash_flag = RT_TRUE;
 void list_mem(void);
 int mb_master_samlpe();
 /**/
@@ -1069,7 +1069,6 @@ static void HMI_Decode(void)
         if(atoi(device_status.net)==0)
             DTU_Write("%s",json_temp);
         rt_free(json_temp);
-
     }
     //获取SIM卡信息
     else if(strstr(rx_buffer,"getSim")!=NULL)
@@ -1083,7 +1082,6 @@ static void HMI_Decode(void)
     else if (strstr(rx_buffer,"DebugDisable")!=NULL) {
         Debug_log_OFF();
     }
-
     else if((strstr(rx_buffer,"SwversionV7")!=NULL)) {
         if(device_status.dtype!=7)
         {
@@ -1555,6 +1553,7 @@ static void Ctr_Mortor_entry(void* parameter)
             ctr_router(OFF);
             //胶带传送
             turnlimit();
+            rt_thread_delay(1000);
             //滑台归位,自动对焦
             //拍一张照片上传到平台
             device_status.autotakepic=1;
@@ -1645,7 +1644,7 @@ void Check_ParamConfig(void)
         device_status.Power_Type = 0;   //0-交流供电;1-直流供电
         device_status.clt_time = 10;    //收集时间
         device_status.heattime = 10;    //加热时间
-        device_status.heatvalue=100;//加热温度
+        device_status.heatvalue=100;    //加热温度
         device_status.thsp = 300;       //默认熄屏时间5分钟
         device_status.sunBar = 9;       //光控定时时长
         device_status.startBar = 20;    //定时开始时间
@@ -1661,10 +1660,20 @@ void Check_ParamConfig(void)
         device_status.ds = 1;           //设备状态
         device_status.update_flag = 0;
         /*孢子仪*/
-        device_status.collecting_sh1 = 9;
-        device_status.collecting_eh1 = 10;
-        device_status.collecting_sh2 = 14;
-        device_status.collecting_eh2 = 16;
+        device_status.collecting_sh1 = 11;
+        device_status.collecting_eh1 = 16;
+        device_status.collecting_sh2 = 0;
+        device_status.collecting_eh2 = 0;
+        device_status.collecting_sh3 = 0;
+        device_status.collecting_eh3 = 0;
+
+        device_status.collt_min_sh1 = 0;
+        device_status.collt_min_eh1 = 0;
+        device_status.collt_min_sh2 = 0;
+        device_status.collt_min_eh2 = 0;
+        device_status.collt_min_sh3 = 0;
+        device_status.collt_min_eh3 = 0;
+
         device_status.cold_sw = 0;
         device_status.heat_sw =0;
         device_status.cul_time = 1;
@@ -1675,8 +1684,8 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.tempture, "-15");
         rt_sprintf(device_status.humidity, "31");
         rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
-        device_status.x_init_dis = 500;
-        device_status.y_init_dis = 6000;
+        device_status.x_init_dis = 0;
+        device_status.y_init_dis = 0;
         ef_set_env_blob("iSave", &device_status.iSave, sizeof(device_status.iSave));  //
         ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
         ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
@@ -1712,12 +1721,12 @@ void Check_ParamConfig(void)
         ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
         ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
         ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
-        ef_set_and_save_env("collt_min_sh1", "0");
-        ef_set_and_save_env("collt_min_eh1", "0");
-        ef_set_and_save_env("collt_min_sh2", "0");
-        ef_set_and_save_env("collt_min_eh2", "0");
-        ef_set_and_save_env("collt_min_sh3", "0");
-        ef_set_and_save_env("collt_min_eh3", "0");
+        ef_set_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1));
+        ef_set_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1));
+        ef_set_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2));
+        ef_set_env_blob("collt_min_eh2", &device_status.collt_min_eh2, sizeof(device_status.collt_min_eh2));
+        ef_set_env_blob("collt_min_sh3", &device_status.collt_min_sh3, sizeof(device_status.collt_min_sh3));
+        ef_set_env_blob("collt_min_eh3", &device_status.collt_min_eh3, sizeof(device_status.collt_min_eh3));
         LOG_I("SOFTWARE VERSION:%s",device_status.driver);
         LOG_I("Default paramconf is:");
         LOG_I("stime:%d",device_status.iSave);
@@ -1730,7 +1739,7 @@ void Check_ParamConfig(void)
         LOG_I("jheat:%d",device_status.heatvalue);
         LOG_I("thsp:%d", device_status.thsp);
         LOG_I("passwd:%d",device_status.passWord);
-
+        flash_flag = RT_FALSE;
     }//从easyflash读取参数配置
     else if (device_status.iSave==FLASH_FLAG) {
         ef_get_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype),NULL);                             //设备类型
@@ -1852,35 +1861,31 @@ void Check_ParamConfig(void)
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif
-
-#if ROBOT_EN == 0
         uint16_t connect_num=0;
         //等待联网,
         while(atoi(device_status.net)==1)
         {
-            char *readinfo =  makeJson_ReadInfo();
-            DTU_Write("%s",readinfo);
-            rt_free(readinfo);
             rt_thread_delay(10000);
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为100S
             if(connect_num==10)
             {
-                device_status.timeSwitch = 0;
                 LOG_W("Time not set:%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);
                 break;
             }
         }
-        connect_num = 0;
         rt_thread_delay(2000);
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
-        device_status.num_updata = 1;
-        UpLoad_Data();
+        if(flash_flag==RT_TRUE){
+            backup_param_to_rtu();
+        }else{
+            recover_param_from_rtu();
+        }
         Workstatus_check();
         Work_Loop_Task();
-#endif
+
     }
 }
 void ResetParamDefault(void)
@@ -1889,10 +1894,12 @@ void ResetParamDefault(void)
     device_status.thsp = 300;
     device_status.passWord = 8888;
     device_status.dattim = 10;
-    device_status.collecting_sh1 = 9;
-    device_status.collecting_eh1 = 10;
-    device_status.collecting_sh2 = 14;
-    device_status.collecting_eh2 = 16;
+    device_status.collecting_sh1 = 11;
+    device_status.collecting_eh1 = 16;
+    device_status.collecting_sh2 = 0;
+    device_status.collecting_eh2 = 0;
+    device_status.collecting_sh3 = 0;
+    device_status.collecting_eh3 = 0;
     device_status.collt_min_sh1 = 0;
     device_status.collt_min_eh1 = 0;
     device_status.collt_min_sh2 = 0;
@@ -1916,7 +1923,14 @@ void ResetParamDefault(void)
         ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));    //采集时间
         ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));    //采集时间
         ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));    //采集时间
-        ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
+        ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));    //采集时间
+        ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));    //采集时间
+        ef_set_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1));
+        ef_set_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1));
+        ef_set_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2));
+        ef_set_env_blob("collt_min_eh2", &device_status.collt_min_eh2, sizeof(device_status.collt_min_eh2));
+        ef_set_env_blob("collt_min_sh3", &device_status.collt_min_sh3, sizeof(device_status.collt_min_sh3));
+        ef_set_env_blob("collt_min_eh3", &device_status.collt_min_eh3, sizeof(device_status.collt_min_eh3));
     }
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
@@ -2071,5 +2085,6 @@ void Debug_log_OFF(void)
  }
 MSH_CMD_EXPORT(Debug_log_ON,Debug_log_ON);
 MSH_CMD_EXPORT(Debug_log_OFF,Debug_log_OFF);
+MSH_CMD_EXPORT(ResetParamDefault,ResetParamDefault);
 //
 //INIT_BOARD_EXPORT(HMI_uart4_init);

+ 6 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,9 @@
+# 2026-04-10 更新说明
+	#define VERSION_BZY         "2.7.17"                   //孢子仪
+	DTU串口发送加互斥锁,解决多线程同时访问出现数据丢失;
+	和工控机通信逻辑优化,取消 {"cmd":"read"} 的过程
+	增加MCU参数备份功能
+	增加shell中重启指令
 # 2026-03-25 更新说明
 	#define VERSION_BZY         "2.6.16"                   //孢子仪
 	修复拍照未正常结束平台持续显示拍照状态的问题;