zhunk 1 yıl önce
ebeveyn
işleme
6dbaa2a1c1

+ 1 - 1
Application_CBD/applications/control.c

@@ -2414,7 +2414,7 @@ void WorkTask(void)
                 LOG_I("等待上仓门关闭!!!");
                 LOG_I("等待上仓门关闭!!!");
             }
             }
             //5.加热
             //5.加热
-            if(device_status.heat_sw==0||device_status.version_type==12)
+            if(device_status.heat_sw==0&&device_status.version_type!=12)
             {
             {
                 calorstat(device_status.heattime*60);
                 calorstat(device_status.heattime*60);
             }
             }

+ 5 - 0
Application_CBD/applications/dtu_uart2.c

@@ -764,6 +764,11 @@ char * makeJson()
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
 
 
     }
     }
+    else if (device_status.version_type==12) {  //高空-拍照
+        rt_sprintf(utos,"12");
+        cJSON_AddStringToObject(pSubJson,"vtype",utos);
+
+    }
     else if (device_status.version_type==5) {   //5.0
     else if (device_status.version_type==5) {   //5.0
         rt_sprintf(utos,"5");
         rt_sprintf(utos,"5");
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
         cJSON_AddStringToObject(pSubJson,"vtype",utos);

+ 3 - 15
Application_CBD/applications/hmi.c

@@ -312,7 +312,7 @@ static void HMI_Decode(void)
         }
         }
         if(device_status.sensor_485_sta==1)
         if(device_status.sensor_485_sta==1)
         {
         {
-            HMI_WRITE("menu.sensor_state.txt=\"传感器已连接:(%s-%s)lux\"",device_status.lux,device_status.ap);
+            HMI_WRITE("menu.sensor_state.txt=\"传感器已连接:(%s lux-%s hpa)\"",device_status.lux,device_status.ap);
         }
         }
         else
         else
         {
         {
@@ -563,7 +563,7 @@ static void HMI_Decode(void)
     //清扫
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
         rt_kprintf("\n清扫!\n");
-        if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42)
+        if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42||device_status.version_type==12)
         {
         {
             device_status.clear_status=1;
             device_status.clear_status=1;
         }
         }
@@ -1466,21 +1466,9 @@ static void Ctr_Mortor_entry(void* parameter)
    //int current_t[200];
    //int current_t[200];
    /*孢子仪拍照数量*/
    /*孢子仪拍照数量*/
    rt_uint16_t photo_setup = 0;
    rt_uint16_t photo_setup = 0;
-   #if Color_EN ==1
-   ctr_Color_board(RESET, 1200);
-   #endif
     while(1)
     while(1)
     {
     {
-        #if Color_EN ==1
-        //定时执行把粘虫板更换的操作,每天一次
-        if(device_status.run_sta==5)
-        {
-            rt_thread_delay(2000);
-            device_status.run_sta = 0;
-            ctr_Color_board(OPEN, 1000);
-        }
-        #endif
-        #if 1
+        #if 0
         time_t time_reset12V;
         time_t time_reset12V;
         time(&time_reset12V);
         time(&time_reset12V);
         static struct tm alarm_reset12V;
         static struct tm alarm_reset12V;

+ 1 - 1
Application_CBD/applications/sample_mb_master.c

@@ -84,7 +84,7 @@ static void send_thread_entry(void *parameter)
             rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
             rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
             if(error_code==0)
             if(error_code==0)
             {
             {
-                device_status.sensor_485_sta = 100;
+                device_status.sensor_485_sta = 1;
                 error_count = 0;
                 error_count = 0;
                 //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
                 //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
     //            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
     //            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)