zhunk 3 месяцев назад
Родитель
Сommit
702dd23a9d

+ 8 - 5
Application_cbd_apm32f1/applications/control.c

@@ -390,6 +390,7 @@ uint8_t In_Rain_status(void)
     rt_pin_mode(RAIN_PIN,PIN_MODE_INPUT);
     return rt_pin_read(RAIN_PIN);
 }
+
 /*加热*/
 uint8_t ctr_Heat(uint8_t status_heat)
 {
@@ -896,7 +897,9 @@ void ResetInit(void)
     //关闭电磁阀
     ctr_shake(OFF, 0);
     //开启 工控机供电
-    ctr_Heat(ON);
+    ctr_router(ON);
+    //关闭风机
+    ctr_Heat(OFF);
     //关闭制冷
     ctr_Cold(OFF);
     //关闭补光灯
@@ -955,18 +958,18 @@ void WorkTask_BZYV2(void)
         }
         while(device_status.work_status ==1){
             if(device_status.autotakepic==0){
-                ctr_router(ON);
+                ctr_Heat(ON);
             }else{
-                ctr_router(OFF);
+                ctr_Heat(OFF);
             }
             if(device_status.temp_status==1){
                 device_status.work_status = 0;
-                ctr_router(OFF);
+                ctr_Heat(OFF);
                 break;
             }
             rt_thread_delay(10000);
         }
-        ctr_router(OFF);
+        ctr_Heat(OFF);
 
         if(device_status.work_done==1){
             turnlimit();                           //卷带电机转一圈

+ 2 - 3
Application_cbd_apm32f1/applications/control.h

@@ -14,13 +14,12 @@
 #include "stdio.h"
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
-#define SENSOR_EN        1              //温湿度:0关闭,1打开
+#define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 ///
 ///
 ///
-#define VERSION_BZY         "3.0.0"                   //孢子仪
-
+#define VERSION_BZY         "3.2.0"                   //孢子仪
 
 typedef struct  _packed
 {

+ 123 - 199
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -24,28 +24,29 @@
 #include "beep.h"
 #include <selfcheck.h>
 #include <lwjson.h>
-#include <app_flashdb.h>
 #define DBG_ENABLE
 #define DBG_COLOR
 #define DBG_TAG "dtu"
 #define DBG_LEVEL         DBG_LOG
 #include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
-
+#include "app_flashdb.h"
 
 #define DTU_THREAD_PRIORITY         6          //线程优先级
 #define DTU_THREAD_STACK_SIZE       2048        //线程栈空间大小
 #define DTU_THREAD_TIMESLICE        5           //时间片
 
 /* JSON 通信超时看门狗:记录上次成功解析一帧 JSON 的 tick,
- * 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) 的心跳 */
+ * 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_router(OFF) -> 10s -> ctr_router(ON) 的心跳 */
 #define DTU_JSON_TIMEOUT_MS     (2 * 60 * 60 * 1000UL)   /* 2 小时 */
 #define DTU_JSON_RESET_OFF_MS   (10 * 1000UL)              /* OFF 持续 10s */
 static volatile rt_tick_t g_dtu_json_last_tick = 0;       /* 上次成功解析 JSON 的时间 */
 
+
 Device_Status_typedef device_status;
 Device_slide_typedef slide_para;
 Flashdb_typedef flashdb_value;
 
+
 void list_mem(void);
 /* 串口接收消息结构*/
 struct rx_msg
@@ -55,7 +56,7 @@ struct rx_msg
 };
 /* 消息队列句柄 */
 static struct rt_semaphore rx_sem;    /* 用于接收消息的信号量 */
-static struct rt_mutex dtu_write_mutex;  /* DTU写互斥锁,防止多线程串口发送冲突 */
+static struct rt_mutex dtu_write_mutex;  /* DTU写互斥锁,防止多线程串口*/
 rt_thread_t dtu_recv_data = RT_NULL;
 rt_thread_t dtu_send_data = RT_NULL;
 
@@ -74,7 +75,7 @@ static int DTU_uart2_init(void)
         dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
         dtuconfig.stop_bits = STOP_BITS_1;     //停止位1
         #ifdef RT_USING_SERIAL_V2
-        dtuconfig.rx_bufsz = 2048;
+        dtuconfig.rx_bufsz = 1024;
         dtuconfig.tx_bufsz = 2048;
         #else
         dtuconfig.bufsz = 1024;                 //缓冲区1k
@@ -184,23 +185,13 @@ static void dtu_thread_entry_recv(void *parameter)
             /* 阻塞等待接收信号量,等到信号量后再次读取数据 */
             rt_sem_take(&rx_sem, RT_WAITING_FOREVER);
         }
-        /* 累积存储,留 1 字节放 '\0',避免 parseDtu 越界访问 */
-        if (accum_len >= sizeof(accum_buf) - 1) {
-           LOG_W("dtu accum buffer overflow(%d), drop & reset parser!", (int)accum_len);
-           accum_len = 0;
-           memset(accum_buf, 0, sizeof(accum_buf));
-           lwjson_stream_reset(&lwparser);
-           /* 把串口硬件 RX 队列里残留的字节也丢掉,避免下一帧再次错乱 */
-           {
-               char drain_buf[64];
-               while (rt_device_read(dtuserial, -1, drain_buf, sizeof(drain_buf)) > 0) {
-                   /* drain */
-               }
-           }
-           continue;
+        accum_buf[accum_len++]=ch;
+        if (accum_len >= sizeof(accum_buf)) {
+            // 防止超范围
+            accum_len = 0;
+            lwjson_stream_reset(&lwparser);
+            continue;
         }
-        accum_buf[accum_len++] = ch;
-        accum_buf[accum_len]   = '\0';
         lwjsonr_t ret;
         ret = lwjson_stream_parse(&lwparser, ch); // 把串口数据逐字节的喂给解析器去解析
         switch(ret)
@@ -253,12 +244,25 @@ int dtu_data_play(void)
     }
     /* 初始化信号量 */
     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,
-            2048,
+            DTU_THREAD_STACK_SIZE,
             DTU_THREAD_PRIORITY,
             DTU_THREAD_TIMESLICE);
 
@@ -435,35 +439,6 @@ char *makeJson_Warn(char * s,char *t)
     return w;
 }
 
