zhunk 2 лет назад
Родитель
Сommit
79b52b8037

+ 8 - 6
Application_CBD/applications/control.c

@@ -1560,7 +1560,7 @@ void HK_TakePhoto(void)
 {
     //打开补光灯
     DTU_Write("takephoto.mp3");
-    rt_thread_delay(1000);
+    rt_thread_delay(10000);
     char *takephotojson = makeJson_takephoto();
     DTU_Write("%s",takephotojson);
     rt_free(takephotojson);
@@ -1692,10 +1692,12 @@ void ResetInit(void)
            if(device_status.version_type==4||device_status.version_type==41)
            {
                device_status.clear_status=1;
+               while(device_status.clear_status==1){
+                   rt_thread_delay(1000);
+               }
            }
-           while(device_status.clear_status==1){
-               rt_thread_delay(1000);
-           }
+
+
            //排虫
            if(device_status.handle_bugger==0){
                device_status.run_sta = 111;     //排虫
@@ -2569,10 +2571,10 @@ static void Control_Clear_thread_entry(void *parameter)
                 ctr_Heat(OFF);
                 //振动
                 ctr_shake(ON, 1);
-                device_status.clear_status = 1;
+                //device_status.clear_status = 1;
                 ctr_lamp(OFF, 1);
             }
-            if(selfcheck_cnt>180){  //超过3分钟
+            if(selfcheck_cnt>1800){  //超过3分钟
                 device_status.selfcheck_ws = 0;
                 device_status.ctr_up_motor = 0;
                 device_status.ctr_down_motor = 0;

+ 39 - 21
Application_CBD/applications/dtu_uart2.c

@@ -1272,30 +1272,48 @@ int parseDtu(char *json_string)
                       rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
                       rt_kprintf("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
                   }
-                  LOG_I("DTU时间:%s",datetime->valuestring);
-                  static char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
-                  strncpy(year_s, datetime->valuestring, 4);
-                  strncpy(month_s,datetime->valuestring+4,2);
-                  strncpy(day_s,datetime->valuestring+6,2);
-                  strncpy(hour_s,datetime->valuestring+8,2);
-                  strncpy(min_s,datetime->valuestring+10,2);
-                  strncpy(sec_s,datetime->valuestring+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)
+
+                  if(datetime!=RT_NULL){
+                      LOG_I("DTU时间:%s",datetime->valuestring);
+                      int year, month, day, hour, minute, second;
+                      sscanf(datetime->valuestring, "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second);
+                      if(set_date(year,month,day)==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)<=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();
+                            LOG_I("设置日期:%d年%d月%d日",year,month,day);
+                            if(hour<24&&minute>=0&&minute<60&&second>=0&&second<60)
+                            {
+                                LOG_I("设置时间:%d时%d分%d秒",hour,minute,second);
+                                set_time(hour,minute,second);
+                            }else{
+                                LOG_E("set_date failed!");
+                                rt_hw_rtc_init();
+                            }
                       }
+//                      static char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
+//                      strncpy(year_s, datetime->valuestring, 4);
+//                      strncpy(month_s,datetime->valuestring+4,2);
+//                      strncpy(day_s,datetime->valuestring+6,2);
+//                      strncpy(hour_s,datetime->valuestring+8,2);
+//                      strncpy(min_s,datetime->valuestring+10,2);
+//                      strncpy(sec_s,datetime->valuestring+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)<=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();
+//                          }
+//                      }
                   }
+
                   LOG_I("参数同步:lat:%s lng:%s",lat->valuestring,lng->valuestring);
                   //CSQ
                   if(csq!=NULL&&atoi(csq->valuestring)>=0&&atoi(csq->valuestring)<=31)

+ 7 - 6
Application_CBD/applications/hmi.c

@@ -41,7 +41,7 @@
 #define CONTROL_MOTOR_TIMESLICE     5
 
 
-static char msg_pool[256];
+static char msg_pool[512];
 
 static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
 
@@ -115,7 +115,7 @@ static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
     if ( result == -RT_EFULL)
     {
         /* 消息队列满 */
-        rt_kprintf("message queue full!\n");
+        LOG_I("hmi message queue full!\n");
     }
     return result;
 }
@@ -132,6 +132,7 @@ static void Hmi_thread_entry(void *parameter)
         device_status.collt_box_sta = 0;
         device_status.run_sta = 0;
     }
+    device_status.camsta = 1;
     while(1)
     {
 
@@ -610,7 +611,7 @@ static void HMI_Decode(void)
         if(device_status.dtype==7)
         {
             LOG_I("停止步进上行!");
-            ctr_lamp(OFF, 0);
+            ctr_lamp(OFF, 1);
             ctr_Motor_Driver(0, 0,0,0);
         }
         else
@@ -641,7 +642,7 @@ static void HMI_Decode(void)
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
         if(device_status.dtype==7)
         {
-            ctr_lamp(OFF, 0);
+            ctr_lamp(OFF, 1);
             ctr_Motor_Driver(0, 0,0,0);
             rt_kprintf("停止步进下行!\n");
         }
@@ -1579,7 +1580,7 @@ static void Ctr_Mortor_entry(void* parameter)
                     beep_set(1000000, 0);      //2kzh - 50%
                     HMI_WRITE("sysTest.switchAutopic.val=%d",0);
                     HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-                    ctr_lamp(OFF, 0);
+                    ctr_lamp(OFF, 1);
                     break;
                 }
                 photo_setup++;
@@ -1595,7 +1596,7 @@ static void Ctr_Mortor_entry(void* parameter)
             HMI_WRITE("sysTest.auto_flag.txt=\"\"");
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
             //关闭步进电机驱动器电源
-            ctr_lamp(OFF, 0);
+            ctr_lamp(OFF, 1);
             //重置运行标志位
             device_status.run_sta = 0;
             ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));

+ 1 - 1
Application_CBD/applications/hmi.h

@@ -16,7 +16,7 @@
 
 #define UART_NAME "uart4"  /*串口设备名称*/
 #define MAX_SIZE 512
-#define HMI_UART_RXBUFFER_SIZE 150
+#define HMI_UART_RXBUFFER_SIZE 512  //
 extern rt_device_t serial;   /*串口设备句柄*/
 extern uint8_t dbg_flag;
 extern uint8_t DBG_EN;  //是否使能调试打印

+ 2 - 2
Application_CBD/applications/sht30_collect.c

@@ -250,7 +250,7 @@ static void Power_ReadCheck(void *parameter)
                 }
             }
         }
-        if(bat_cnt>=1000){  //持续10s
+        if(bat_cnt>=5){  //持续10s
             bat_cnt = 0;
             device_status.bat_status = 1; //欠压
         }
@@ -367,7 +367,7 @@ int Read_Light_Voltage(void)
        adc10_rain = rt_adc_read(adc_dev,ADC_DEV_CHANNLE_2);
        rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_2);
        HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
-       //rt_kprintf("read light value:%d\n",adc10_rain);
+       LOG_I("read light value:%d",adc10_rain);
        return adc10_rain;
 }
 //获取内部温度传感器值