|
|
@@ -1678,23 +1678,23 @@ void WorkTask_BZY(void)
|
|
|
//只有开始和结束时刻不同的时间段,才有效
|
|
|
if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0)||(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0))
|
|
|
{
|
|
|
- rt_int32_t collect_cnt = 0;
|
|
|
-
|
|
|
if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0)&& difftime(mktime(&now_stamp),mktime(&cul_sh1_stamp)) > 0)
|
|
|
{
|
|
|
device_status.work_status = 1;
|
|
|
ctr_Collect_Fan(ON);
|
|
|
- collect_cnt = difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp));
|
|
|
- while(1)
|
|
|
+ //当前时间戳小于第一段结束时间戳
|
|
|
+ while(difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp))>0)
|
|
|
{
|
|
|
- if(collect_cnt<0) break;
|
|
|
+ time(&now);
|
|
|
+ now_stamp = *localtime(&now);
|
|
|
+ cul_eh1_stamp = *localtime(&now);
|
|
|
+ cul_eh1_stamp.tm_hour = device_status.collecting_eh1;
|
|
|
+ cul_eh1_stamp.tm_min = 0;
|
|
|
+ cul_eh1_stamp.tm_sec = 0;
|
|
|
if(device_status.run_sta!=1) break;
|
|
|
- collect_cnt = collect_cnt - 10;
|
|
|
- LOG_I("1===========采集风机启动,正在收集.....%d",collect_cnt);
|
|
|
+ LOG_I("1===========采集风机启动,正在收集.....%d",mktime(&now_stamp),mktime(&cul_eh1_stamp));
|
|
|
rt_thread_mdelay(10000);
|
|
|
}
|
|
|
- now_stamp = *localtime(&now);
|
|
|
- collect_cnt = 2;
|
|
|
}
|
|
|
else {
|
|
|
device_status.work_status=0;
|
|
|
@@ -1705,16 +1705,18 @@ void WorkTask_BZY(void)
|
|
|
{
|
|
|
device_status.work_status = 1;
|
|
|
ctr_Collect_Fan(ON);
|
|
|
- collect_cnt = difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp));
|
|
|
- while(1)
|
|
|
+ while(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp))>0)
|
|
|
{
|
|
|
- if(collect_cnt<0) break;
|
|
|
+ time(&now);
|
|
|
+ now_stamp = *localtime(&now);
|
|
|
+ cul_eh2_stamp = *localtime(&now);
|
|
|
+ cul_eh2_stamp.tm_hour = device_status.collecting_eh2;
|
|
|
+ cul_eh2_stamp.tm_min = 0;
|
|
|
+ cul_eh2_stamp.tm_sec = 0;
|
|
|
if(device_status.run_sta!=1) break;
|
|
|
- collect_cnt = collect_cnt - 10;
|
|
|
- LOG_I("2===========采集风机启动,正在收集.....%d",collect_cnt);
|
|
|
+ LOG_I("2===========采集风机启动,正在收集.....%d-%d",mktime(&now_stamp),mktime(&cul_eh2_stamp));
|
|
|
rt_thread_mdelay(10000);
|
|
|
}
|
|
|
- now_stamp = *localtime(&now);
|
|
|
}
|
|
|
else {
|
|
|
device_status.work_status=0;
|
|
|
@@ -1738,6 +1740,13 @@ void WorkTask_BZY(void)
|
|
|
device_status.work_status = 3;
|
|
|
device_status.autotakepic=1; //对焦拍照
|
|
|
}
|
|
|
+ //在培养之前再次确认时间戳
|
|
|
+ time(&now);
|
|
|
+ now_stamp = *localtime(&now);
|
|
|
+ cul_eh2_stamp = *localtime(&now);
|
|
|
+ cul_eh2_stamp.tm_hour = device_status.collecting_eh2;
|
|
|
+ cul_eh2_stamp.tm_min = 0;
|
|
|
+ cul_eh2_stamp.tm_sec = 0;
|
|
|
//当前时间戳大于收集结束时间戳并且run_sta==1
|
|
|
if(device_status.run_sta==1 && difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) > 0)
|
|
|
{
|