-char *makeJson_Cam(char * s,char *t)
-{
-    cJSON * wJsonRoot = NULL;
-    wJsonRoot = cJSON_CreateObject();
-    if(NULL==wJsonRoot)
-    {
-        return NULL;
-    }
-    cJSON_AddStringToObject(wJsonRoot, "ctr_cam", s);
-    cJSON * pubstring = NULL;
-    pubstring = cJSON_CreateObject();
-    if(NULL==pubstring)
-    {
-        rt_kprintf("cJSON pubstring NULL!!!\n");
-        return NULL;
-    }
-    cJSON_AddItemToObject(wJsonRoot, "ext", pubstring);
-    cJSON_AddStringToObject(pubstring,"param",t);//
-    char * w = cJSON_PrintUnformatted(wJsonRoot);
-    if(NULL == w)
-    {
-        cJSON_Delete(wJsonRoot);
-        rt_kprintf("wJsonRoot cJSON_Delete NULL!!!\n");
-        return NULL;
-    }
-    cJSON_Delete(wJsonRoot);
-    return w;
-}
-
 char *makeJson_C01_Warn(uint16_t code,double process)
 {
     cJSON * pJsonRoot = NULL;
@@ -548,6 +523,7 @@ void parse_param_to_mcu(cJSON* Params)
 {
     if(Params!=NULL)
     {
+        LOG_I("从备份区设置参数...");
         cJSON* value = NULL;
         value = cJSON_GetObjectItem(Params,"reboot_time");
         if(value!=NULL){
@@ -665,6 +641,8 @@ void parse_param_to_mcu(cJSON* Params)
     }
 }
 
+
+
 //备份MCU参数到RTU
 void backup_param_to_rtu(void)
 {
@@ -796,22 +774,13 @@ void recover_param_from_rtu(void)
     }
 }
 
+
 /*生成JSON数据*/
 char * makeJson()
 {
     char utos[5];
 
-    //如果设备工作并且电流小于500,并且不是上电启动灯管异常
-    if(atoi(device_status.power)<400&&device_status.work_status==1&&makejson_sta!=0)
-    {
-        #if LAMP_EN == 0
-        LOG_I("Current is:%d",atoi(device_status.power));
-        if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
-        device_status.lamp_status = 1;
-        #endif
-    }
-
-    if(atoi(device_status.power)>5000)
+    if(atoi(device_status.power)>5000)  //过滤异常值
         rt_sprintf(device_status.power,"0.01");
 
     makejson_sta = 1;
@@ -824,7 +793,7 @@ char * makeJson()
     pJsonRoot = cJSON_CreateObject();
     if(NULL==pJsonRoot)
     {
-        LOG_E("cJSON pJsonRoot NULL!!!");
+        rt_kprintf("cJSON pJsonRoot NULL!!!\n");
         return NULL;
     }
 
@@ -836,7 +805,6 @@ char * makeJson()
     if(NULL==pSubJson)
     {
         rt_kprintf("cJSON pSubJson NULL!!!\n");
-        cJSON_Delete(pJsonRoot);
         return NULL;
     }
     memset(device_status.driver,0,sizeof(device_status.driver));
@@ -862,25 +830,18 @@ char * makeJson()
         rt_sprintf(ct2,"%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
         rt_sprintf(ct3,"%d-%d",device_status.collecting_sh3,device_status.collecting_eh3);
         rt_kprintf("ct1-ct2:%s\n",ct1);
-        // 使用临时字符串数组创建cJSON数组(避免使用coll_time指针数组)
-        const char *coll_time_hour[3] = {ct1, ct2, ct3};
-        cJSON *data_clt = cJSON_CreateStringArray(coll_time_hour, 3);
-        if (data_clt == NULL) {
-            LOG_E("cJSON_CreateStringArray data_clt failed");
-            cJSON_Delete(pJsonRoot);
-            return NULL;
-        }
+        device_status.coll_time[0] = ct1;
+        device_status.coll_time[1] = ct2;
+        device_status.coll_time[2] = ct3;
+        cJSON *data_clt = cJSON_CreateStringArray(device_status.coll_time,3);
 
         rt_sprintf(ct1,"%d-%d",device_status.collt_min_sh1,device_status.collt_min_eh1);
         rt_sprintf(ct2,"%d-%d",device_status.collt_min_sh2,device_status.collt_min_eh2);
         rt_sprintf(ct3,"%d-%d",device_status.collt_min_sh3,device_status.collt_min_eh3);
-        const char *coll_time_min[3] = {ct1, ct2, ct3};
-        cJSON *coll_min = cJSON_CreateStringArray(coll_time_min, 3);
-        if (coll_min == NULL) {
-            LOG_E("cJSON_CreateStringArray coll_min failed");
-            cJSON_Delete(pJsonRoot);
-            return NULL;
-        }
+        device_status.coll_time[0] = ct1;
+        device_status.coll_time[1] = ct2;
+        device_status.coll_time[2] = ct3;
+        cJSON *coll_min = cJSON_CreateStringArray(device_status.coll_time,3);
         //工作状态
         rt_sprintf(utos, "%d",device_status.work_status);
         if(device_status.autotakepic==2){
@@ -889,19 +850,10 @@ char * makeJson()
             cJSON_AddStringToObject(pSubJson,"work_sta",utos);
         }
 
-
         //电压状态-batStatus
         rt_sprintf(utos, "%d",device_status.bat_status);
         cJSON_AddStringToObject(pSubJson,"batStatus",utos);
 
-        //风机开关
-//        rt_sprintf(utos, "%d",device_status.wind_sw);
-//        cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
-//        //分辨率
-//        cJSON_AddStringToObject(pSubJson,"imgres","0");
-//        //usb
-//        cJSON_AddStringToObject(pSubJson,"usb_sta","0");
-
         //收集时间
         cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
         cJSON_AddItemToObject(pSubJson,"coll_min",coll_min);
@@ -939,6 +891,7 @@ char * makeJson()
     cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
     //电流(当前)
     cJSON_AddStringToObject(pSubJson,"current",device_status.power);
+    cJSON_AddStringToObject(pSubJson,"c_24V_1",device_status.heat_power);
     //电压
     cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
     //数据上传间隔
@@ -948,52 +901,17 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_init_dis);
     cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
-    double tape_used_pct = 0.00;
-    if (flashdb_value.tape_max > 0)
-    {
-        tape_used_pct = (double)flashdb_value.tape_used / flashdb_value.tape_max * 100.0;
-        // 保留1位小数,避免无限浮点
-        tape_used_pct = round(tape_used_pct * 100) / 100.0;
-    }
-    else
-    {
-        LOG_W("tape_max config zero, tape used pct set to 0");
-    }
-
-    double filter_used_pct = 0.00;
-    if (flashdb_value.filter_max > 0)
-    {
-        filter_used_pct = (double)flashdb_value.filter_used / flashdb_value.filter_max * 100.0;
-        filter_used_pct = round(filter_used_pct * 100) / 100.0;
-    }
-    else
-    {
-        LOG_W("filter_max config zero, filter used pct set to 0");
-    }
-
-    // 空指针防护,避免cJSON崩溃
-    if (pSubJson != NULL)
-    {
-        cJSON_AddNumberToObject(pSubJson, "tape_used", tape_used_pct);
-        cJSON_AddNumberToObject(pSubJson, "filter_used", filter_used_pct);
-        cJSON_AddNumberToObject(pSubJson, "worked_day", flashdb_value.worked_day);
-        cJSON_AddNumberToObject(pSubJson, "freq_filter", flashdb_value.freq_filter);
-    }
-    else
-    {
-        LOG_E("pSubJson is NULL, skip add tape&filter json data");
-    }
-#if 0
-    cJSON_AddStringToObject(pSubJson, "windspeed", device_status.windspeed);
-    cJSON_AddStringToObject(pSubJson, "winddir", device_status.winddir);
-    cJSON_AddStringToObject(pSubJson, "ap", device_status.ap);
-    rt_sprintf(utos, "%d",device_status.lux);
-    cJSON_AddNumberToObject(pSubJson, "lux", device_status.lux);
-#endif
+    cJSON_AddNumberToObject(pSubJson, "tape_used", flashdb_value.tape_used);
+    cJSON_AddNumberToObject(pSubJson, "tape_max", flashdb_value.tape_max);
+    cJSON_AddNumberToObject(pSubJson, "filter_used", flashdb_value.filter_used);
+    cJSON_AddNumberToObject(pSubJson, "filter_max", flashdb_value.filter_max);
+    cJSON_AddNumberToObject(pSubJson, "worked_day", flashdb_value.worked_day);
+    cJSON_AddNumberToObject(pSubJson, "freq_filter", flashdb_value.freq_filter);
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
         cJSON_Delete(pJsonRoot);
+        rt_kprintf("cJSON_Delete NULL!!!\n");
         return NULL;
     }
     cJSON_Delete(pJsonRoot);
@@ -1010,13 +928,9 @@ int parseDtu(char *json_string)
     cJSON* photo_sta = NULL;
 
     cJSON* collt  = NULL; //收集时间
-
     cJSON* datt  = NULL; //数据上传间隔
-
     cJSON* tpl  = NULL; //低温保护阈值
-
     cJSON* tph  = NULL; //高温保护阈值
-
     cJSON* gps = NULL; //定位状态
     cJSON* datetime = NULL;
     cJSON* lat = NULL;
@@ -1036,7 +950,6 @@ int parseDtu(char *json_string)
     cJSON* hum = NULL;
     cJSON* tmp = NULL;
     cJSON* link_sta = NULL;
-    cJSON* value_commn= NULL;
     cJSON* movx = NULL;
     cJSON* movy = NULL;
     cJSON* movz = NULL;
@@ -1046,7 +959,8 @@ int parseDtu(char *json_string)
     cJSON* METHOD = NULL;
     cJSON* PARAMS = NULL;
     cJSON* RESULT = NULL;
-    LOG_I("解析串口缓冲区数据:%s",json_string);
+    rt_kprintf("解析串口接受区数据:%s\n",json_string);
+    //LOG_I("解析串口接受区数据:%s",json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
     {
@@ -1065,13 +979,23 @@ int parseDtu(char *json_string)
                   if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
                       parse_param_to_mcu(PARAMS);
                   }
+              }else if(strcmp(METHOD->valuestring,"tape_reset")==0) {   //{"jsonrpc":"2.0","method":"tape_reset","params":{"tape_max":50000},"id":1}
+                  flashdb_value.tape_used = 0;
+                  app_flashdb_save("tape_reset", &flashdb_value.tape_used);
+                  if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
+                      cJSON* tape_max = cJSON_GetObjectItem(PARAMS,"tape_max");
+                      if(tape_max!=RT_NULL){
+                          flashdb_value.tape_max = tape_max->valueint;
+                          if(flashdb_value.tape_max>0){
+                              app_flashdb_save("tape_max", &flashdb_value.tape_max);
+                          }
+                      }
+                  }
               }
               else{
                   LOG_W("未知的命令: %s", METHOD->valuestring);
               }
           }
-
-
           item_cmd = cJSON_GetObjectItem(root,"cmd");
           item_ext=cJSON_GetObjectItem(root,"ext");
           item_focus = cJSON_GetObjectItem(root,"focus");
@@ -1082,7 +1006,7 @@ int parseDtu(char *json_string)
               }else{
                   send_signal(SIGUSR2);
               }
-
+              ctr_Heat(OFF);
           }
 
           if(item_cmd!=RT_NULL)
@@ -1091,6 +1015,7 @@ int parseDtu(char *json_string)
                   device_status.auto_test_sw=1;
               }else if (strstr(item_cmd->valuestring,"auto_focus")!=RT_NULL) {
                   device_status.autotakepic = 2;
+                  ctr_Heat(OFF);      //2026/06/03  收到对焦拍照指令立即关闭风机
               }
               //补光灯开灯和关灯
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
@@ -1105,10 +1030,10 @@ int parseDtu(char *json_string)
               }
               //采集风机开和关
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
-                  ctr_router(ON);
+                  ctr_Heat(ON);
               }
               if(strstr(item_cmd->valuestring,"windoff")!=RT_NULL){
-                  ctr_router(OFF);
+                  ctr_Heat(OFF);
                }
               //卷带电机执行旋转一次
               if(strstr(item_cmd->valuestring,"translate")!=RT_NULL){
@@ -1239,6 +1164,7 @@ int parseDtu(char *json_string)
                   {
                       ctr_led(OFF);
                       stop_move();
+                      device_status.autotakepic = 0;
                   }
                   else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
                   {
@@ -1363,40 +1289,34 @@ int parseDtu(char *json_string)
                   mqttcfg1 = cJSON_GetObjectItem(item_ext,"mqttcfg1");
                   mqttcfg2 = cJSON_GetObjectItem(item_ext,"mqttcfg2");
                   link_sta = cJSON_GetObjectItem(item_ext,"link_sta");
-                  photo_sta = cJSON_GetObjectItem(item_ext,"photo_sta");
-                  //如果DTU的IMEI和FLash中的不一样,保存到FLASH
-                  value_commn = cJSON_GetObjectItem(item_ext,"photo_sta");
+
                   if(photo_sta!=NULL){
                       device_status.camsta = photo_sta->valueint;
                       LOG_I("相机状态:%d",device_status.camsta);
                   }
 
-                  if(imei!=RT_NULL)
+                  if(strstr(device_status.imei,imei->valuestring)==RT_NULL)
                   {
-                     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);
-                     }
+                       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
                   }
