yf_zjb 2 лет назад
Родитель
Сommit
90131c2f31

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


Разница между файлами не показана из-за своего большого размера
+ 579 - 580
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/control.o


BIN
Application_CBD/Debug/applications/main.o


BIN
Application_CBD/Debug/rtthread.rbl


+ 11 - 7
Application_CBD/applications/control.c

@@ -1819,11 +1819,17 @@ void WorkCheck(void)
             LOG_I("***********时控*****************");
             if(device_status.startBar==device_status.stopBar&&device_status.startBar==0){
                 device_status.work_status = 1;
-
+                LOG_I("24 hours work...");
+                #if LAMP_EN == 1
                 device_status.lamp_status = 1;
                 device_status.lamp1_status = 0;
                 device_status.lamp2_status = 0;
-                LOG_I("24 hours work...");
+                if(device_status.sun_status==1){
+                    ctr_lamp(OFF, 1);
+                    ctr_lamp(OFF, 2);
+                    ctr_lamp(OFF, 3);
+                }
+                #endif
             }
 
             //如果开始和结束是同一天
@@ -1940,10 +1946,8 @@ void WorkCheck(void)
                         LOG_I("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间");
                         device_status.work_status = 0; //不在工作时间,待机
                     }
-
                 }
             }
-
         }
         else {
                 LOG_I("光控定时模式!");
@@ -2242,18 +2246,18 @@ void WorkTask(void)
         }
         //1.打开灯管
         #if LAMP_EN == 1
-        if(device_status.lamp_status==1)
+        if(device_status.lamp_status==1&&device_status.sun_status==0)   //光控状态不亮灯
         {
             ctr_lamp(ON,1);
             ctr_lamp(OFF,2);
             ctr_lamp(OFF,3);
         }
-        else if (device_status.lamp1_status==1) {
+        else if (device_status.lamp1_status==1&&device_status.sun_status==0) {
             ctr_lamp(OFF,1);
             ctr_lamp(ON,2);
             ctr_lamp(OFF,3);
         }
-        else if (device_status.lamp2_status==1) {
+        else if (device_status.lamp2_status==1&&device_status.sun_status==0) {
             ctr_lamp(OFF,1);
             ctr_lamp(OFF,2);
             ctr_lamp(ON,3);

+ 1 - 1
Application_CBD/applications/control.h

@@ -22,7 +22,7 @@
 #define BOOT_ERR         1              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
-    #define VERSION_HK          "1.(3ledV8).41(HK)" //4.0海康-三色光源
+    #define VERSION_HK          "1.(3ledV9).41(HK)" //4.0海康-三色光源
 #else
     #define VERSION_HK          "1.51.41(HK)"       //4.0海康-1200W
 #endif