Prechádzať zdrojové kódy

优化雨控和4.0测试拍照故障

zhunk 1 rok pred
rodič
commit
fb626b8d29

+ 2 - 1
Application_CBD/applications/control.c

@@ -2666,10 +2666,11 @@ static void Control_Heat_thread_entry(void *parameter)
                     current_second++;
                     current_second++;
                     if(device_status.selfcheck_ws==0)
                     if(device_status.selfcheck_ws==0)
                     {
                     {
-                        HMI_WRITE("selfcheck.s106.val=1");
+                        HMI_WRITE("selfcheck.s106.val=100");
                         break;
                         break;
                     }
                     }
                 }
                 }
+                HMI_WRITE("selfcheck.s106.val=100");
             }
             }
         }
         }
         rt_thread_delay(1000);
         rt_thread_delay(1000);

+ 9 - 17
Application_CBD/applications/hmi.c

@@ -1573,30 +1573,27 @@ static void Ctr_Mortor_entry(void* parameter)
             struct timeval tv;
             struct timeval tv;
             gettimeofday(&tv, NULL);
             gettimeofday(&tv, NULL);
             device_status.photo_stamp = tv.tv_sec-8*3600;
             device_status.photo_stamp = tv.tv_sec-8*3600;
-            ctr_led(ON);
+            if(photo_led_sec==900)
+                ctr_led(ON);
             //打开补光灯
             //打开补光灯
-            if(photo_led_sec==300&&device_status.version_type==48)
+            if(photo_led_sec==800)
             {
             {
-                DTU_Write("takephoto.mp3");
-                //延时
-                rt_thread_delay(1000);
                 LOG_I("测试拍照!");
                 LOG_I("测试拍照!");
-                Hk_Take_io();
+                #if 1
                 char *takephotojson = makeJson_takephoto();
                 char *takephotojson = makeJson_takephoto();
                 DTU_Write("%s",takephotojson);
                 DTU_Write("%s",takephotojson);
                 rt_free(takephotojson);
                 rt_free(takephotojson);
+                #endif
+                rt_thread_delay(5000);  //延时
             }
             }
             //15S后执行拍照
             //15S后执行拍照
-            else if (photo_led_sec==750&&device_status.version_type!=48)
+            else if (photo_led_sec==750)
             {
             {
                 DTU_Write("takephoto.mp3");
                 DTU_Write("takephoto.mp3");
                 //延时
                 //延时
                 rt_thread_delay(1000);
                 rt_thread_delay(1000);
                 LOG_I("测试拍照!");
                 LOG_I("测试拍照!");
                 Hk_Take_io();
                 Hk_Take_io();
-                char *takephotojson = makeJson_takephoto();
-                DTU_Write("%s",takephotojson);
-                rt_free(takephotojson);
             }
             }
             photo_led_sec--;
             photo_led_sec--;
             if(photo_led_sec==300)    //
             if(photo_led_sec==300)    //
@@ -1607,13 +1604,8 @@ static void Ctr_Mortor_entry(void* parameter)
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
             }
             }
-//            else if (photo_led_sec==0&&device_status.version_type!=48) {
-//                ctr_led(OFF);
-//                photo_led_sec = 900;
-//                device_status.photo_ws = 0;
-//                HMI_WRITE("sysTest.switchPhoto.val=0");
-//                HMI_WRITE("sysTest.switchFill.val=0");
-//            }
+        }else{
+            photo_led_sec = 900;
         }
         }
         /*对焦拍照*/
         /*对焦拍照*/
         if(device_status.autotakepic==1)
         if(device_status.autotakepic==1)

+ 2 - 0
Application_CBD/applications/selfcheck.c

@@ -38,6 +38,8 @@ static void t_takephoto_callback(void *parameter)
 {
 {
     device_status.C01 |= (1<<2);
     device_status.C01 |= (1<<2);
     device_status.C01 |= (1<<3);
     device_status.C01 |= (1<<3);
+    HMI_WRITE("selfcheck.t4.bco=63488");
+    HMI_WRITE("selfcheck.t3.bco=63488");
     HMI_WRITE("sysSet.va0.txt=\"拍照超时\"");
     HMI_WRITE("sysSet.va0.txt=\"拍照超时\"");
     LOG_E("t_takephoto_callback");
     LOG_E("t_takephoto_callback");
 }
 }

+ 3 - 3
Application_CBD/applications/sht30_collect.c

@@ -272,7 +272,7 @@ static void Power_ReadCheck(void *parameter)
                 }
                 }
             }
             }
             //雨控
             //雨控
-            if(Read_Rain_Voltage()>1500&&device_status.selfcheck_ws==0)
+            if(Read_Rain_Voltage()>250&&device_status.selfcheck_ws==0)
             {
             {
                 device_status.C01 |= (1<<5);
                 device_status.C01 |= (1<<5);
                 device_status.rain_status = 1;
                 device_status.rain_status = 1;
@@ -285,7 +285,7 @@ static void Power_ReadCheck(void *parameter)
                 rain_cnt++;
                 rain_cnt++;
                 //雨控消抖,1分钟
                 //雨控消抖,1分钟
                 LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());
                 LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());
-                if(rain_cnt==60&&Read_Rain_Voltage()<1500)
+                if(rain_cnt==600&&Read_Rain_Voltage()<250)
                 {
                 {
                     rain_cnt = 0;
                     rain_cnt = 0;
                     device_status.rain_status = 0;
                     device_status.rain_status = 0;
@@ -293,7 +293,7 @@ static void Power_ReadCheck(void *parameter)
                 }
                 }
             }
             }
         }
         }
-        if(bat_cnt>=8){  //持续10s
+        if(bat_cnt>=15){  //持续10s
             bat_cnt = 0;
             bat_cnt = 0;
             device_status.C01 |= (1<<4);
             device_status.C01 |= (1<<4);
             device_status.bat_status = 1; //欠压
             device_status.bat_status = 1; //欠压