+                  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(iccid!=RT_NULL)
+                  if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
                   {
-                    //如果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);
-                    }
+                      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);
+                  }
+
                   if(datetime!=RT_NULL){
                       LOG_I("DTU时间:%s",datetime->valuestring);
                       int year, month, day, hour, minute, second;
@@ -1523,40 +1443,39 @@ int parseDtu(char *json_string)
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
               {
-                          datt = cJSON_GetObjectItem(item_ext,"datt");
-                          tpl = cJSON_GetObjectItem(item_ext,"tpl");
-                          tph = cJSON_GetObjectItem(item_ext,"tph");
-                          if(device_status.dtype==3)
-                          ds = cJSON_GetObjectItem(item_ext,"ds");
-
-
-                          if(device_status.dtype==7)
-                          ds = cJSON_GetObjectItem(item_ext,"on_off");
-                          if(device_status.dtype==7)
-                          collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
-
-                          cJSON* coll_min = cJSON_GetObjectItem(item_ext,"coll_min");   //采集分钟,数组格式
-
-                          cJSON* x_init_dis= cJSON_GetObjectItem(item_ext,"x_init_dis");
-                          cJSON* y_init_dis= cJSON_GetObjectItem(item_ext,"y_init_dis");
-                          if(x_init_dis!=NULL)
-                          {
-                              if(x_init_dis->valueint>0){
-                                  device_status.x_init_dis = x_init_dis->valueint;
-                                  LOG_I("设置X轴初始位置:%d",device_status.x_init_dis);
-                                  ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
-                              }
-
+                      datt = cJSON_GetObjectItem(item_ext,"datt");
+                      tpl = cJSON_GetObjectItem(item_ext,"tpl");
+                      tph = cJSON_GetObjectItem(item_ext,"tph");
+                      if(device_status.dtype==3)
+                      ds = cJSON_GetObjectItem(item_ext,"ds");
+
+                      if(device_status.dtype==7)
+                      ds = cJSON_GetObjectItem(item_ext,"on_off");
+                      if(device_status.dtype==7)
+                      collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
+
+                      cJSON* coll_min = cJSON_GetObjectItem(item_ext,"coll_min");   //采集分钟,数组格式
+
+                      cJSON* x_init_dis= cJSON_GetObjectItem(item_ext,"x_init_dis");
+                      cJSON* y_init_dis= cJSON_GetObjectItem(item_ext,"y_init_dis");
+                      if(x_init_dis!=NULL)
+                      {
+                          if(x_init_dis->valueint>0){
+                              device_status.x_init_dis = x_init_dis->valueint;
+                              LOG_I("设置X轴初始位置:%d",device_status.x_init_dis);
+                              ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
                           }
-                          if(y_init_dis!=NULL)
-                          {
-                              if(y_init_dis->valueint>0){
-                                   device_status.y_init_dis = y_init_dis->valueint;
-                                   LOG_I("设置Y轴初始位置:%d",device_status.y_init_dis);
-                                   ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
 
-                               }
-                          }
+                      }
+                      if(y_init_dis!=NULL)
+                      {
+                          if(y_init_dis->valueint>0){
+                               device_status.y_init_dis = y_init_dis->valueint;
+                               LOG_I("设置Y轴初始位置:%d",device_status.y_init_dis);
+                               ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
+
+                           }
+                      }
                           if(coll_min!=NULL){
                               if(coll_min->type==cJSON_Array) {
                                   // 获取数组大小
@@ -1784,19 +1703,24 @@ int parseDtu(char *json_string)
                               }
 
                           }
-                   backup_param_to_rtu();
+                    backup_param_to_rtu();
                }
+
           }
         cJSON_Delete(root);
     }
     return 0;
 }
-
+static uint16_t beep_cnt = 0;
 void UpLoad_Data(void)
 {
+    beep_cnt++;
     char *updata = makeJson();
     DTU_Write(updata);
     rt_free(updata);
+    if(atoi(device_status.net)==1&&beep_cnt<=36){
+        Beep_Tip(100);
+    }
     //list_mem();
     //播放数据上传中语音
 }

+ 3 - 962
Application_cbd_apm32f1/applications/hmi.c

@@ -168,7 +168,7 @@ static void Hmi_thread_entry(void *parameter)
                 rx_buffer[rx_length] = '\0';
                 //LOG_I("%s",rx_buffer);
                 //\r 对应的hex为0x0d,0x0a,占两个字节,屏幕发送的数据都以\r结尾
-                HMI_Decode();
+                //HMI_Decode();
         }
         /*********************************************************************************************************************/
         //rt_kprintf("%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
@@ -197,965 +197,6 @@ void Start_timer_Uart2(void)
 
 
 
