Просмотр исходного кода

优化:1.孢子仪定时收集;2.串口交互异常处理 3.孢子仪开机时间同步导致工作错乱

yf_zjb 3 лет назад
Родитель
Сommit
ed206d9ffb

+ 60 - 14
Application_CBD/applications/control.c

@@ -63,6 +63,40 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
     }
     return 0;
 }
+/****************************定制色诱*************************************/
+void ctr_Color_Key(uint8_t key_num)
+{
+    if(key_num==0)
+    {
+        rt_pin_mode(LIMIT_CLOSE, PIN_MODE_INPUT);
+        while(rt_pin_read(LIMIT_CLOSE)==1)
+        {
+            /*持续的*/
+            rt_thread_delay(50);
+        }
+        LOG_W("检测到IO0翻转为0!!!");
+        while(rt_pin_read(LIMIT_CLOSE)==0)
+        {
+            rt_thread_delay(50);
+        }
+        LOG_W("检测到IO0翻转为1!!!");
+    }
+    else {
+        rt_pin_mode(LIMIT_OPEN, PIN_MODE_INPUT);
+        while(rt_pin_read(LIMIT_OPEN)==1)
+        {
+            /*持续的*/
+            rt_thread_delay(50);
+        }
+        LOG_W("检测到IO1翻转为0!!!");
+        while(rt_pin_read(LIMIT_OPEN)==0)
+        {
+            rt_thread_delay(50);
+        }
+        LOG_W("检测到IO1翻转为1!!!");
+    }
+
+}
 /**************************机器人********************************/
 void ctr_Motor_Robot(uint8_t status_ws)
 {
@@ -562,7 +596,7 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
-    if(device_status.dtype==7)
+    if(device_status.dtype==7&&shake_sec!=0)
         DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     if(status_shake==ON&&device_status.shake_ws==1)
@@ -736,6 +770,7 @@ void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_ou
         time_out --;
     }
     rt_pin_write(Motor_EN, OFF);
