zhunk hai 1 ano
pai
achega
796ce3519f

+ 3 - 4
Application_cbd_apm32f1/applications/control.c

@@ -957,10 +957,10 @@ u_int8_t alarmCheck(u_int8_t starthour,u_int8_t endhour,u_int8_t startmin,u_int8
         // 跨天模式
         workflag = (curr_sec >= start_sec || curr_sec < end_sec) ? 1 : 0;
     }
-    LOG_I("时控模式:状态[%s] 当前时间:%02d:%02d:%02d 设置:%02d:00-%02d:00",
+    LOG_I("时控模式:状态[%s] 当前时间:%02d:%02d:%02d 设置:%02d:%02d-%02d:%02d",
           workflag ? "工作" : "待机",
           now_tm.tm_hour, now_tm.tm_min, now_tm.tm_sec,
-          starthour, endhour);
+          starthour,startmin, endhour,endmin);
     rt_thread_delay(10000);
     return workflag;
 }
@@ -982,8 +982,7 @@ void WorkTask_BZYV2(void)
             }else{
                 ctr_router(OFF);
             }
-
-            rt_thread_delay(1000);
+            rt_thread_delay(10000);
         }
         ctr_router(OFF);
         if(device_status.work_done==1){

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.4.1"                   //孢子仪
+#define VERSION_BZY         "2.4.2"                   //孢子仪
 
 
 /*********************************************************************/

+ 76 - 96
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -612,8 +612,15 @@ char * makeJson()
         device_status.coll_time[0] = ct1;
         device_status.coll_time[1] = ct2;
         device_status.coll_time[2] = ct3;
-        cJSON *data_clt = NULL;
-        data_clt = cJSON_CreateStringArray(device_status.coll_time,3);
+        cJSON *data_clt = cJSON_CreateStringArray(device_status.coll_time,3);
+
+        rt_sprintf(ct1,"%d-%d",device_status.collt_min_sh1,device_status.collt_min_eh1);
+        rt_sprintf(ct2,"%d-%d",device_status.collt_min_sh2,device_status.collt_min_eh2);
+        rt_sprintf(ct3,"%d-%d",device_status.collt_min_sh3,device_status.collt_min_eh3);
+        device_status.coll_time[0] = ct1;
+        device_status.coll_time[1] = ct2;
+        device_status.coll_time[2] = ct3;
+        cJSON *coll_min = cJSON_CreateStringArray(device_status.coll_time,3);
         //工作状态
         rt_sprintf(utos, "%d",device_status.work_status);
         cJSON_AddStringToObject(pSubJson,"work_sta",utos);
@@ -632,6 +639,8 @@ char * makeJson()
 
         //收集时间
         cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
+        cJSON_AddItemToObject(pSubJson,"coll_min",coll_min);
+
     }
 
     cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
@@ -1288,23 +1297,23 @@ int parseDtu(char *json_string)
                                               if(i==0){
                                                   if(min_st_INT<60&&min_st_INT>=0){
                                                       device_status.collt_min_sh1 = min_st_INT;
-                                                      ef_set_and_save_env("collt_min_sh1", min_st);
+                                                      ef_set_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1));
                                                   }
 
                                                   if(min_et_INT<60&&min_et_INT>=0){
                                                       device_status.collt_min_eh1 = min_et_INT;
-                                                      ef_set_and_save_env("collt_min_eh1", min_et);
+                                                      ef_set_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1));
                                                   }
                                                   LOG_W("第1段开始:%d 第1段结束:%d",device_status.collt_min_sh1,
                                                           device_status.collt_min_eh1);
                                               }else if (i==1) {
                                                   if(min_st_INT<60&&min_st_INT>=0){
                                                       device_status.collt_min_sh2 = min_st_INT;
-                                                      ef_set_and_save_env("collt_min_sh2", min_st);
+                                                      ef_set_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2));
                                                   }
                                                   if(min_et_INT<60&&min_et_INT>=0){
                                                       device_status.collt_min_eh2 = min_et_INT;
-                                                      ef_set_and_save_env("collt_min_eh2", min_et);
+                                                      ef_set_env_blob("collt_min_eh2", &device_status.collt_min_eh2, sizeof(device_status.collt_min_eh2));
                                                   }
                                                   LOG_W("第2段开始:%d 第2段结束:%d",device_status.collt_min_sh2,
                                                           device_status.collt_min_eh2);