-/***************************** 解析从屏幕收到的数据 begin **********************************/
-static void HMI_Decode(void)
-{
-    time_t now = time(RT_NULL);
-    static struct tm tm;
-    gmtime_r(&now, &tm);
-    char *json_temp;
-    char *var=NULL;
-    rt_free(var);
-    if(device_status.refresh_num==0)  device_status.refresh_num = 10;
-    if(strstr(rx_buffer,"getFullData") != NULL){
-        char *readinfo =  makeJson_ReadInfo();
-        if(device_status.refresh_num==5)
-        {
-            device_status.refresh_num = 15;
-            DTU_Write("%s",readinfo);
-            //list_mem();
-            device_status.hmi_fresh = 1;
-            rt_thread_delay(100);
-        }
-        //在解析getinfo中清除超时
-        if(device_status.refresh_timeout==30)
-        {
-              rt_sprintf(device_status.sim,"1");
-              rt_sprintf(device_status.net,"1");
-              rt_sprintf(device_status.csq,"0");
-              device_status.camsta = 1;
-              device_status.link_sta=0;
-              device_status.refresh_timeout=0;
-        }
-        rt_free(readinfo);
-        device_status.refresh_num--;
-        device_status.refresh_timeout++;
-        if(device_status.version_type!=6)
-        {
-            HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
-            if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
-            {
-                HMI_WRITE("uploadSet.plt.val=%d",RESET);
-            }
-            else if (strstr(device_status.mqttcfg1,"120.27.222.26")!=NULL) {
-                HMI_WRITE("uploadSet.plt.val=%d",SET);
-            }
-            //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
-            HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg1);
-
-            //更新固件版本号
-            HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
-            //更新固件编译日期
-            HMI_WRITE("debug.t4.txt=\"%s\"",device_status.driver_compile);
-            //
-            HMI_WRITE("debug.t5.txt=\"%s\"",device_status.driver_bl);
-            HMI_WRITE("debug.t7.txt=\"%s\"",device_status.driver_compile);
-            //更新dtu/rtu版本
-            HMI_WRITE("debug.t9.txt=\"%s\"",device_status.driver_4g);
-            //更新时间
-            HMI_WRITE("menu.rtc.txt=\"%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);
-            HMI_WRITE("workSta.rtc.txt=\"%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);
-            HMI_WRITE("set.t0.txt=\"%d\"",tm.tm_hour);
-            HMI_WRITE("set.t1.txt=\"%d\"",tm.tm_min);
-            HMI_WRITE("set.t2.txt=\"%d\"",tm.tm_sec);
-            //更新电压
-            HMI_WRITE("workSta.vbat.txt=\"%s\"",device_status.voltage);
-            //更新电流
-             HMI_WRITE("workSta.power.txt=\"%s\"",device_status.power);
-
-            //更新温湿度数据
-            HMI_WRITE("workSta.envHum.val=%d",atoi(device_status.humidity));
-            HMI_WRITE("workSta.envTem.val=%d",atoi(device_status.tempture));
-            //更新电池状态
-            HMI_WRITE("workSta.batStatus.val=%d",device_status.bat_status);
-            //更新上仓门状态
-            HMI_WRITE("workSta.upStatus.val=%d",device_status.up_status);
-            //更新下仓门状态
-            HMI_WRITE("workSta.downStatus.val=%d",device_status.down_status);
-            //更新工作状态
-            HMI_WRITE("workSta.workStatus.val=%d",device_status.work_status);
-            //更新温控状态
-            HMI_WRITE("workSta.tempStatus.val=%d",device_status.temp_status);
-            //更新雨控状态
-            HMI_WRITE("workSta.rainStatus.val=%d",device_status.rain_status);
-            //更新光控状态
-            HMI_WRITE("workSta.sunStatus.val=%d",device_status.sun_status);
-            //更新有线连接状态
-            HMI_WRITE("menu.va_net.val=%d",device_status.link_sta);
-            //更新CSQ
-            HMI_WRITE("menu.csq_value.txt=\"%s\"",device_status.csq);
-            HMI_WRITE("menu.va_csq.val=%d",atoi(device_status.csq));
-            HMI_WRITE("workSta.csq_value.txt=\"%s\"",device_status.csq);
-            //更新收集时间
-            HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
-            //更新加热时间
-            HMI_WRITE("workSta.heatTime.val=%d",device_status.heattime);
-            HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
-            //
-            HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
-            //更新加热时间和温度
-            HMI_WRITE("workSta.heatTem.val=%d",device_status.heattem);
-            HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
-            //更新加热状态
-            HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
-
-            //更新密码
-            HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
-            //更新时间设置中的参数
-            //更新定时模式
-            HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
-            //更新光控定时时长
-            HMI_WRITE("clockSet.sunBar.val=%d",device_status.sunBar);
-            //更新时控开始
-            HMI_WRITE("clockSet.startBar.val=%d",device_status.startBar);
-            //更新时控结束
-            HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
-            //SIM卡状态
-            HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
-            //ID
-            HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
-            //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
-            //数据上传间隔
-            HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
-            //语音音量
-            HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
-            //更新熄屏时间
-            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);
-
-        #if BOOT_ERR == 1
-        if(atoi(device_status.gps)==1){
-            HMI_WRITE("menu.gps_state.txt=\"定位成功:(%s)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
-        }else if(atoi(device_status.gps)==2){
-            HMI_WRITE("menu.gps_state.txt=\"定位成功:(基站)\"");
-        }
-        #endif
-
-        //更新联网状态
-        if(atoi(device_status.net)==1)
-        {
-            HMI_WRITE("menu.net.val=1");
-            HMI_WRITE("workSta.net.val=1");
-        }
-        else {
-            HMI_WRITE("workSta.net.val=0");
-            HMI_WRITE("menu.net.val=0");
-        }
-        if(atoi(device_status.csq)==0&&atoi(device_status.net)==1)
-        {
-            HMI_WRITE("menu.net.val=1");
-            HMI_WRITE("workSta.net.val=2");
-        }
-        if(device_status.dtype==7)
-        {
-            //更新温湿度数据
-            HMI_WRITE("workSta.env_hum.txt=\"%s\"",device_status.humidity);
-            HMI_WRITE("workSta.env_tem.txt=\"%s\"",device_status.tempture);
-            HMI_WRITE("workSta.on_off.val=%d",device_status.ds);
-            HMI_WRITE("workSta.work_sta.val=%d",device_status.work_status);
-            HMI_WRITE("workSta.collect_fan.val=%d",device_status.collect_fan_status);
-            //更新电池状态
-            HMI_WRITE("workSta.bat_sta.val=%d",device_status.bat_status);
-            //更新散热风机状态
-            HMI_WRITE("workSta.cool_fan.val=%d",device_status.cool_fan_status);
-            //更新开关状态
-            HMI_WRITE("workSta.on_off.val=%d",device_status.ds);
-            //更新工作状态
-            HMI_WRITE("workSta.work_sta.val=%d",device_status.work_status);
-            //箱内温度-外壳
-            HMI_WRITE("workSta.box_tmp.txt=\"%d\"",device_status.box_temp);
-            HMI_WRITE("temHum.box_tmp.txt=\"%d\"",device_status.box_temp);
-            //制冷开关
-            HMI_WRITE("workSta.cold_sw.val=%d",device_status.cold_sw);
-            HMI_WRITE("sysSet.cold_sw.val=%d",device_status.cold_sw);
-            //制冷状态
-            HMI_WRITE("workSta.cold_sta.val=%d",device_status.cold_status);
-            HMI_WRITE("sysSet.cold_sw.val=%d",device_status.cold_sw);
-            //培养温度
-            HMI_WRITE("workSta.set_temp.val=%d",device_status.heatvalue);
-            HMI_WRITE("sysSet.keep.val=%d",device_status.heatvalue);
-            //数据上传间隔
-            HMI_WRITE("sysSet.datt.val=%d",device_status.dattim);
-            HMI_WRITE("sysSet.lcd_time.val=%d",device_status.thsp*60);
-            //当前温度-培养仓
-            HMI_WRITE("workSta.pre_temp.val=%d",device_status.pre_temp);
-            //设定培养时间
-            HMI_WRITE("workSta.cul_time.val=%d",device_status.cul_time);
-            HMI_WRITE("clockSet.stay.val=%d",device_status.cul_time);
-            //已培养时间
-            if(device_status.develop_flag==0)
-            HMI_WRITE("workSta.staytime.txt=\"0\"");
-            //滴液时间
-            HMI_WRITE("clockSet.drop.val=%d",device_status.shake_sec);
-            //采集开始时间1
-            HMI_WRITE("clockSet.start1.val=%d",device_status.collecting_sh1);
-            //采集开始时间2
-            HMI_WRITE("clockSet.start2.val=%d",device_status.collecting_sh2);
-            //采集结束时间1
-            HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_eh1);
-            //采集结束时间2
-            HMI_WRITE("clockSet.end2.val=%d",device_status.collecting_eh2);
-            if(device_status.autotakepic==0) HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-        }
-        /**********************************吸虫塔*********************************/
-        if(device_status.version_type==6)
-        {
-            HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
-            //更新电压
-            HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
-            //工作状态
-            HMI_WRITE("menu.worksta.val=%d",device_status.work_status);
-            //网卡0状态
-            HMI_WRITE("menu.eth0_sta.val=%d",device_status.link_sta);
-            //更新电流
-             HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
-            //更新温湿度数据
-            HMI_WRITE("menu.envHum.txt=\"%s%RH\"",device_status.humidity);
-            HMI_WRITE("menu.envTem.txt=\"%s℃\"",device_status.tempture);
-            HMI_WRITE("uploadSet.st.val=%d",device_status.startBar);
-            HMI_WRITE("uploadSet.et.val=%d",device_status.stopBar);
-            HMI_WRITE("menu.board_temp.txt=\"%d.%d℃\"",Get_Temprate()/100,Get_Temprate()%100);
-            //数据上传间隔
-            HMI_WRITE("menu.datt.val=%d",device_status.dattim);
-            //SIM卡状态
-            HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
-            //更新震动时间
-            HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
-            //校准屏幕的RTC
-            HMI_WRITE("rtc0=%d",tm.tm_year+1900);
-            HMI_WRITE("rtc1=%d",tm.tm_mon+1);
-            HMI_WRITE("rtc2=%d",tm.tm_mday);
-            HMI_WRITE("rtc3=%d",tm.tm_hour);
-            HMI_WRITE("rtc4=%d",tm.tm_min);
-            HMI_WRITE("rtc5=%d",tm.tm_sec);
-
-            //更新熄屏时间
-            HMI_WRITE("thsp=%d",device_status.thsp);
-        }
-
-
-        /**********************************************************************/
-    }
-    else if (strstr(rx_buffer,"getClockData")!=NULL) {
-        //更新定时模式
-        HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
-        //更新光控定时时长
-        HMI_WRITE("clockSet.sunBar.val=%d",device_status.sunBar);
-        //更新时控开始
-        HMI_WRITE("clockSet.startBar.val=%d",device_status.startBar);
-        //更新时控结束
-        HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
-    }
-    else if (strstr(rx_buffer,"button")!=NULL) {
-        LOG_D("button!");
-        DTU_Write("button");
-    }
-    //拍照
-    else if(strstr(rx_buffer,"putTest.switchPhoto=1")!=NULL) {
-        device_status.photo_ws = 1;
-    }
-    else if (strstr(rx_buffer,"putTest.switchPic=1")!=NULL) {
-        device_status.photo_ws = 1;
-    }
-
-    //打开电磁阀
-    else if (strstr(rx_buffer,"putTest.switchDrop=1")!=NULL) {
-        LOG_I("开始滴液!");
-        #if Color_EN == 1
-        device_status.run_sta = 5;
-        #else
-        ctr_shake(ON, device_status.shake_sec);
-        #endif
-    }
-    //关闭电磁阀
-    else if (strstr(rx_buffer,"putTest.switchDrop=0")!=NULL) {
-        LOG_I("停止滴液!");
-        ctr_shake(OFF, 0);
-    }
-    //打开补光
-    else if (strstr(rx_buffer,"putTest.switchLed=1")!=NULL) {
-        LOG_I("打开补光!!");
-        ctr_led(ON);
-    }
-    //关闭补光
-    else if (strstr(rx_buffer,"putTest.switchLed=0")!=NULL) {
-        LOG_I("关闭补光!!!");
-        ctr_led(OFF);
-    }
-    //关闭加热
-    else if(strstr(rx_buffer,"putTest.switchHeat=0")!=NULL) {
-        device_status.heat_status = 0;
-        ctr_Heat(OFF);
-        LOG_I("Close Heat!");
-    }
-    //打开加热
-    else if(strstr(rx_buffer,"putTest.switchHeat=1")!=NULL) {
-        device_status.heat_status = 1;
-        ctr_Heat(ON);
-        LOG_I("Open Heat!");
-    }
-    //打开制冷
-    else if(strstr(rx_buffer,"putTest.switchCold=1")!=NULL) {
-        ctr_Cold(ON);
-        LOG_I("Open Cold!");
-    }
-    //关闭制冷
-    else if(strstr(rx_buffer,"putTest.switchCold=0")!=NULL) {
-        ctr_Cold(OFF);
-        LOG_I("Close Cold!");
-    }
-    //打开采集
-    else if(strstr(rx_buffer,"putTest.switchCollect=1")!=NULL){
-        ctr_Collect_Fan(ON);
-        LOG_I("采集风机已打开!");
-    }
-    //关闭采集
-    else if(strstr(rx_buffer,"putTest.switchCollect=0")!=NULL){
-        ctr_Collect_Fan(OFF);
-        LOG_I("采集风机已关闭!");
-    }
-    //打开散热
-    else if(strstr(rx_buffer,"putTest.switchCool=1")!=NULL){
-        ctr_Cool_Fan(ON);
-        LOG_I("散热风机已打开!");
-    }
-    //关闭散热
-    else if(strstr(rx_buffer,"putTest.switchCool=0")!=NULL){
-        ctr_Cool_Fan(OFF);
-        LOG_I("散热风机已关闭!");
-    }
-
-    //开始对焦拍照
-    else if(strstr(rx_buffer,"putTest.switchAutopic=1")!=NULL){
-        device_status.autotakepic=1;
-        rt_kprintf("开始对焦拍照!\n");
-    }
-    //停止对焦拍照
-    else if(strstr(rx_buffer,"putTest.switchAutopic=0")!=NULL){
-        device_status.autotakepic=0;
-    }
-    //粘附测试-开
-    else if(strstr(rx_buffer,"putTest.switchFsl=1")!=NULL){
-        rt_kprintf("粘附测试开!\n");
-        device_status.fsl_sw = 1;
-    }
-    //粘附测试-关
-    else if(strstr(rx_buffer,"putTest.switchFsl=0")!=NULL){
-        rt_kprintf("粘附测试关!\n");
-        pwm_off(2, 0);
-        pwm_off(3,0);
-    }
-    else if (strstr(rx_buffer,"putTest.switchAutotest=1")!=NULL)
-    {
-        LOG_I("开始一键测试!!!");
-        device_status.auto_test_sw=1;
-    }
-    else if (strstr(rx_buffer,"putTest.switchAutotest=1")!=NULL)
-    {
-        LOG_I("停止一键测试!!!");
-        device_status.auto_test_sw=0;
-    }
-    //震动
-    else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
-        LOG_I("震动!");
-        if(device_status.version_type==6)
-        {
-            Motor_shake(ON, device_status.shake_sec);
-        }
-        else{
-            ctr_shake(ON,device_status.shake_sec);
-        }
-    }
-    //打开补光
-    else if (strstr(rx_buffer,"putTest.switchFill=1")!=NULL) {
-        rt_kprintf("\n打开补光!!!\n");
-        ctr_led(ON);
-    }
-    //关闭补光
-    else if (strstr(rx_buffer,"putTest.switchFill=0")!=NULL) {
-        rt_kprintf("\n关闭补光!!!\n");
-        ctr_led(OFF);
-    }
-    //打开灯管
-    else if (strstr(rx_buffer,"putTest.switchLamp=1")!=NULL)
-    {
-        device_status.test_flag=1;
-        rt_kprintf("Open Lamp!\n");
-        ctr_lamp(ON,1);
-        #if LAMP_EN == 1
-        ctr_lamp(ON,2);
-        ctr_lamp(ON,3);
-        #endif
-    }
-
-    //关闭灯管
-    else if (strstr(rx_buffer,"putTest.switchLamp=0")!=NULL)
-    {
-        device_status.test_flag=0;
-        rt_kprintf("Close Lamp1!\n");
-        ctr_lamp(OFF,1);
-        #if LAMP_EN == 1
-        ctr_lamp(OFF,2);
-        ctr_lamp(OFF,3);
-        #endif
-    }
-    //关闭加热
-    else if(strstr(rx_buffer,"putTest.switchHeat=0")!=NULL) {
-        device_status.heat_status = 0;
-        ctr_Heat(OFF);
-        rt_kprintf("Close Heat!\n");
-    }
-    //打开加热
-    else if(strstr(rx_buffer,"putTest.switchHeat=1")!=NULL) {
-        device_status.heat_status = 1;
-        ctr_Heat(ON);
-        rt_kprintf("Open Heat!\n");
-    }
-    else if(strstr(rx_buffer,"putTest.Testpaichong")!=NULL){
-        if(device_status.collt_box_sta==0){
-            device_status.collt_box_sta = 111;
-        }else{
-            HMI_WRITE("sysTest.result.txt=\"请等待当前执行完成再进行操作\"");
-        }
-        LOG_I("排虫测试!");
-    }
-    //排虫
-    else if(strstr(rx_buffer,"putTest.paichong")!=NULL){
-        if(device_status.run_sta == 0){
-            device_status.run_sta = 111;
-        }else{
-            HMI_WRITE("sysTest.result.txt=\"请等待当前执行完成再进行操作\"");
-        }
-
-        LOG_I("开始排虫!");
-        device_status.handle_bugger = 0;
-        ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
-    }
-    else if(strstr(rx_buffer,"putTest.shouchong")!=NULL){
-        if(device_status.run_sta == 0){
-            device_status.run_sta = 112;
-        }else{
-            HMI_WRITE("sysTest.result.txt=\"请等待当前执行完成再进行操作\"");
-        }
-
-        LOG_I("开始收虫!");
-        device_status.handle_bugger = 1;
-        ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
-    }
-    //设置设备时间
-    else if (strstr(rx_buffer,"stamp=")!=NULL)
-    {
-        var = strstr(rx_buffer,"=");
-        var ++;
-        LOG_I("设置时间:%s",var);
-        static char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
-        strncpy(year_s, var, 4);
-        strncpy(month_s,var+4,2);
-        strncpy(day_s,var+6,2);
-        strncpy(hour_s,var+8,2);
-        strncpy(min_s,var+10,2);
-        strncpy(sec_s,var+12,2);
-        if(atoi(year_s)>=2024&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
-        {
-            if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
-            {
-                LOG_I("设置日期:%d年%d月%d日",atoi(year_s),atoi(month_s),atoi(day_s));
-                if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=59&&atoi(sec_s)>=0&&atoi(sec_s)<=59)
-                {
-                    LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
-                    set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
-                    MA_save();
-                }
-                //上传最新数据
-                device_status.num_updata = 2;  //2秒后上报数据更新RTU的时间
-            }
-            else {
-                LOG_E("set_date failed!");
-            }
-        }
-    }
-    //定时设置
-    else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
-        char value_str[10];
-        memset(value_str,0,sizeof(value_str));
-        if(device_status.dtype==7)
-        {
-            var = strstr(rx_buffer,"=");
-            var ++;
-            strncpy(value_str,var,2);
-            if(atoi(value_str)>=0&&atoi(value_str)<=23)
-            {
-                device_status.collecting_sh1 = atoi(value_str);
-                ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
-            }
-            else {
-                LOG_E("Set collecting_sh1 Failed!");
-            }
-            memset(value_str,0,sizeof(value_str));
-            strncpy(value_str,var+2,2);
-            if(atoi(value_str)>=0&&atoi(value_str)<=23)
-            {
-                device_status.collecting_eh1 = atoi(value_str);
-                ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
-            }
-            else {
-                LOG_E("Set collecting_eh1 Failed!");
-            }
-            memset(value_str,0,sizeof(value_str));
-            strncpy(value_str,var+4,2);
-            if(atoi(value_str)>=0&&atoi(value_str)<=23)
-            {
-                device_status.collecting_sh2 = atoi(value_str);
-                ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
-            }
-            else {
-                LOG_E("Set collecting_sh2 Failed!");
-            }
-            memset(value_str,0,sizeof(value_str));
-            strncpy(value_str,var+6,2);
-            if(atoi(value_str)>=0&&atoi(value_str)<=23)
-            {
-                device_status.collecting_eh2 = atoi(value_str);
-                ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
-            }
-            else {
-                LOG_E("Set collecting_eh2 Failed!");
-            }
-            memset(value_str,0,sizeof(value_str));
-            strncpy(value_str,var+8,2);
-            if(atoi(value_str)>=0&&atoi(value_str)<=23)
-            {
-                device_status.shake_sec = atoi(value_str);
-                ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
-            }
-            else {
-                LOG_E("Set shake_sec Failed!");
-            }
-            memset(value_str,0,sizeof(value_str));
-            strncpy(value_str,var+10,2);
-            if(atoi(value_str)>0&&atoi(value_str)<=24)
-            {
-                device_status.cul_time = atoi(value_str);
-                ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
-            }
-            else {
-                LOG_E("Set cul_time Failed!");
-            }
-
-            MA_save();
-            LOG_I("参数已保存:%d-%d-%d-%d-%d-%d",device_status.collecting_sh1,device_status.collecting_eh1,device_status.collecting_sh2,device_status.collecting_eh2,device_status.shake_sec,device_status.cul_time);
-            return;
-        }
-        LOG_I("时间设置!");
-        var=strstr(rx_buffer,"=");
-        var++;
-        strncpy(value_str,var,2);
-        if(atoi(value_str) > 0 && atoi(value_str) <60)
-        {
-            if(device_status.version_type!=6)
-            {
-                #if LAMP_EN == 1
-                if(device_status.sunBar%3==0)
-                #endif
-                device_status.sunBar=atoi(value_str);
-                ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
-            }
-            else {
-                device_status.shake_sec = atoi(value_str);
-                ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
-            }
-
-//            time_t now;
-//            time(&now);
-//            static struct tm nowstamp;
-//            nowstamp =*localtime(&now);
-//            nowstamp.tm_hour = nowstamp.tm_hour - 8;
-//            static rt_uint32_t nowstamp_num = 0;
-//            nowstamp_num = mktime(&nowstamp);
-//            device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-        }
-        else {
-            LOG_E("参数设置异常(光控时长):%d!!!",atoi(value_str));
-        }
-        memset(value_str,0,sizeof(value_str));
-        //时控开始时间
-        strncpy(value_str,var+2,2);
-        if(atoi(value_str) >= 0 && atoi(value_str) < 24)
-        {
-            #if 1
-            device_status.startBar=atoi(value_str);
-            ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
-            #endif
-        }
-        else {
-            LOG_E("参数设置异常(开始):%d!!!",atoi(value_str));
-        }
-        memset(value_str,0,sizeof(value_str));
-        //
-        strncpy(value_str,var+4,2);
-        if(atoi(value_str) >= 0&& atoi(value_str) < 24)
-        {
-            #if 1
-            device_status.stopBar=atoi(value_str);
-            ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
-            #endif
-        }
-        else {
-            LOG_E("参数设置异常(结束):%d!!!",atoi(value_str));
-        }
-        memset(value_str,0,sizeof(value_str));
-        //
-        strncpy(value_str,var+6,2);
-        if(atoi(value_str) >= 0 && atoi(value_str) <= 1)
-        {
-            device_status.timeSwitch=atoi(value_str);
-            ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
-        }
-        else {
-            if(device_status.version_type==6)
-            {
-                device_status.timeSwitch=1;
-                device_status.dattim=atoi(value_str);
-                ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
-                ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
-            }
-            else {
-                LOG_E("参数设置异常(模式):%d!!!",atoi(value_str));
-            }
-        }
-        //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, "修改工作时间");
-        ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-        rt_thread_delay(2000);
-        MA_save();
-        rt_free(var);
-        rt_kprintf("工作时间参数已保存:模式-%d,光控时间-%d,时控开始时间-%d,时控结束时间-%d\n",device_status.timeSwitch,device_status.sunBar,device_status.startBar,device_status.stopBar);
-    }
-    else if (strstr(rx_buffer,"saveSystemSet")!=NULL) {
-            static char clt_time_str[3],heattime_str[3],heatvale_str[4],vol_str[4],thsp_str[5];
-            static char value_temp[5];
-            LOG_I("系统设置!");
-            if(device_status.dtype==7)
-            {
-                LOG_I("系统设置,孢子仪!");
-                var = strstr(rx_buffer,"=");
-                var ++;
-                memset(value_temp,0,sizeof(value_temp));
-                strncpy(value_temp,var,2);
-                if(atoi(value_temp)==0 || atoi(value_temp) == 1)
-                {
-                    device_status.cold_sw = atoi(value_temp); //制冷开关
-                    ef_set_env_blob("cold_sw", &device_status.cold_sw, sizeof(device_status.cold_sw));
-                }
-                else {
-                    LOG_E("制冷开关参数设置错误!");
-                }
-                memset(value_temp,0,sizeof(value_temp));
-                strncpy(value_temp,var+2,2);
-                if(atoi(value_temp)>=0 && atoi(value_temp) <= 7)
-                {
-                    device_status.vol = atoi(value_temp); //音量
-                }
-                else {
-                    LOG_E("音量参数设置错误!");
-                }
-                memset(value_temp,0,sizeof(value_temp));
-                strncpy(value_temp,var+4,2);
-                if(atoi(value_temp)>=10 && atoi(value_temp) <= 50)
-                {
-                    device_status.heatvalue = atoi(value_temp); //设定的培养温度
-                    ef_set_env_blob("heatvalue", &device_status.heatvalue, sizeof(device_status.heatvalue));
-                }
-                else {
-                    LOG_E("培养温度参数设置失败!");
-                }
-                memset(value_temp,0,sizeof(value_temp));
-                strncpy(value_temp,var+6,2);
-                if(atoi(value_temp)>=1 && atoi(value_temp) <= 60)
-                {
-                    device_status.dattim = atoi(value_temp); //设定的数据上传间隔,单位:分钟
-                    ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
-                }
-                else {
-                    LOG_E("数据上传间隔参数设置失败!");
-                }
-                memset(value_temp,0,sizeof(value_temp));
-                strncpy(value_temp,var+8,2);
-                if(atoi(value_temp)>=1 && atoi(value_temp) <= 30)
-                {
-                    device_status.thsp = atoi(value_temp); //设定的息屏间隔,单位:分钟
-                    ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
-                }
-                else {
-                    LOG_E("数据息屏间隔参数设置失败!");
-                }
-                LOG_I("制冷开关:%d",device_status.cold_sw);
-                LOG_I("系统设置已保存:\n自动熄屏-%d\n音量-%d\n培养温度-%d\n数据上传间隔-%d",device_status.thsp,device_status.vol,device_status.heatvalue,device_status.dattim);
-                MA_save();
-                return;
-            }
-        var = strstr(rx_buffer,"=");
-        var ++;
-        strncpy(clt_time_str,var,2);
-        if(atoi(clt_time_str)>0 && atoi(clt_time_str) <= 30)
-        {
-            device_status.clt_time = atoi(clt_time_str); //收集时间
-            ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
-        }
-        strncpy(heattime_str,var+2,2);
-        if(atoi(heattime_str)>0 && atoi(heattime_str) <= 30)
-        {
-            rt_kprintf("加热时间:%d\n",atoi(heattime_str));
-            device_status.heattime = atoi(heattime_str); //加热时间
-            ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
-        }
-        strncpy(heatvale_str,var+4,3);
-        if(atoi(heatvale_str) > 0 && atoi(heatvale_str) <= 130)
-        {
-            device_status.heatvalue=atoi(heatvale_str);
-            ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
-        }
-        strncpy(vol_str,var+7,3);
-        if(atoi(vol_str)>0&&atoi(vol_str)<8)
-        {
-            device_status.vol = atoi(vol_str);   //音量
-            DTU_Write("volume=");
-        }
-        strncpy(thsp_str,var+10,4);
-        if(atoi(thsp_str)>0&&atoi(thsp_str)<3600)
-        {
-            device_status.thsp = atoi(thsp_str);  //熄屏时间
-        }
-        else {
-            rt_kprintf("参数设置失败!!!\n");
-        }
-        rt_thread_delay(1000);
-        MA_save();
-        rt_free(var);
-        rt_kprintf("系统设置已保存:收集时间-%d,加热时间-%d,加热温度-%d,音量-%d,自动关屏-%d\n",device_status.clt_time,device_status.heattime,device_status.heatvalue,device_status.vol,device_status.thsp);
-    }
-    else if (strstr(rx_buffer,"rtc_h=")!=NULL) {
-        char rtc_h[2];
-        var = strstr(rx_buffer,"=");
-        var++;
-        strncpy(rtc_h,var,2);
-        if(atoi(rtc_h)>=0 && atoi(rtc_h) <= 24)
-        {
-            set_time(atoi(rtc_h), 99, 99);
-        }
-    }
-    else if (strstr(rx_buffer,"rtc_m=")!=NULL) {
-        char rtc_m[2];
-        var = strstr(rx_buffer,"=");
-        var++;
-        strncpy(rtc_m,var,2);
-        if(atoi(rtc_m)>=0 && atoi(rtc_m) <= 24)
-        {
-            set_time(99, atoi(rtc_m), 99);
-        }
-    }
-    else if (strstr(rx_buffer,"rtc_s=")!=NULL) {
-        char rtc_s[2];
-        var = strstr(rx_buffer,"=");
-        var++;
-        strncpy(rtc_s,var,2);
-        if(atoi(rtc_s)>=0 && atoi(rtc_s) <= 24)
-        {
-            set_time(99, 99, atoi(rtc_s));
-        }
-    }
-    else if(strstr(rx_buffer,"saveUploadSet=")!=NULL)
-    {
-        static char dattim_str[3];
-        rt_kprintf("上传间隔设置!\n");
-        var = strstr(rx_buffer,"=");
-        var ++;
-        strncpy(dattim_str,var,2);
-        if(atoi(dattim_str)>=1&&atoi(dattim_str)<=120)
-        {
-            device_status.dattim =atoi(dattim_str); //数据上传间隔
-            ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
-            MA_save();
-        }
-        else {
-            rt_kprintf("设置失败!!!\n");
-        }
-        rt_free(var);
-        rt_kprintf("数据上传设置:%d\n",device_status.dattim);
-    }
-    //光控测试
-    else if(strstr(rx_buffer,"putTest.switchSun=1")!=NULL)
-    {
-        rt_kprintf("光控测试!!!");
-        ctr_lamp(ON,1);
-        device_status.sun_test = 1;
-    }
-    else if (strstr(rx_buffer,"setshake_sec=")!=NULL)
-    {
-        static char shakesec_str[4];
-        LOG_I("震动时间设置!");
-        var = strstr(rx_buffer,"=");
-        var ++;
-        strncpy(shakesec_str,var,2);
-        if(atoi(shakesec_str)>=0&&atoi(shakesec_str)<=10)
-        {
-            device_status.shake_sec =atoi(shakesec_str)*10; //
-        }
-        else {
-            LOG_E("设置失败!!!");
-        }
-        rt_free(var);
-        LOG_D("震动时间设置:%d",device_status.shake_sec);
-    }
-    //恢复出厂设置电池
-    else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
-    {
-        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, "系统重置");
-        ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-
-    }
-    //恢复出厂设置-交流
-    else if (strstr(rx_buffer,"resetDefault")!=NULL)
-    {
-        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, "系统重置");
-        ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-    }
-    //获取SIM卡信息
-    else if(strstr(rx_buffer,"getSim")!=NULL)
-    {
-        //http://sim.openluat.com/api/wechat/openapidoc
-        DTU_Write("getsiminfo");
-    }
-    else if (strstr(rx_buffer,"DebugEnable")!=NULL) {
-        Debug_log_ON();
-    }
-    else if (strstr(rx_buffer,"DebugDisable")!=NULL) {
-        Debug_log_OFF();
-    }
-    else if((strstr(rx_buffer,"SwversionV7")!=NULL)) {
-        if(device_status.dtype!=7)
-        {
-            LOG_D("设置版本类型:7");
-            device_status.dtype = 7;
-            device_status.version_type = 7;
-            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //设备类型
-            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
-            DTU_Write("SwversionV7");
-            MA_save();
-        }
-    }
-    else if(strstr(rx_buffer,"DisplayPower")!=RT_NULL)
-    {
-        HMI_WRITE("sysTest.sysTest_power.txt=\"%s\"",device_status.power);
-        HMI_WRITE("sysTest.heat_txt.txt=\"%s\"",device_status.heat_power);
-//        HMI_WRITE("sysTest.switchHeat.val=%d",device_status.heat_status);
-    }
-    //立即上传
-    else if(strstr(rx_buffer,"uploaddata")!=RT_NULL)
-    {
-        UpLoad_Data();
-    }
-    else if (strstr(rx_buffer,"checkupdate")!=NULL)
-    {
-        time_t now = time(RT_NULL);
-        static struct tm tm;
-        gmtime_r(&now, &tm);
-        HMI_WRITE("hardcheck.tip_rtc.txt=\"%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);
-        HMI_WRITE("hardcheck.p0.pic=%d",70);
-        //RTC时间判断,如果当前年份小于2020,提示需要设置时间
-        if(tm.tm_year+1900<2020)
-        {
-            rt_kprintf("时间未设置:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
-            HMI_WRITE("hardcheck.tip_rtc.txt=%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);
-        }
-    }
-    //进入bootloader模式
-    else if (strstr(rx_buffer,"bootloader")!=NULL) {
-        device_status.stop_in_bootloader = 1;
-        ef_set_env_blob("stop_in_bootloader", &device_status.stop_in_bootloader, sizeof(device_status.stop_in_bootloader));
-        rt_hw_cpu_reset();
-    }
-    //软件重启
-    else if (strstr(rx_buffer,"reboot")!=NULL) {
-        rt_hw_cpu_reset();
-    }
-    //屏幕上触发远程升级
-    else if (strstr(rx_buffer,"hmi_update")!=NULL) {
-        DTU_Write("hmi_update");
-        device_status.update_flag = 1;
-        ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
-        rt_thread_delay(2000);
-        rt_hw_cpu_reset();
-    }else if (strstr(rx_buffer,"checkcamera")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"checkcamera\"}");
-        //校准屏幕的RTC
-        HMI_WRITE("rtc0=%d",tm.tm_year+1900);
-        HMI_WRITE("rtc1=%d",tm.tm_mon+1);
-        HMI_WRITE("rtc2=%d",tm.tm_mday);
-        HMI_WRITE("rtc3=%d",tm.tm_hour);
-        HMI_WRITE("rtc4=%d",tm.tm_min);
-        HMI_WRITE("rtc5=%d",tm.tm_sec);
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"ReadCamParam")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"ReadParam\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }//SaveCamParam:2070.00000-0.7-144-30-0-0-5472*5472
-    else if (strstr(rx_buffer,"SaveCamParam")!=NULL){
-        const char *prefix ="SaveCamParam:";
-        size_t prefix_len = strlen(prefix);
-        const char *start_pos = strstr(rx_buffer, prefix);
-        if(start_pos!=NULL)
-        {
-            // 移动到前缀之后的位置
-            start_pos += prefix_len;
-            DTU_Write("%s",makeJson_Cam("SaveParam",start_pos));
-        }
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"GrabOn")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"GrabOn\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"GrabOff")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"GrabOff\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }
-    else if(strstr(rx_buffer,"SelfCheck")!=NULL)
-    {
-        //校准屏幕的RTC
-        HMI_WRITE("rtc0=%d",tm.tm_year+1900);
-        HMI_WRITE("rtc1=%d",tm.tm_mon+1);
-        HMI_WRITE("rtc2=%d",tm.tm_mday);
-        HMI_WRITE("rtc3=%d",tm.tm_hour);
-        HMI_WRITE("rtc4=%d",tm.tm_min);
-        HMI_WRITE("rtc5=%d",tm.tm_sec);
-        device_status.selfcheck_ws = 2;
-        LOG_W("开始自检:%d",device_status.selfcheck_ws);
-    }
-}
 
 #define EPS 1e-3
 // 找出一维数组中最大数的索引