+    ctr_lamp(OFF, 1);
     beep_set(0, 0);      //200kzh - 50%
 }
 /*************************************************
@@ -1586,6 +1621,13 @@ void WorkCheck(void)
 }
 void WorkTask_BZY(void)
 {
+    rt_uint8_t wait_cnt = 0;
+    while(1)
+    {
+        wait_cnt++;
+        if(wait_cnt==30)    break;
+        rt_thread_delay(1000);
+    }
     if(device_status.ds==1)
     {
         //时间段判断
@@ -1634,9 +1676,8 @@ void WorkTask_BZY(void)
         LOG_I("结束时间3-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_eh3_stamp.tm_year+1900,cul_eh3_stamp.tm_mon+1,cul_eh3_stamp.tm_mday,cul_eh3_stamp.tm_hour,cul_eh3_stamp.tm_min,cul_eh3_stamp.tm_sec);
         //此处判断,一个一个时间段判断,判断当前时间是否大于开始时间:
         //当前时间戳小于第一段开始时间戳
-        while(difftime(mktime(&now_stamp), mktime(&cul_sh1_stamp)) < 0)
+        if(difftime(mktime(&now_stamp), mktime(&cul_sh1_stamp)) < 0)
         {
-            if(device_status.run_sta!=0) break;
             time_t now;
             time(&now);
             cul_sh1_stamp = *localtime(&now);
@@ -1646,12 +1687,11 @@ void WorkTask_BZY(void)
             now_stamp = *localtime(&now);
             LOG_I("======收集时间1:%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_sh1_stamp.tm_year+1900,cul_sh1_stamp.tm_mon+1,cul_sh1_stamp.tm_mday,cul_sh1_stamp.tm_hour,cul_sh1_stamp.tm_min,cul_sh1_stamp.tm_sec);
             LOG_I("======未到收集时间1:%04d年%02d月%02d日%02d时%02d分%02d秒.",now_stamp.tm_year+1900,now_stamp.tm_mon+1,now_stamp.tm_mday,now_stamp.tm_hour,now_stamp.tm_min,now_stamp.tm_sec);
-            rt_thread_delay(1000);
+            LOG_D("run_sta:%d",device_status.run_sta);
         }
-        //当前时间戳小于第二段开始 时间戳
-        while(difftime(mktime(&now_stamp), mktime(&cul_sh2_stamp)) < 0)
+        //当前时间戳小于第二段结束 时间戳并且大于第1段结束时间戳
+        if(difftime(mktime(&now_stamp), mktime(&cul_sh2_stamp)) < 0&&difftime(mktime(&now_stamp), mktime(&cul_eh1_stamp)) > 0)
         {
-            if(device_status.run_sta!=0) break;
             time_t now;
             time(&now);
             cul_sh2_stamp = *localtime(&now);
@@ -1661,7 +1701,7 @@ void WorkTask_BZY(void)
             now_stamp = *localtime(&now);
             LOG_I("==============收集时间2:%04d年%02d月%02d日%02d时%02d分%02d秒.\n",cul_sh2_stamp.tm_year+1900,cul_sh2_stamp.tm_mon+1,cul_sh2_stamp.tm_mday,cul_sh2_stamp.tm_hour,cul_sh2_stamp.tm_min,cul_sh2_stamp.tm_sec);
             LOG_I("==============未到收集时间2:%04d年%02d月%02d日%02d时%02d分%02d秒.\n",now_stamp.tm_year+1900,now_stamp.tm_mon+1,now_stamp.tm_mday,now_stamp.tm_hour,now_stamp.tm_min,now_stamp.tm_sec);
-            rt_thread_delay(1000);
+            LOG_D("run_sta:%d",device_status.run_sta);
         }
         //如果当前 时间戳大于开始时间戳并且小于 结束时间戳
         if(difftime(mktime(&now_stamp), mktime(&cul_sh1_stamp)) >= 0&&difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) < 0)
@@ -1700,7 +1740,7 @@ void WorkTask_BZY(void)
                         cul_eh1_stamp.tm_min = 0;
                         cul_eh1_stamp.tm_sec = 0;
                         if(device_status.run_sta!=1) break;
-                        LOG_I("1===========采集风机启动,正在收集.....%d",mktime(&now_stamp),mktime(&cul_eh1_stamp));
+                        LOG_I("1===========采集风机启动,正在收集.....%d-%d",mktime(&now_stamp),mktime(&cul_eh1_stamp));
                         rt_thread_mdelay(10000);
                     }
                 }
@@ -2065,14 +2105,19 @@ static void Control_Clear_thread_entry(void *parameter)
     {
         #if ROBOT_EN ==1
         ctr_Motor_Robot(ON);
+        rt_thread_delay(100);
+        #else
+        #if Color_EN ==1
+        ctr_Color_Key(0);
         #else
         if(device_status.clear_status==1)
         {
             if(ctr_clear(1200)==0)
             ctr_TG_Clear(400);
         }
-        #endif
         rt_thread_delay(100);
+        #endif
+        #endif
     }
 }
 /*入口函数加热*/
@@ -2091,8 +2136,7 @@ static void Control_Heat_thread_entry(void *parameter)
     {
         #if ROBOT_EN == 1
         //磁悬浮供电
-        //监测磁悬浮限位位置
-        //根据位置确定是否 按下按钮
+        //监测磁悬浮限位位置`
         LOG_D("Read 磁悬浮:%d",device_status.heattem);
         //等待10S
         if(device_status.heattem<30&&Read_Real_Voltage()/100>12)   //磁悬浮处于关闭状态
@@ -2104,6 +2148,9 @@ static void Control_Heat_thread_entry(void *parameter)
             rt_thread_delay(50);
             rt_pin_write(EMS_Dir, 1);
         }
