yf_zjb 3 роки тому
батько
коміт
3119bac188

+ 24 - 15
Application_CBD/applications/control.c

@@ -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))
             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)
                 if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0)&& difftime(mktime(&now_stamp),mktime(&cul_sh1_stamp)) > 0)
                 {
                 {
                     device_status.work_status = 1;
                     device_status.work_status = 1;
                     ctr_Collect_Fan(ON);
                     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;
                         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);
                         rt_thread_mdelay(10000);
                     }
                     }
-                    now_stamp = *localtime(&now);
-                    collect_cnt = 2;
                 }
                 }
                 else {
                 else {
                     device_status.work_status=0;
                     device_status.work_status=0;
@@ -1705,16 +1705,18 @@ void WorkTask_BZY(void)
                 {
                 {
                     device_status.work_status = 1;
                     device_status.work_status = 1;
                     ctr_Collect_Fan(ON);
                     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;
                         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);
                         rt_thread_mdelay(10000);
                     }
                     }
-                    now_stamp = *localtime(&now);
                 }
                 }
                 else {
                 else {
                     device_status.work_status=0;
                     device_status.work_status=0;
@@ -1738,6 +1740,13 @@ void WorkTask_BZY(void)
             device_status.work_status = 3;
             device_status.work_status = 3;
             device_status.autotakepic=1;    //对焦拍照
             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
         //当前时间戳大于收集结束时间戳并且run_sta==1
         if(device_status.run_sta==1 && difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) > 0)
         if(device_status.run_sta==1 && difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) > 0)
         {
         {

+ 1 - 1
Application_CBD/applications/dtu_uart2.c

@@ -988,7 +988,7 @@ int parseDtu(char *json_string)
                       strncpy(hour_s,datetime->valuestring+8,2);
                       strncpy(hour_s,datetime->valuestring+8,2);
                       strncpy(min_s,datetime->valuestring+10,2);
                       strncpy(min_s,datetime->valuestring+10,2);
                       strncpy(sec_s,datetime->valuestring+12,2);
                       strncpy(sec_s,datetime->valuestring+12,2);
-                      if(atoi(year_s)>2020&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
+                      if(atoi(year_s)>=2022&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
                       {
                       {
                           rt_kprintf("设置时间:%d年%d月%d日\n",atoi(year_s),atoi(month_s),atoi(day_s));
                           rt_kprintf("设置时间:%d年%d月%d日\n",atoi(year_s),atoi(month_s),atoi(day_s));
                           if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
                           if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)