@@ -1519,10 +560,10 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.auto_test_sw==1)
         {
             //开始采集风机持续5S
-            ctr_router(ON);
+            ctr_Heat(ON);
             rt_thread_delay(1000*60);
             //关闭采集风机
-            ctr_router(OFF);
+            ctr_Heat(OFF);
             //胶带传送
             turnlimit();
             rt_thread_delay(1000);

+ 1 - 1
Application_cbd_apm32f1/applications/main.c

@@ -32,7 +32,7 @@ int main(void)
     led_set_level(1,0);
     clock_information();
     Beep_Tip(100);
-    ctr_Heat(ON);
+    ctr_router(ON);
     Check_ParamConfig();
     //打印内存占用
     memtrace(0, NULL);

+ 37 - 46
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -64,10 +64,10 @@ int Read_Heat_Current(void);
 
 // 定义滑动平均滤波器结构体
 typedef struct {
-    float* buffer;
+    rt_uint16_t* buffer;
     int bufferSize;
     int currentIndex;
-    float sum;
+    rt_uint16_t sum;
 } MovingAverageFilter;
 
 // 初始化滑动平均滤波器
@@ -77,7 +77,7 @@ MovingAverageFilter* moving_average_filter_init(int size) {
         return NULL;
     }
 
-    filter->buffer = (float*)calloc(size, sizeof(float));
+    filter->buffer = (rt_uint16_t*)calloc(size, sizeof(rt_uint16_t));
     if (filter->buffer == NULL) {
         free(filter);
         return NULL;
@@ -91,7 +91,7 @@ MovingAverageFilter* moving_average_filter_init(int size) {
 }
 
 // 更新滑动平均滤波器
-float moving_average_filter_update(MovingAverageFilter* filter, float newValue) {
+rt_uint16_t moving_average_filter_update(MovingAverageFilter* filter, rt_uint16_t newValue) {
     filter->sum -= filter->buffer[filter->currentIndex];
     filter->buffer[filter->currentIndex] = newValue;
     filter->sum += newValue;
@@ -108,40 +108,6 @@ void moving_average_filter_free(MovingAverageFilter* filter) {
 }
 
 
-
-/*串口初始化*/
-int UART_485_INIT(void)
-{
-    serial_485  = rt_device_find(UART_485);
-    /*修改串口配置参数*/
-    uart_config_485.baud_rate = BAUD_RATE_9600;  //修改波特率9600
-    uart_config_485.data_bits = DATA_BITS_8;     //数据位8
-    uart_config_485.stop_bits = STOP_BITS_1;     //停止位1
-    #ifdef RT_USING_SERIAL_V2
-    uart_config_485.rx_bufsz = 128;
-    uart_config_485.tx_bufsz = 128;
-    #else
-    uart_config_485.bufsz = 128;                 //缓冲区128bytes
-    #endif
-    uart_config_485.parity = PARITY_NONE;        //奇校验
-    /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
-    rt_device_control(serial_485, RT_DEVICE_CTRL_CONFIG, &uart_config_485);
-    /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
-
-    #ifdef RT_USING_SERIAL_V2
-    rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
-    #else
-    rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_INT_RX);;  //RT_DEVICE_FLAG_DMA_RX
-    #endif
-    if(uart_res!=RT_EOK)
-    {
-        LOG_E("%s打开失败!",UART_485);
-    }else{
-        LOG_I("%s Open Success!",UART_485);
-    }
-    return 0;
-}
-
 /* 入口函数 */
 static void sht30_collect_thread_entry(void *parameter)
 {
@@ -155,6 +121,9 @@ static void sht30_collect_thread_entry(void *parameter)
              }else{
                  RV = 10000 * (4096 - ntc_adc_read) / ntc_adc_read;
                  device_status.heattem = TempCalculate(RV, 3950, 10000);
+                 if(device_status.heattem<=-40){
+                     device_status.heattem = atoi(device_status.tempture);
+                 }
              }
          }
 
@@ -182,6 +151,27 @@ static void Power_ReadCheck(void *parameter)
     rt_thread_delay(1000);
     while(1)
     {
+
+#if PCB_V1 == 0
+        rt_uint16_t _24v_current_int = moving_average_filter_update(filter,Read_Real_Current());
+        if(_24v_current_int-2430>0)
+        {
+            sprintf(device_status.power,"%.2f",(float)(_24v_current_int-2400)/0.4);
+        }else {
+            sprintf(device_status.power,"0.0");
+        }
+
+        //消除误差
+        if(Read_Heat_Current()-2450<10)
+        {
+            sprintf(device_status.heat_power,"%.f",0.0);
+        }
+        else
+        {
+            //rt_uint16_t _heat_current_int = moving_average_filter_update(filter_hi,Read_Heat_Current());
+            sprintf(device_status.heat_power,"%.2f",(float)(Read_Heat_Current()-2450)/0.1);     //2481-2465
+        }
+        #else
         sprintf(device_status.power,"%.2f",(float)(moving_average_filter_update(filter, (float)Read_Real_Current()))/100.0*2.5);
         //消除误差
         if(Read_Heat_Current()-2465<10)
@@ -192,12 +182,14 @@ static void Power_ReadCheck(void *parameter)
         {
             sprintf(device_status.heat_power,"%.2f",(float)(moving_average_filter_update(filter_hi, Read_Heat_Current())-2465)/0.1);     //2481-2465
         }
+        #endif
+
         //LOG_I("负载电流:%s,加热电流:%s",device_status.power,device_status.heat_power);
 
         if(atof(device_status.voltage)<22.0)    //小于22.0V,并且持续10S,欠压
         {
             bat_cnt++;
-        }else if(atof(device_status.voltage)>24.0)    //大于24.0V,解除欠压
+        }else if(atof(device_status.voltage)>=24.0)    //大于24.0V,解除欠压
         {
             bat_cnt = 0;
             device_status.C01 &= ~(1<<4);
@@ -209,13 +201,9 @@ static void Power_ReadCheck(void *parameter)
             device_status.C01 |= (1<<4);
             device_status.bat_status = 1; //欠压
         }
-        #if ROBOT_EN == 0
         //rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
         sprintf(device_status.voltage,"%.2f",(float)(moving_average_filter_update(filter_v, (float)Read_Real_Voltage()/100)));
-        //LOG_D("voltage is:%sV",device_status.voltage);
-        sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
 
-        #endif
         rt_thread_mdelay(10);
     }
     moving_average_filter_free(filter);
@@ -234,13 +222,16 @@ int Read_Real_Current(void)
     }
     HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
     rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_1);