+        else if (device_status.heattem<30&&Read_Real_Voltage()/100<12) {
+            ctr_router(OFF);
+        }
         if(device_status.heattem>40)
         {
             key_on = 1;
@@ -2122,7 +2169,6 @@ static void Control_Heat_thread_entry(void *parameter)
             rt_thread_delay(50);
             rt_pin_write(EMS_Dir, 1);
         }
-
         #else
         if(device_status.work_status==1&&device_status.heat_sw==1)
         {
@@ -2193,7 +2239,7 @@ int Work_Loop_Task(void)
                                 WORK_LOOP_THREAD_STACK_SIZE,       //2048
                                 WORK_LOOP_THREAD_PRIORITY,         //12
                                 WORK_LOOP_THREAD_TIMESLICE);       //5
-    if(tid_workloop!=RT_NULL)
+    if(tid_workloop!=RT_NULL&&Color_EN==0)
     {
         rt_thread_startup(tid_workloop);
     }

+ 3 - 2
Application_CBD/applications/control.h

@@ -17,6 +17,7 @@
 #define LAMP_EN          0              //李新3灯管:0关闭,1打开
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
+#define Color_EN         0              //定制色诱
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
@@ -30,7 +31,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
-#define VERSION_BZY         "2.2"                   //孢子仪
+#define VERSION_BZY         "2.4"                   //孢子仪
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
@@ -198,7 +199,7 @@ typedef struct  _packed
 #define CTR_RO_LIMIT GET_PIN(B,15)
 #define CTR_RC_LIMIT GET_PIN(C,6)
 /******************************吸虫塔*********************************/
-#define HK_5000W_P GET_PIN(B, 12)
+#define HK_5000W_P GET_PIN(B,12)
 #define ROUTER_P   GET_PIN(B,10)
 #define LED_P      GET_PIN(B,11)
 

+ 53 - 45
Application_CBD/applications/dtu_uart2.c

@@ -132,7 +132,7 @@ static void dtu_thread_entry_recv(void *parameter)
                     msg.size : sizeof(rx_buffer) - 1;
             rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
             rx_buffer[rx_length] = '\0';
-            rt_kprintf("recv data:%s\n",rx_buffer);
+            LOG_D("recv data:%s",rx_buffer);
             if(strstr(rx_buffer,"{")==RT_NULL||strstr(rx_buffer,"}")==RT_NULL)
             {
                 HMI_WRITE("sysTest.result.txt=\"%s\"",rx_buffer);
@@ -168,21 +168,26 @@ static void dtu_thread_entry_recv(void *parameter)
          }
          else {
                     rx_err ++;
-                    if(rx_err==54000)//90分钟未接收到数据
+                    if (rx_err < 54000)
+                    {
+                        ctr_DTU_Power(ON);
+                        ctr_photo(ON);
+                        ctr_DTU_Power(ON);
+                    }
+                    else if(rx_err==54000)//90分钟未接收到数据
                     {
                         if(device_status.version_type==6)
                         {
-                            rt_kprintf("RK3399 transter Error!\n");
+                            LOG_E("RK3399 transter Error!\n");
                             ctr_photo(OFF);
                         }
                         else {
                             ctr_DTU_Power(OFF);
                         }
                     }
-                    if (rx_err>54100) {
+                    else if (rx_err==54100)
+                    {
                         rx_err = 0;
-                        ctr_photo(ON);
-                        ctr_DTU_Power(ON);
                     }
                }
             //rt_kprintf("%s\n",rx_json_buffer);
@@ -220,13 +225,6 @@ static void dtu_thread_entry_send(void *parameter)
                             device_status.power_status = 0;
                             rt_thread_delay(1500);
                         }
