|
@@ -1819,11 +1819,17 @@ void WorkCheck(void)
|
|
|
LOG_I("***********时控*****************");
|
|
LOG_I("***********时控*****************");
|
|
|
if(device_status.startBar==device_status.stopBar&&device_status.startBar==0){
|
|
if(device_status.startBar==device_status.stopBar&&device_status.startBar==0){
|
|
|
device_status.work_status = 1;
|
|
device_status.work_status = 1;
|
|
|
-
|
|
|
|
|
|
|
+ LOG_I("24 hours work...");
|
|
|
|
|
+ #if LAMP_EN == 1
|
|
|
device_status.lamp_status = 1;
|
|
device_status.lamp_status = 1;
|
|
|
device_status.lamp1_status = 0;
|
|
device_status.lamp1_status = 0;
|
|
|
device_status.lamp2_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("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间");
|
|
LOG_I("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间");
|
|
|
device_status.work_status = 0; //不在工作时间,待机
|
|
device_status.work_status = 0; //不在工作时间,待机
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
LOG_I("光控定时模式!");
|
|
LOG_I("光控定时模式!");
|
|
@@ -2242,18 +2246,18 @@ void WorkTask(void)
|
|
|
}
|
|
}
|
|
|
//1.打开灯管
|
|
//1.打开灯管
|
|
|
#if LAMP_EN == 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(ON,1);
|
|
|
ctr_lamp(OFF,2);
|
|
ctr_lamp(OFF,2);
|
|
|
ctr_lamp(OFF,3);
|
|
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(OFF,1);
|
|
|
ctr_lamp(ON,2);
|
|
ctr_lamp(ON,2);
|
|
|
ctr_lamp(OFF,3);
|
|
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,1);
|
|
|
ctr_lamp(OFF,2);
|
|
ctr_lamp(OFF,2);
|
|
|
ctr_lamp(ON,3);
|
|
ctr_lamp(ON,3);
|