-    rt_adc_enable(adc_dev, 17);
     adc1_value = rt_adc_read(adc_dev, ADC_DEV_CHANNLE_1);
-    in_adc_17 = rt_adc_read(adc_dev, 17);
     /* 关闭通道 */
     rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_1);
-    //LOG_D("Read_Real_Current:%d,%d",adc1_value,adc1_value * REFER_VOLTAGE/CONVERT_BITS*15);
+#if PCB_V1 == 0
+    return  (adc1_value * REFER_VOLTAGE/CONVERT_BITS*15);
+#else
+    rt_adc_enable(adc_dev, 17);
+    in_adc_17 = rt_adc_read(adc_dev, 17);
     return  (ADC_VOL_BASE * (adc1_value*1.0)/(in_adc_17*1.0))*100000;
+#endif
 }
 
 int Read_Heat_Current(void)

+ 0 - 3
Application_cbd_apm32f1/applications/sht30_collect.h

@@ -11,13 +11,10 @@
 #define APPLICATIONS_INC_SHT30_COLLECT_H_
 #define ADC_VOL_BASE                            1.20 //ADC内部电压基准,后续版本可改为针对每一块板子实际测量后写入 flash
 #define N 6        //adc采样计算次数
-#define UART_485 "uart5"  /*串口设备名称*/
-
 
 
 extern rt_uint32_t voltage,current;
 extern int8_t hum_value,tem_value;