-                        if(0)
-                        {
-                            //关闭路由器供电
-                            ctr_router(OFF);
-                            //关闭RTU供电
-                            ctr_DTU_Power(OFF);
-                        }
                     }
                     else {
                         //打开路由器和RTU供电
@@ -789,7 +787,7 @@ int parseDtu(char *json_string)
                   type = cJSON_GetObjectItem(item_ext,"type");
                   if(strstr(type->valuestring,"rtu_off_on")!=RT_NULL)
                   {
-                      rt_kprintf("DTU 12V Power down");
+                      LOG_W("DTU 12V Power down");
                       ctr_RTU_DTU(OFF);
                       rt_thread_delay(5000);
                       ctr_RTU_DTU(ON);
@@ -959,9 +957,27 @@ int parseDtu(char *json_string)
                           rt_kprintf("设置温度失败:%s!!!\n",tmp->valuestring);
                       }
                   }
-             }
+              }
+              else if (strstr(item_cmd->valuestring,"color")!=RT_NULL)
+              {
+                  if(cJSON_GetObjectItem(item_ext,"turn")!=RT_NULL)
+                  {
+                      ctr_turn(90, 0);
+                  }
+                  else {
+                    LOG_W("Unknow cmd value!");
+                  }
+              }
               else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
               {
+                  if(device_status.dtype==7)
+                  {
+                      DTU_Write("%s","SwversionV7");
+                  }
+                  else if (device_status.dtype==3)
+                  {
+                      DTU_Write("%s","SwversionV4");
+                  }
                   device_status.refresh_timeout=0;
                   //driver_4g =  cJSON_GetObjectItem(item_ext,"version");
                   driver_4g = cJSON_GetObjectItem(item_ext,"dver");
@@ -1023,36 +1039,29 @@ int parseDtu(char *json_string)
                       strncpy(sec_s,datetime->valuestring+12,2);
                       if(atoi(year_s)>=2022&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
                       {
-                          rt_kprintf("设置时间:%d年%d月%d日\n",atoi(year_s),atoi(month_s),atoi(day_s));
+
                           if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
                           {
                               if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
                               {
-                                  LOG_I("set_date success!");
+                                  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)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
+                                  {
+                                      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));
+                                  }
                               }
                               else {
                                   LOG_E("set_date failed!");
                                   rt_hw_rtc_init();
-                              }
+                                   }
                           }
-                          else {
-
-                              LOG_E("网络连接失败,同步时间失败!");
-                        }
-                      }
-                      if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
-                      {
-                          LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
-                          if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
+                          else
                           {
-                              set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
+                              LOG_E("网络连接失败,同步时间失败!");
                           }
-                          else {
-
-                              rt_kprintf("网络连接失败,同步时间失败!!!\n");
-                        }
                       }