@@ -1312,11 +1321,11 @@ int parseDtu(char *json_string)
                                               }else if (i==2) {
                                                   if(min_st_INT<60&&min_st_INT>=0){
                                                       device_status.collt_min_sh3 = min_st_INT;
-                                                      ef_set_and_save_env("collt_min_sh3", min_st);
+                                                      ef_set_env_blob("collt_min_sh3", &device_status.collt_min_sh3, sizeof(device_status.collt_min_sh3));
                                                   }
                                                   if(min_et_INT<60&&min_et_INT>=0){
                                                       device_status.collt_min_eh3 = min_et_INT;
-                                                      ef_set_and_save_env("collt_min_eh3", min_et);
+                                                      ef_set_env_blob("collt_min_eh3", &device_status.collt_min_eh3, sizeof(device_status.collt_min_eh3));
                                                   }
                                                   LOG_W("第3段开始:%d 第3段结束:%d",device_status.collt_min_sh3,
                                                           device_status.collt_min_eh3);
@@ -1326,95 +1335,66 @@ int parseDtu(char *json_string)
                                   }
                               }
                           }
-                          /*加热温度*/
-                          if(collt!=NULL)
-                          {
-                              if (collt->type==cJSON_Array) {
-                                 int icnt = 0;
-                                 for(icnt=0;icnt < cJSON_GetArraySize(collt);icnt++)
-                                 {
-                                     cJSON *pSub = cJSON_GetArrayItem(collt, icnt);
-                                     if(NULL==pSub) break;
-                                     char ivalue[10];
-                                     rt_sprintf(ivalue,"%s",pSub->valuestring);
-                                     if(icnt==0)
-                                     {
-                                         if(ivalue[1]=='-')
-                                         {
-                                             device_status.collecting_sh1 = atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh1 = atoi(&ivalue[2]);
-                                             if(strlen(ivalue)==4)
-                                                 device_status.collecting_eh1 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
-                                             ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
-                                             ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
-                                         }
-                                         if(ivalue[2]=='-')
-                                         {
-                                             device_status.collecting_sh1 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh1 = atoi(&ivalue[3]);
-                                             if(strlen(ivalue)==5)
-                                                 device_status.collecting_eh1 = atoi(&ivalue[4])<<8|atoi(&ivalue[3]);
-                                             ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
-                                             ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
-                                         }
-                                         LOG_I("开始结束时间1:%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
-                                     }
-                                     else if (icnt==1)
-                                     {
-                                         if((ivalue[1]=='-'))
-                                         {
-                                             device_status.collecting_sh2 = atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh2 = atoi(&ivalue[2]);
-                                             if(strlen(ivalue)==4)
-                                                 device_status.collecting_eh2 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
-                                             ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
-                                             ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
-                                         }
-                                         if((ivalue[2]=='-'))
-                                         {
-                                             device_status.collecting_sh2 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh2 = atoi(&ivalue[2]);
-                                             if(strlen(ivalue)==5)
-                                                 device_status.collecting_eh2 = atoi(&ivalue[4])<<8|atoi(&ivalue[3]);
-                                             ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
-                                             ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
-                                         }
-                                         LOG_I("开始结束时间2:%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
-                                     }
-                                     else if (icnt==2)
-                                     {
-                                         if((ivalue[1]=='-'))
-                                         {
-                                             device_status.collecting_sh3 = atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh3 = atoi(&ivalue[2]);
-                                             if(strlen(ivalue)==4)
-                                                 device_status.collecting_eh3 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
-                                             ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));
-                                             ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));
-                                         }
-                                         if((ivalue[2]=='-'))
-                                         {
-                                             device_status.collecting_sh3 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
-                                             if(strlen(ivalue)==3)
-                                                 device_status.collecting_eh3 = atoi(&ivalue[2]);
-                                             if(strlen(ivalue)==5)
-                                                 device_status.collecting_eh3 = atoi(&ivalue[4])<<8|atoi(&ivalue[3]);
-                                             ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));
-                                             ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));
-                                         }
-                                         LOG_I("开始结束时间3:%d-%d",device_status.collecting_sh3,device_status.collecting_eh3);
-                                     }
-
-                                     LOG_I("下发设置收集:%d-%s",icnt,ivalue);
-                                 }
-                              }
-
+                          if(collt!=NULL){
+                           if(collt->type==cJSON_Array) {
+                               // 获取数组大小
+                               int array_size = cJSON_GetArraySize(collt);
+                               // 遍历数组中的所有元素
+                               for (int i = 0; i < array_size; i++){
+                                   cJSON *item = cJSON_GetArrayItem(collt, i);
+                                   if (cJSON_IsString(item) && item->valuestring != NULL) {
+                                       char *range_str = item->valuestring;
+                                       char *delimiter = strchr(range_str, '-');
+                                       if (delimiter != NULL) {
+                                           // 提取起始值和结束值
+                                           char min_st[5] = {0};
+                                           char min_et[5] = {0};
+                                           strncpy(min_st, range_str, delimiter - range_str);
+                                           strcpy(min_et, delimiter + 1);
+                                           int min_st_INT = atoi(min_st);
+                                           int min_et_INT = atoi(min_et);
+                                           if(i==0){
+                                               if(min_st_INT<24&&min_st_INT>=0){
+                                                   device_status.collecting_sh1 = min_st_INT;
+                                                   ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+                                               }
+
+                                               if(min_et_INT<24&&min_et_INT>=0){
+                                                   device_status.collecting_eh1 = min_et_INT;
+                                                   ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+                                               }
+                                               LOG_W("第1段开始:%d 第1段结束:%d",device_status.collecting_sh1,
+                                                       device_status.collecting_eh1);
+                                           }else if (i==1) {
+                                               if(min_st_INT<24&&min_st_INT>=0){
+                                                   device_status.collecting_sh2 = min_st_INT;
+                                                   ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+                                               }
+                                               if(min_et_INT<24&&min_et_INT>=0){
+                                                   device_status.collecting_eh2 = min_et_INT;
+                                                   ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+                                               }
+                                               LOG_W("第2段开始:%d 第2段结束:%d",device_status.collecting_sh2,
+                                                       device_status.collecting_eh2);
+
+                                           }else if (i==2) {
+                                               if(min_st_INT<60&&min_st_INT>=0){
+                                                   device_status.collecting_sh3 = min_st_INT;
+                                                   ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));
+                                               }
+                                               if(min_et_INT<60&&min_et_INT>=0){
+                                                   device_status.collecting_eh3 = min_et_INT;
+                                                   ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));
+                                               }
+                                               LOG_W("第3段开始:%d 第3段结束:%d",device_status.collecting_sh3,
+                                                       device_status.collecting_eh3);
+                                           }
+                                       }
+                                   }
+                               }
+                           }
                           }
