|
|
@@ -971,6 +971,7 @@ void WorkTask_BZYV2(void)
|
|
|
ctr_lamp(OFF,1); //镇流器关=X轴开关:开
|
|
|
ctr_swz(OFF);
|
|
|
ctr_Collect_Fan(OFF);
|
|
|
+
|
|
|
while(device_status.work_status ==0){
|
|
|
rt_thread_delay(10000);
|
|
|
LOG_W("等待设备进入工作");
|
|
|
@@ -1007,35 +1008,41 @@ void WorkTask_BZYV2(void)
|
|
|
/* 入口函数-工作状态检测 */
|
|
|
static void Work_status_thread_entry(void *parameter)
|
|
|
{
|
|
|
- while(1)
|
|
|
+ while(device_status.ds==1)
|
|
|
{
|
|
|
while(alarmCheck(device_status.collecting_sh1,device_status.collecting_eh1) == ON)
|
|
|
{
|
|
|
device_status.work_status = 1;
|
|
|
- device_status.work_done = 1;
|
|
|
LOG_I("the alarm1 workflag was ON");
|
|
|
+ device_status.work_done=1;
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
-
|
|
|
+ //如果当前时间大于collecting_eh1,开始拍照
|
|
|
|
|
|
while(alarmCheck(device_status.collecting_sh2,device_status.collecting_eh2) == ON)
|
|
|
{
|
|
|
device_status.work_status = 1;
|
|
|
- device_status.work_done = 1;
|
|
|
+ device_status.work_done=1;
|
|
|
LOG_I("the alarm2 workflag was ON");
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
+ //如果当前时间大于collecting_eh2,开始拍照
|
|
|
|
|
|
while(alarmCheck(device_status.collecting_sh3,device_status.collecting_eh3) == ON)
|
|
|
{
|
|
|
- device_status.work_done = 1;
|
|
|
device_status.work_status = 1;
|
|
|
+ device_status.work_done=1;
|
|
|
LOG_I("the alarm3 workflag was ON");
|
|
|
+
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
- //当前时间大于3段定时结束时间
|
|
|
device_status.work_status = 0;
|
|
|
- device_status.work_done = 0;
|
|
|
+ //如果当前时间大于
|
|
|
+ if(device_status.work_done!=0)
|
|
|
+ {
|
|
|
+ rt_thread_delay(1000*30);
|
|
|
+ device_status.work_done = 0;
|
|
|
+ }
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
}
|