-                      rt_kprintf("参数同步:\nlat:%s\nlng:%s\n",lat->valuestring,lng->valuestring);
+                  LOG_I("参数同步:lat:%s lng:%s",lat->valuestring,lng->valuestring);
                   //CSQ
                   if(csq!=NULL&&atoi(csq->valuestring)>=0&&atoi(csq->valuestring)<=31)
                   {
@@ -1065,13 +1074,13 @@ int parseDtu(char *json_string)
                   if(link_sta!=NULL&&atoi(link_sta->valuestring)>=0&&atoi(link_sta->valuestring)<=1)
                   {
                       device_status.link_sta = atoi(link_sta->valuestring);
-                      rt_kprintf("\n>>>>>>>>>>>>>有线接入状态>>>>>>>>>>>>>>:%d\n",device_status.link_sta);
+                      LOG_I(">>>>>>>>>>>>>有线接入状态>>>>>>>>>>>>>>:%d",device_status.link_sta);
                   }
                   //Volume
                   if(volume!=NULL&&atoi(volume->valuestring)>=0&&atoi(volume->valuestring)<=31)
                   {
                       device_status.vol = atoi(volume->valuestring);
-                      rt_kprintf("设置音量:%d\n",device_status.vol);
+                      LOG_I("设置音量:%d",device_status.vol);
                   }
                   else {
                       device_status.vol = 7;
@@ -1079,7 +1088,7 @@ int parseDtu(char *json_string)
                   //NET
                   if (net!=NULL&&atoi(net->valuestring)>=0&&atoi(net->valuestring)<=1)
                   {
-                      rt_kprintf("网络状态:%s\n",net->valuestring);
+                      LOG_I("网络状态:%s",net->valuestring);
                       rt_sprintf(device_status.net,"%s",net->valuestring);
                   }
                   else {
@@ -1150,12 +1159,12 @@ int parseDtu(char *json_string)
                       else {
                         rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
                       }
-                      rt_kprintf("当前平台1:%s\n",mqttcfg1->valuestring);
+                      LOG_I("当前平台1:%s",mqttcfg1->valuestring);
                   }
                   if(mqttcfg2!=NULL)
                   {
                       sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
-                      rt_kprintf("当前平台2:%s\n",mqttcfg2->valuestring);
+                      LOG_I("当前平台2:%s",mqttcfg2->valuestring);
                   }
                   if( device_status.num_updata==0)
                   {
@@ -1504,7 +1513,7 @@ int parseDtu(char *json_string)
                                       #endif
                                   }
                                   else {
-                                      rt_kprintf("光控定时tt设置失败参数错误!!!\n");
+                                      LOG_E("光控定时tt设置失败参数错误!!!");
                                   }
                               }
 
@@ -1520,7 +1529,7 @@ int parseDtu(char *json_string)
                                       LOG_I("加热时长htim:%d",htim->valueint);
                                   }
                                   else {
-                                      LOG_I("加热时长htim设置失败参数错误!!!");
+                                      LOG_E("加热时长htim设置失败参数错误!!!");
                                   }
                               }
                               else if (htim->type==cJSON_String) {
@@ -1554,11 +1563,11 @@ int parseDtu(char *json_string)
                                       //                                  device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
                                       LOG_I("定时模式ts:%d",ts->valueint);
                                       #else
-                                      rt_kprintf("三光源模式,禁止设置定时!!!\n");
+                                      LOG_W("三光源模式,禁止设置定时!!!");
                                       #endif
                                   }
                                   else {
-                                      rt_kprintf("定时模式ts设置失败参数错误!!!\n");
+                                      LOG_E("定时模式ts设置失败参数错误!!!");
                                   }
                               }
                               else if (ts->type==cJSON_String) {
@@ -1704,13 +1713,12 @@ int parseDtu(char *json_string)
 
 void UpLoad_Data(void)
 {
-
     char *updata = makeJson();
-    rt_kprintf("upload data:%d\n%s\n",rt_strlen(updata),updata);
+    LOG_I("upload data:%d%s",rt_strlen(updata),updata);
     rt_free(updata);
     DTU_Write("%s",updata);
-    updata = NULL;
     list_mem();
+    ctr_RTU_DTU(ON);
     //播放数据上传中语音
 }
 

+ 9 - 21
Application_CBD/applications/hmi.c

@@ -578,7 +578,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         if(device_status.dtype==7)
         {
             ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 0,1000000,300);
+            ctr_Motor_Driver(1, 0,1000000,500);
             LOG_I("开始步进上行!");
         }
         else
@@ -592,9 +592,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
         if(device_status.dtype==7)
         {
+            LOG_I("停止步进上行!");
             ctr_lamp(OFF, 0);
             ctr_Motor_Driver(0, 0,0,0);
-            LOG_I("停止步进上行!");
         }
         else
         {
@@ -608,9 +608,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
         if(device_status.dtype==7)
         {
+            LOG_I("开始步进下行!");
             ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 1,1000000,300);
-            rt_kprintf("开始步进下行!\n");
+            ctr_Motor_Driver(1, 1,1000000,500);
         }
         else
         {
@@ -1214,17 +1214,6 @@ static void Ctr_Mortor_entry(void* parameter)
             rt_thread_delay(1000*10);
             ctr_RTU_DTU(ON);
         }