-int UART_485_INIT(void);
 int Read_Real_Current(void);
 int Read_Real_Voltage(void);
 int Read_Fuse_Voltage(void);

+ 4 - 4
Application_cbd_apm32f1/drivers/board.h

@@ -29,8 +29,8 @@ extern "C"
 
 /*-------------------------- ROM/RAM CONFIG BEGIN --------------------------*/
 
-#define ROM_START              ((uint32_t)0x08000000)
-#define ROM_SIZE               (512 * 1024)
+#define ROM_START              ((uint32_t)0x08032000)
+#define ROM_SIZE               (312 * 1024)
 #define ROM_END                ((uint32_t)(ROM_START + ROM_SIZE))
 
 #define RAM_START              (0x20000000)
@@ -89,8 +89,8 @@ extern "C"
 #define BSP_USING_UART5         //485
 #define BSP_UART5_TX_PIN       "PC12"
 #define BSP_UART5_RX_PIN       "PC2"
-#define BSP_UART5_RX_BUFSIZE   128
-#define BSP_UART5_TX_BUFSIZE   128
+#define BSP_UART5_RX_BUFSIZE   2048
+#define BSP_UART5_TX_BUFSIZE   2048
 
 
 #define BSP_UART4_RX_USING_DMA

+ 1 - 1
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/src/ymodem_ota.c

@@ -115,7 +115,7 @@ void ymodem_ota(uint8_t argc, char **argv)
     }
     rt_kprintf("Warning: Ymodem has started! This operator will not recovery.\n");
     rt_kprintf("Please select the ota firmware file and use Ymodem to send.\n");