+
                           if(datt!=NULL)
                           {
                               if(datt->type==cJSON_Number)

+ 5 - 3
Application_cbd_apm32f1/applications/hmi.c

@@ -1676,14 +1676,15 @@ void Check_ParamConfig(void)
         ef_get_env_blob("collecting_eh1",&device_status.collecting_eh1,sizeof(device_status.collecting_eh1),NULL);  //采集结束1
         ef_get_env_blob("collecting_sh2",&device_status.collecting_sh2,sizeof(device_status.collecting_sh2),NULL);  //采集开始2
         ef_get_env_blob("collecting_eh2",&device_status.collecting_eh2,sizeof(device_status.collecting_eh2),NULL);  //采集结束2
-        ef_get_env_blob("collecting_sh3",&device_status.collecting_sh2,sizeof(device_status.collecting_sh3),NULL);  //采集开始3
-        ef_get_env_blob("collecting_eh3",&device_status.collecting_eh2,sizeof(device_status.collecting_eh3),NULL);  //采集结束3
+        ef_get_env_blob("collecting_sh3",&device_status.collecting_sh3,sizeof(device_status.collecting_sh3),NULL);  //采集开始3
+        ef_get_env_blob("collecting_eh3",&device_status.collecting_eh3,sizeof(device_status.collecting_eh3),NULL);  //采集结束3
         ef_get_env_blob("run_sta",&device_status.run_sta,sizeof(device_status.run_sta),NULL);                       //运行状态
         ef_get_env_blob("Power_Type",&device_status.Power_Type,sizeof(device_status.Power_Type),NULL);              //供电类型
         ef_get_env_blob("deviceId",&device_status.deviceId,sizeof(device_status.deviceId),NULL);                    //设备编码
         ef_get_env_blob("handle_bugger",&device_status.handle_bugger,sizeof(device_status.handle_bugger),NULL);     //排虫
         ef_get_env_blob("x_init_dis",&device_status.x_init_dis,sizeof(device_status.x_init_dis),NULL);
         ef_get_env_blob("y_init_dis",&device_status.y_init_dis,sizeof(device_status.y_init_dis),NULL);
+
         ef_get_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1), NULL);
         ef_get_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1), NULL);
         ef_get_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2), NULL);
@@ -1729,7 +1730,8 @@ void Check_ParamConfig(void)
         LOG_I("温湿度数据:%d-%d",atoi(device_status.tempture),atoi(device_status.humidity));
         LOG_I("上传平台:%s",device_status.mqttcfg1);
         LOG_I("孢子仪运行状态:%d",device_status.run_sta);
-        LOG_I("孢子仪采集时间:[%d:%d-%d:%d,%d:%d-%d:%d,%d:%d-%d:%d]",device_status.collecting_sh1,device_status.collt_min_sh1,
+        LOG_I("孢子仪采集时间:[%d:%d-%d:%d,%d:%d-%d:%d,%d:%d-%d:%d]",
+                device_status.collecting_sh1,device_status.collt_min_sh1,
                 device_status.collecting_eh1,device_status.collt_min_eh1,
                 device_status.collecting_sh2,device_status.collt_min_sh2,
                 device_status.collecting_eh2,device_status.collt_min_eh2,

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2025-09-02 更新说明
+#define VERSION_BZY         "2.4.2"                   //孢子仪
+1. 修复采集时间的分钟设置;
+2. 修复采集时间开机读取错误问题;
 # 2025-09-01 更新说明
 #define VERSION_BZY         "2.4.1"                   //孢子仪
 1. 增加采集时间的分钟设置;