-        else if((alarm_reset12V.tm_hour)==0&&(alarm_reset12V.tm_min==0)&&(alarm_reset12V.tm_sec==0))
-        {
-            rtc_err_cnt ++;
-            if(rtc_err_cnt==300000)
-            {
-                ctr_RTU_DTU(OFF);
-                rt_thread_delay(1000*10);
-                ctr_RTU_DTU(ON);
-                rt_hw_cpu_reset();
-            }
-        }
         if(device_status.ctr_up_motor==1)
         {
             //打开上仓门
@@ -1394,11 +1383,6 @@ static void Ctr_Mortor_entry(void* parameter)
             rt_pin_write(Motor_EN, 0); //驱动器失能
             beep_set(1000000, 0);      //2kzh - 50%
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            char w_temp[20];
-            rt_sprintf(w_temp,"%s%d","autoTakePhoto success!!!",photo_setup);
-            char *autotake_warn = makeJson_Warn(w_temp, "Motor");
-            DTU_Write("%s",autotake_warn);
-            rt_free(autotake_warn);
             device_status.autotakepic=0;
             photo_setup = 0;
             HMI_WRITE("sysTest.auto_flag.txt=\"\"");
@@ -1778,6 +1762,9 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         ctr_router(ON);
         Hmi_Fresh();
+        #if Color_EN == 1
+        Control_clear();
+        #endif
         if(device_status.dtype!=7)
         {
             Control_clear();
@@ -1788,11 +1775,12 @@ void Check_ParamConfig(void)
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif
-#if ROBOT_EN == 1
+#if ROBOT_EN == 0
         uint16_t connect_num=0;
         //等待联网,
         while(atoi(device_status.net)==1)
         {
+            ctr_DTU_Power(ON);
             if(device_status.dtype==7)
             HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();

+ 2 - 1
Application_CBD/applications/main.c

@@ -42,6 +42,7 @@ static void idle_hook(void);
 /********************************************************************/
 int main(void)
 {
+    ctr_DTU_Power(ON);
     CompileTime;      //读取固件的编译时间
     /* 初始化设备 */
     rt_device_init(wdg_dev);
@@ -64,7 +65,7 @@ int main(void)
         HardWare_Check(0);
         //工作状态置位线程
 
-        if(device_status.dtype!=7||device_status.version_type!=30)
+        if(device_status.dtype!=7&&device_status.version_type!=30)
         Workstatus_check();
 
         /***************/

+ 4 - 0
Application_CBD/applications/sht30_collect.c

@@ -14,6 +14,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "control.h"
+#include "hmi.h"
 #include "math.h"
 #define DBG_ENABLE
 #define DBG_COLOR
@@ -167,6 +168,7 @@ static void Power_ReadCheck(void *parameter)
         {
             #if ROBOT_EN == 1
             ctr_led(OFF);
+            HMI_WRITE("sleep=%d",1);
             #endif
             device_status.bat_status = 1; //欠压
         }
@@ -177,6 +179,8 @@ static void Power_ReadCheck(void *parameter)
         #if ROBOT_EN == 1
             ctr_led(ON);        //打开补光灯
             ctr_lamp(ON, 1);    //打开镇流器输出,用于24V转12V给相机供电
+            ctr_router(ON);
+            HMI_WRITE("sleep=%d",0);
         #endif
         }
         //

+ 1 - 1
Application_CBD/packages/ota_downloader-latest/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\Application_CBD.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\rtthread.rbl" COMPRESS="1" CRYPT="1" KEY="0123456789ABCDEF0123456789ABCDEF" IV="0123456789ABCDEF" NAME="app" VERSION="1.14.41" />
+  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\Application_CBD.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\rtthread.rbl" COMPRESS="1" CRYPT="1" KEY="0123456789ABCDEF0123456789ABCDEF" IV="0123456789ABCDEF" NAME="app" VERSION="2.3" />
 </configuration>