-    rt_console_set_device("uart2");
+    rt_console_set_device("uart5");
     if (!rym_recv_on_device(&rctx, rt_console_get_device(), RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
                             ymodem_on_begin, ymodem_on_data, NULL, RT_TICK_PER_SECOND))
     {

+ 8 - 2
Application_cbd_apm32f1/readme.md

@@ -1,6 +1,12 @@
-# 2026-08-10 更新说明
+# 2026-08-18 更新说明
+	#define VERSION_BZY         "3.2.0"                   //孢子仪
+	1、电流采集适配PCBV2
+	2、
+# 2026-08-17 更新说明
 	#define VERSION_BZY         "3.1.0"                   //孢子仪2.1
-	1、
+	1、为保证备用电池功能正常使用:
+	屏幕供电使用ctr_router,风机供电使用ctr_heat
+	2、关闭SENSOR_EN 0
 # 2026-07-08 更新说明
 	#define VERSION_BZY         "3.0.0"                   //孢子仪2.1
 	1、增加胶带使用量检测和滤网的使用量检测和数据上报;

+ 2 - 2
CBD_FOTA_BootLoader/.config

@@ -602,7 +602,7 @@ CONFIG_FAL_DEBUG_CONFIG=y
 CONFIG_FAL_DEBUG=1
 CONFIG_FAL_PART_HAS_TABLE_CFG=y
 CONFIG_FAL_USING_SFUD_PORT=y
-CONFIG_FAL_USING_NOR_FLASH_DEV_NAME="w25q16"
+CONFIG_FAL_USING_NOR_FLASH_DEV_NAME="w25q16m"
 # CONFIG_PKG_USING_FAL_V10000 is not set
 CONFIG_PKG_USING_FAL_V00500=y
 # CONFIG_PKG_USING_FAL_V00400 is not set
@@ -639,7 +639,7 @@ CONFIG_SYSWATCH_THREAD_PRIO=0
 CONFIG_SYSWATCH_THREAD_STK_SIZE=512
 CONFIG_SYSWATCH_THREAD_NAME="syswatch"
 CONFIG_SYSWATCH_WDT_NAME="wdt"
-CONFIG_SYSWATCH_WDT_TIMEOUT=10
+CONFIG_SYSWATCH_WDT_TIMEOUT=25
 CONFIG_PKG_USING_SYSWATCH_LATEST_VERSION=y
 # CONFIG_PKG_USING_SYSWATCH_V101 is not set
 # CONFIG_PKG_USING_SYSWATCH_V100 is not set

Разница между файлами не показана из-за своего большого размера
+ 815 - 73
CBD_FOTA_BootLoader/.config.old


+ 4 - 4
CBD_FOTA_BootLoader/Kconfig

@@ -15,10 +15,10 @@ config PKGS_DIR
     option env="PKGS_ROOT"
     default "packages"
 
-config PLATFORM_DIR
-    string
-    option env="PLATFORM_DIR"
-    default  "D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/platform"
+config PLATFORM_DIR
+    string
+    option env="PLATFORM_DIR"
+    default "D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/platform"
 
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"

+ 41 - 3
CBD_FOTA_BootLoader/applications/main.c

@@ -33,8 +33,8 @@
 #include "sys_config.h"
 #include <easyflash.h>
 
-#define BL_VERSION "1.2.4"
-#define COMPILE "20260708"
+#define BL_VERSION "1.1.4"
+#define COMPILE "20230901"
 
 #define RTU_DTU GET_PIN(B,13)
 #define Beep    GET_PIN(B, 4)
@@ -346,6 +346,43 @@ static void Hmi_thread_entry(void *parameter)
         //rt_kprintf("workSta.vbat.txt=%c%d.%02d%c\n",hmi_str,voltage/100,voltage%100,hmi_str);
     }
 }
+
+/* 获取STM32F401的复位原因 */
+static void print_reset_reason(void)
+{
+    uint32_t rst_status = RCC->CSR;
+    bool is_iwdg = false;
+
+    rt_kprintf("\n========== Reset Reason ==========\n");
+
+    if (rst_status & RCC_CSR_LPWRRSTF)
+        rt_kprintf("❌ Low Power reset\n");
+
+    if (rst_status & RCC_CSR_WWDGRSTF)
+        rt_kprintf("❌ Window Watchdog reset\n");
+
+    if (rst_status & RCC_CSR_IWDGRSTF)
+    {
+        rt_kprintf("❌ Independent Watchdog reset\n");
+        is_iwdg = true;
+    }
+
+    if (rst_status & RCC_CSR_SFTRSTF)
+        rt_kprintf("✅ Software reset\n");
+
+    if (rst_status & RCC_CSR_PORRSTF)
+        rt_kprintf("✅ Power-on reset\n");
+
+    if (rst_status & RCC_CSR_PINRSTF)
+        rt_kprintf("✅ NRST pin reset\n");
+
+    rt_kprintf("RCC_CSR: 0x%08X\n", rst_status);
+    rt_kprintf("==================================\n");
+
+    /* 清除复位标志(重要!)*/
+    RCC->CSR |= RCC_CSR_RMVF;
+}
+
 int main(void)
 {
 
@@ -353,9 +390,10 @@ int main(void)
     finsh_set_prompt("rt-fota />");
 #endif
     extern void rt_fota_init(void);
+    rt_fota_print_log();
     easyflash_init();
+    print_reset_reason();
     rt_fota_init();
-    rt_fota_print_log();
     HMI_Thread();
     Beep_Tip(100);
     return RT_EOK;

Разница между файлами не показана из-за своего большого размера
+ 1198 - 925
CBD_FOTA_BootLoader/applications/rt_fota.c


+ 1 - 1
CBD_FOTA_BootLoader/drivers/board.h

@@ -36,7 +36,7 @@ extern "C"
 #define ROM_END                ((uint32_t)(ROM_START + ROM_SIZE * 1024))
 
 #define RAM_START              (0x20000000)
-#define RAM_SIZE               (64)
+#define RAM_SIZE               (128)
 #define RAM_END                (RAM_START + RAM_SIZE * 1024)
 
 /*-------------------------- ROM/RAM CONFIG END --------------------------*/

+ 19 - 19
CBD_FOTA_BootLoader/drivers/fal_cfg.h

@@ -14,12 +14,12 @@
 #include <rtconfig.h>
 #include <board.h>
 
-#define NOR_FLASH_DEV_NAME             "norflash0"
+#define NOR_FLASH_DEV_NAME             "w25q16m"
 
 /* ===================== Flash device Configuration ========================= */
-
-extern struct fal_flash_dev nor_flash0;
 extern const struct fal_flash_dev stm32f1_onchip_flash;
+extern struct fal_flash_dev nor_flash0;
+
 /* flash device table */
 #define FAL_FLASH_DEV_TABLE                                          \
 {                                                                    \
@@ -30,25 +30,25 @@ extern const struct fal_flash_dev stm32f1_onchip_flash;
 #ifdef FAL_PART_HAS_TABLE_CFG
 /* partition table */
 //分区表:FAL_PART_MAGIC_WORD,分区名,flash设备名字,起始地址,空间大小,保留0
+//16Mflash
 /*
+//#define FAL_PART_TABLE                                                              \
+//{                                                                                    \
+//    {FAL_PART_MAGIC_WORD,        "bl",     "onchip_flash",                           0,                       200*1024,       0}, \
+//    {FAL_PART_MAGIC_WORD,        "app",     "onchip_flash",                          200*1024,                312*1024,       0}, \
+//    {FAL_PART_MAGIC_WORD, "easyflash",     FAL_USING_NOR_FLASH_DEV_NAME,             0,                       15*1024*1024,   0}, \
+//    {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             15*1024*1024,             512*1024,      0}, \
+//    {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             15*1024*1024 + 512*1024,  512*1024,      0}, \
+//}
+*/
+//4Mflash
 #define FAL_PART_TABLE                                                               \
 {                                                                                    \
-    {FAL_PART_MAGIC_WORD,        "bl",    "onchip_flash",                           0,                        200*1024,       0}, \
-    {FAL_PART_MAGIC_WORD,        "app",   "onchip_flash",                           200*1024,                 312*1024,       0}, \
-    {FAL_PART_MAGIC_WORD,  "easyflash",   FAL_USING_NOR_FLASH_DEV_NAME,             0,                        15*1024*1024,      0}, \
-    {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             15*1024*1024,             512*1024,       0}, \
-    {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             15*1024*1024 + 512*1024,  512*1024,       0}, \
-}
-*/
-#define FAL_PART_TABLE                                                              \
-{                                                                                   \
-    {FAL_PART_MAGIC_WORD,        "bl",     "onchip_flash",                          0,                       200*1024,       0}, \
-    {FAL_PART_MAGIC_WORD,        "app",     "onchip_flash",                         200*1024,                312*1024,       0}, \
-    {FAL_PART_MAGIC_WORD, "easyflash",    FAL_USING_NOR_FLASH_DEV_NAME,             0,                       1*1024*1024,    0}, \
-    {FAL_PART_MAGIC_WORD, "fdb_kv",       FAL_USING_NOR_FLASH_DEV_NAME,             1*1024*1024,             1*1024*1024,    0}, \
-    {FAL_PART_MAGIC_WORD, "fdb_ts",       FAL_USING_NOR_FLASH_DEV_NAME,             2*1024*1024,             1*1024*1024,    0}, \
-    {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024,             512*1024,       0}, \
-    {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024 + 512*1024,  512*1024,       0}, \
+    {FAL_PART_MAGIC_WORD,        "bl",     "onchip_flash",                           0,                       200*1024,       0}, \
+    {FAL_PART_MAGIC_WORD,        "app",     "onchip_flash",                          200*1024,                312*1024,       0}, \
+    {FAL_PART_MAGIC_WORD, "easyflash",     FAL_USING_NOR_FLASH_DEV_NAME,             0,                       1*1024*1024,   0}, \
+    {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024,             512*1024,      0}, \
+    {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024 + 512*1024,  512*1024,      0}, \
 }
 #endif /* FAL_PART_HAS_TABLE_CFG */
 

+ 7 - 4
CBD_FOTA_BootLoader/readme.md

@@ -1,8 +1,11 @@
+# 版本说明 20260714
+	#define BL_VERSION "1.2.4"
+	1、修复flash读取慢引发的升级搬运固件过程复位,复位原因是看门狗复位;
+	2、easyflash分区调整;
+	3、看门狗超时时间由10S改为25S;
+	4、已经找到问题原因了,帮我修复flash读取慢导致固件搬运过程 flash读写阻塞cpu导致 不能及时喂狗引起看门狗重启,搬运前把app分区固件先备份到df_area,如果往app分区搬运过程中异常中断会导致启动失败这时从df_area分区恢复
+	5、使用rtc的bkp寄存器存放app是否正常启动的标志位,启动app失败会触发固件恢复上一个版本;
 # 版本说明
-#define BL_VERSION "1.2.4"
-#define COMPILE "20260708"
-1、修改fal分区表;
- #define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 256) /* default is the double erase min size */
 #define BL_VERSION "1.1.4"
 #define COMPILE "20230901"
 - 1. rt_fota.c中880行增加__set_CONTROL(0);

+ 2 - 2
CBD_FOTA_BootLoader/rtconfig.h

@@ -249,7 +249,7 @@
 #define FAL_DEBUG 1
 #define FAL_PART_HAS_TABLE_CFG
 #define FAL_USING_SFUD_PORT
-#define FAL_USING_NOR_FLASH_DEV_NAME "w25q16"
+#define FAL_USING_NOR_FLASH_DEV_NAME "w25q16m"
 #define PKG_USING_FAL_V00500
 #define PKG_FAL_VER_NUM 0x00500
 #define PKG_USING_SYSWATCH
@@ -262,7 +262,7 @@
 #define SYSWATCH_THREAD_STK_SIZE 512
 #define SYSWATCH_THREAD_NAME "syswatch"
 #define SYSWATCH_WDT_NAME "wdt"
-#define SYSWATCH_WDT_TIMEOUT 10
+#define SYSWATCH_WDT_TIMEOUT 25
 #define PKG_USING_SYSWATCH_LATEST_VERSION
 /* end of system packages */