yf_zjb 4 anni fa
parent
commit
42d49a3ab2

+ 8 - 8
Application_BZY/applications/dtu_uart2.c

@@ -620,15 +620,15 @@ void parseDtu(char *json_string)
                                           {
                                               device_status.culture_sh1 = atoi(&ivalue[0]);
                                               device_status.culture_eh1 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
-                                              ef_set_env_blob("culture_sh1", device_status.culture_sh1, sizeof(device_status.culture_sh1));
-                                              ef_set_env_blob("culture_eh1", device_status.culture_eh1, sizeof(device_status.culture_eh1));
+                                              ef_set_env_blob("culture_sh1", &device_status.culture_sh1, sizeof(device_status.culture_sh1));
+                                              ef_set_env_blob("culture_eh1", &device_status.culture_eh1, sizeof(device_status.culture_eh1));
                                           }
                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
                                           {
                                               device_status.culture_sh1 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
                                               device_status.culture_eh1 = atoi(&ivalue[4])<<8|atoi(&ivalue[3]);
-                                              ef_set_env_blob("culture_sh1", device_status.culture_sh1, sizeof(device_status.culture_sh1));
-                                              ef_set_env_blob("culture_eh1", device_status.culture_eh1, sizeof(device_status.culture_eh1));
+                                              ef_set_env_blob("culture_sh1", &device_status.culture_sh1, sizeof(device_status.culture_sh1));
+                                              ef_set_env_blob("culture_eh1", &device_status.culture_eh1, sizeof(device_status.culture_eh1));
                                           }
                                       }
                                       rt_kprintf("开始结束时间1:%d-%d",device_status.culture_sh1,device_status.culture_eh1);
@@ -641,15 +641,15 @@ void parseDtu(char *json_string)
                                           {
                                               device_status.culture_sh2 = atoi(&ivalue[0]);
                                               device_status.culture_eh2 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
-                                              ef_set_env_blob("culture_sh2", device_status.culture_sh2, sizeof(device_status.culture_sh2));
-                                              ef_set_env_blob("culture_eh2", device_status.culture_eh2, sizeof(device_status.culture_eh2));
+                                              ef_set_env_blob("culture_sh2", &device_status.culture_sh2, sizeof(device_status.culture_sh2));
+                                              ef_set_env_blob("culture_eh2", &device_status.culture_eh2, sizeof(device_status.culture_eh2));
                                           }
                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
                                           {
                                               device_status.culture_sh2 = (atoi(&ivalue[1])<<8)|atoi(&ivalue[0]);
                                               device_status.culture_eh2 = (atoi(&ivalue[4])<<8)|atoi(&ivalue[3]);
-                                              ef_set_env_blob("culture_sh2", device_status.culture_sh2, sizeof(device_status.culture_sh2));
-                                              ef_set_env_blob("culture_eh2", device_status.culture_eh2, sizeof(device_status.culture_eh2));
+                                              ef_set_env_blob("culture_sh2", &device_status.culture_sh2, sizeof(device_status.culture_sh2));
+                                              ef_set_env_blob("culture_eh2", &device_status.culture_eh2, sizeof(device_status.culture_eh2));
                                           }
                                       }
                                       rt_kprintf("开始结束时间2:%d-%d",device_status.culture_sh2,device_status.culture_eh2);

+ 1 - 1
Application_CBD/.cproject

@@ -20,7 +20,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.251260409" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.1365878149" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" useByScannerDiscovery="false"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.709136944" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1986446770" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.optimize" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.1986446770" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1312975261" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" useByScannerDiscovery="true" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1538128212" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" useByScannerDiscovery="true" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.2136804218" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" useByScannerDiscovery="true" value="true" valueType="boolean"/>

BIN
Application_CBD/.settings/.rtmenus


+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370599309796052585" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1349771054540304169" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 10 - 6
Application_CBD/applications/control.c

@@ -1647,20 +1647,24 @@ void WorkTask_BZY(void)
                 if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0))
                 {
                     collect_cnt = difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp));
-                    while(collect_cnt--)
+                    while(1)
                     {
+                        if(collect_cnt<=0) break;
+                        collect_cnt = collect_cnt - 10;
                         LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
-                        rt_thread_delay(10000);
+                        rt_thread_mdelay(10000);
                     }
                     collect_cnt = 2;
                 }
                 if(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0)
                 {
                     collect_cnt = difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp));
-                    while(collect_cnt--)
+                    while(1)
                     {
+                        if(collect_cnt<=0) break;
+                        collect_cnt = collect_cnt - 10;
                         LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
-                        rt_thread_delay(10000);
+                        rt_thread_mdelay(10000);
                     }
                 }
                 ctr_Collect_Fan(OFF);
@@ -1689,7 +1693,6 @@ void WorkTask_BZY(void)
             if(device_status.run_sta!=3)
             ctr_turn(90,3);   /*转盘到拍照位置*/
             rt_thread_delay(1000);
-            DTU_Write("takephoto.mp3");
             device_status.work_status=3;    //现在是拍照
             device_status.autotakepic=1;    //对焦拍照
             while(device_status.autotakepic==0)
@@ -1703,7 +1706,8 @@ void WorkTask_BZY(void)
          }
         rt_thread_delay(1000);
     }
-    LOG_W("==================!!!设备已关机!!!===================");
+    device_status.work_status = 0;  //待机
+    LOG_W("==================!!!设备已待机!!!===================");
 }
 //工作任务流程s
 void WorkTask(void)

+ 137 - 110
Application_CBD/applications/dtu_uart2.c

@@ -133,7 +133,10 @@ static void dtu_thread_entry_recv(void *parameter)
             rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
             rx_buffer[rx_length] = '\0';
             rt_kprintf("recv data:%s\n",rx_buffer);
-
+            if(strstr(rx_buffer,"{")==RT_NULL||strstr(rx_buffer,"}")==RT_NULL)
+            {
+                HMI_WRITE("sysTest.result.txt=\"%s\"",rx_buffer);
+            }
             //过滤异常数据
             char str_check_head[2];
             char str_check_end[2];
@@ -1116,10 +1119,14 @@ int parseDtu(char *json_string)
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
               {
+                          if(device_status.dtype==3)
                           hst = cJSON_GetObjectItem(item_ext,"hst");
-                          et  = cJSON_GetObjectItem(item_ext,"et");
+                          if(device_status.dtype==7)
+                          hst = cJSON_GetObjectItem(item_ext,"set_temp");
 
+                          et  = cJSON_GetObjectItem(item_ext,"et");
                           datt = cJSON_GetObjectItem(item_ext,"datt");
+
                           shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
                           tpl = cJSON_GetObjectItem(item_ext,"tpl");
                           shake = cJSON_GetObjectItem(item_ext,"shake");
@@ -1128,80 +1135,37 @@ int parseDtu(char *json_string)
                           st = cJSON_GetObjectItem(item_ext,"st");
                           tt = cJSON_GetObjectItem(item_ext,"tt");
                           htim = cJSON_GetObjectItem(item_ext,"htim");
+                          if(device_status.dtype==3)
                           ds = cJSON_GetObjectItem(item_ext,"ds");
                           vt = cJSON_GetObjectItem(item_ext,"vt");
+
                           if(device_status.dtype==3)
                           collt = cJSON_GetObjectItem(item_ext,"collt");
+
+                          if(device_status.dtype==7)
+                          ds = cJSON_GetObjectItem(item_ext,"on_off");
                           if(device_status.dtype==7)
                           collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
+
                           cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time");   //培养时间1~24
                           cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
-                          if(drop_sec->valueint>=1&&drop_sec->valueint<=30)
+                          if(drop_sec!=NULL)
                           {
-                              device_status.shake_sec = shake_sec->valueint;
-                              ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
-                              rt_kprintf("下发设置滴液时间:%d\n",shake_sec->valueint);
-                          }
-                          if(collt!=NULL)
-                          {
-                               int array_size = cJSON_GetArraySize(collt);
-                               int icnt = 0;
-                               for(icnt=0;icnt < array_size;icnt++)
-                               {
-                                   cJSON *pSub = cJSON_GetArrayItem(collt, icnt);
-                                   uint8_t itmp = 0;
-                                   if(NULL==pSub) {continue;}
-                                   char * ivalue = pSub->valuestring;
-                                   if(icnt==0)
-                                   {
-                                       for(itmp = 0;itmp<10;itmp++)
-                                       {
-                                           if(strstr(&ivalue[itmp],"-")!=NULL&&itmp==1)
-                                           {
-                                               device_status.collecting_sh1 = atoi(&ivalue[0]);
-                                               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));
-                                           }
-                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
-                                           {
-                                               device_status.collecting_sh1 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
-                                               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));
-                                           }
-                                       }
-                                       rt_kprintf("开始结束时间1:%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
-                                   }
-                                   else if (icnt==1)
-                                   {
-                                       for(itmp = 0;itmp<10;itmp++)
-                                       {
-                                           if(strstr(&ivalue[itmp],"-")!=NULL&&itmp==1)
-                                           {
-                                               device_status.collecting_sh2 = atoi(&ivalue[0]);
-                                               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));
-                                           }
-                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
-                                           {
-                                               device_status.collecting_sh2 = (atoi(&ivalue[1])<<8)|atoi(&ivalue[0]);
-                                               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));
-                                           }
-                                       }
-                                       rt_kprintf("开始结束时间2:%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
-                                   }
-                                   rt_kprintf("下发设置收集:%d-%s\n",icnt,ivalue);
-                               }
+                              if(drop_sec->valueint>=1&&drop_sec->valueint<=300)
+                              {
+                                  device_status.shake_sec = drop_sec->valueint;
+                                  ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
+                                  LOG_I("下发设置滴液时间:%d",drop_sec->valueint);
+                              }
                           }
-                          if(cul_time->valueint>=1&&cul_time->valueint<=24)
+                          if(cul_time!=NULL)
                           {
-                              device_status.cul_time = cul_time->valueint;
-                              ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
-                              rt_kprintf("下发设置培养时间:%d\n",cul_time->valueint);
+                              if(cul_time->valueint>=1&&cul_time->valueint<=24)
+                              {
+                                  device_status.cul_time = cul_time->valueint;
+                                  ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
+                                  LOG_I("下发设置培养时间:%d",cul_time->valueint);
+                              }
                           }
                           /*加热温度*/
                           if(hst!=NULL)
@@ -1212,10 +1176,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.heatvalue = hst->valueint;
                                       ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));   //开始时间
-                                      rt_kprintf("加热温度hst:%d\n",hst->valueint);
+                                      LOG_I("加热温度hst:%d",hst->valueint);
                                   }
                                   else {
-                                      rt_kprintf("加热温度hst设置失败参数错误!!!\n");
+                                      LOG_E("加热温度hst设置失败参数错误!!!");
                                 }
                               }
                               else {
@@ -1223,10 +1187,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.heatvalue=atoi(hst->valuestring);
                                       ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));      //加热温度
-                                      rt_kprintf("加热温度hst:%d\n",atoi(hst->valuestring));
+                                      LOG_I("加热温度hst:%d",atoi(hst->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("加热温度hst设置失败参数错误!!!\n");
+                                      LOG_E("加热温度hst设置失败参数错误!!!");
                                 }
                             }
 
@@ -1239,10 +1203,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.startBar = st->valueint;
                                       ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));   //开始时间
-                                      rt_kprintf("开始时间st:%d\n",st->valueint);
+                                      LOG_I("开始时间st:%d",st->valueint);
                                   }
                                   else {
-                                      rt_kprintf("开始时间st设置失败参数错误!!!\n");
+                                      LOG_E("开始时间st设置失败参数错误!!!");
                                   }
                               }
                               else {
@@ -1250,10 +1214,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.startBar = atoi(st->valuestring);
                                       ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));   //开始时间
-                                      rt_kprintf("开始时间st:%d\n",atoi(st->valuestring));
+                                      LOG_I("开始时间st:%d",atoi(st->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("开始时间st设置失败参数错误!!!\n");
+                                      LOG_E("开始时间st设置失败参数错误!!!");
                                   }
                               }
 
@@ -1266,10 +1230,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.stopBar = et->valueint;
                                       ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));      //结束时间
-                                      rt_kprintf("结束时间et:%d\n",et->valueint);
+                                      LOG_I("结束时间et:%d",et->valueint);
                                   }
                                   else {
-                                      rt_kprintf("结束时间et设置失败参数错误!!!\n");
+                                      LOG_E("结束时间et设置失败参数错误!!!");
                                   }
                               }
                               else if(et->type==cJSON_String){
@@ -1277,10 +1241,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.stopBar = atoi(et->valuestring);
                                       ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));      //结束时间
-                                      rt_kprintf("结束时间et:%d\n",atoi(et->valuestring));
+                                      LOG_I("结束时间et:%d",atoi(et->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("结束时间et设置失败参数错误!!!\n");
+                                      LOG_E("结束时间et设置失败参数错误!!!");
                                   }
                               }
                           }
@@ -1293,10 +1257,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.clt_time = collt->valueint;
                                       ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));      //收集时间
-                                      rt_kprintf("收集时间collt:%d\n",collt->valueint);
+                                      LOG_I("收集时间collt:%d",collt->valueint);
                                   }
                                   else {
-                                      rt_kprintf("收集时间collt设置失败参数错误!!!\n");
+                                      LOG_E("收集时间collt设置失败参数错误!!!");
                                   }
                               }
                               else if (collt->type==cJSON_String) {
@@ -1304,12 +1268,71 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.clt_time = atoi(collt->valuestring);
                                       ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));      //收集时间
-                                      rt_kprintf("收集时间collt:%d\n",atoi(collt->valuestring));
+                                      LOG_I("收集时间collt:%d",atoi(collt->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("收集时间collt设置失败参数错误!!!\n");
+                                      LOG_E("收集时间collt设置失败参数错误!!!");
                                   }
                               }
+                              else 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_eh1, sizeof(device_status.collecting_eh2));
+                                         }
+                                         LOG_I("开始结束时间2:%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
+                                     }
+                                     LOG_I("下发设置收集:%d-%s",icnt,ivalue);
+                                 }
+                              }
 
                           }
                           if(datt!=NULL)
@@ -1320,10 +1343,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.dattim = datt->valueint;
                                       ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-                                      rt_kprintf("数据上传间隔datt:%d\n",datt->valueint);
+                                      LOG_I("数据上传间隔datt:%d",datt->valueint);
                                   }
                                   else {
-                                      rt_kprintf("数据上传间隔datt设置失败参数错误!!!\n");
+                                      LOG_E("数据上传间隔datt设置失败参数错误!!!");
                                   }
                               }
                               else if (datt->type==cJSON_String) {
@@ -1331,10 +1354,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.dattim = atoi(datt->valuestring);
                                       ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-                                      rt_kprintf("数据上传间隔datt:%d\n",atoi(datt->valuestring));
+                                      LOG_I("数据上传间隔datt:%d",atoi(datt->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("数据上传间隔datt设置失败参数错误!!!\n");
+                                      LOG_E("数据上传间隔datt设置失败参数错误!!!");
                                   }
                               }
 
@@ -1347,10 +1370,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.shake_sec = shake_sec->valueint;
                                       ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));      //震动时间
-                                      rt_kprintf("震动时间shake_sec:%d\n",shake_sec->valueint);
+                                      LOG_I("震动时间shake_sec:%d",shake_sec->valueint);
                                   }
                                   else {
-                                      rt_kprintf("震动时间shake_sec设置失败参数错误!!!\n");
+                                      LOG_E("震动时间shake_sec设置失败参数错误!!!");
                                   }
                               }
                               else if (shake_sec->type==cJSON_String) {
@@ -1358,10 +1381,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.shake_sec = atoi(shake_sec->valuestring);
                                       ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));      //震动时间
-                                      rt_kprintf("震动时间shake_sec:%d\n",atoi(shake_sec->valuestring));
+                                      LOG_I("震动时间shake_sec:%d",atoi(shake_sec->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("震动时间shake_sec设置失败参数错误!!!\n");
+                                      LOG_E("震动时间shake_sec设置失败参数错误!!!");
                                   }
                               }
 
@@ -1374,10 +1397,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.shake_ws = shake->valueint;
                                       ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));      //震动开关
-                                      rt_kprintf("震动开关shake:%d\n",shake->valueint);
+                                      LOG_I("震动开关shake:%d",shake->valueint);
                                   }
                                   else {
-                                      rt_kprintf("震动开关shake设置失败参数错误!!!\n");
+                                      LOG_E("震动开关shake设置失败参数错误!!!");
                                   }
                               }
                               else if (shake->type==cJSON_String) {
@@ -1385,10 +1408,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.shake_ws = atoi(shake->valuestring);
                                       ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));      //震动开关
-                                      rt_kprintf("震动开关shake:%d\n",atoi(shake->valuestring));
+                                      LOG_I("震动开关shake:%d",atoi(shake->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("震动开关shake设置失败参数错误!!!\n");
+                                      LOG_E("震动开关shake设置失败参数错误!!!");
                                   }
                               }
 
@@ -1436,10 +1459,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.heattime = htim->valueint;
                                       ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));      //加热时间
-                                      rt_kprintf("加热时长htim:%d\n",htim->valueint);
+                                      LOG_I("加热时长htim:%d",htim->valueint);
                                   }
                                   else {
-                                      rt_kprintf("加热时长htim设置失败参数错误!!!\n");
+                                      LOG_I("加热时长htim设置失败参数错误!!!");
                                   }
                               }
                               else if (htim->type==cJSON_String) {
@@ -1447,10 +1470,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.heattime = atoi(htim->valuestring);
                                       ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));      //加热时间
-                                      rt_kprintf("加热时长htim:%d\n",atoi(htim->valuestring));
+                                      LOG_I("加热时长htim:%d",atoi(htim->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("加热时长htim设置失败参数错误!!!\n");
+                                      LOG_E("加热时长htim设置失败参数错误!!!");
                                   }
                               }
                           }
@@ -1471,7 +1494,7 @@ int parseDtu(char *json_string)
                                       //                                  static rt_uint32_t nowstamp_num = 0;
                                       //                                  nowstamp_num = mktime(&nowstamp);
                                       //                                  device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-                                      rt_kprintf("定时模式ts:%d\n",ts->valueint);
+                                      LOG_I("定时模式ts:%d",ts->valueint);
                                       #else
                                       rt_kprintf("三光源模式,禁止设置定时!!!\n");
                                       #endif
@@ -1494,13 +1517,13 @@ int parseDtu(char *json_string)
                                       //                                  static rt_uint32_t nowstamp_num = 0;
                                       //                                  nowstamp_num = mktime(&nowstamp);
                                       //                                  device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-                                      rt_kprintf("定时模式ts:%d\n",atoi(ts->valuestring));
+                                      LOG_I("定时模式ts:%d",atoi(ts->valuestring));
                                       #else
                                       rt_kprintf("三光源模式,禁止设置定时!!!\n");
                                       #endif
                                   }
                                   else {
-                                      rt_kprintf("定时模式ts设置失败参数错误!!!\n");
+                                      LOG_I("定时模式ts设置失败参数错误!!!");
                                   }
                               }
 
@@ -1567,10 +1590,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.ds = ds->valueint;
                                       ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
-                                      rt_kprintf("开关机状态:%d\n",ds->valueint);
+                                      LOG_I("开关机状态:%d",ds->valueint);
                                   }
                                   else {
-                                      rt_kprintf("开关机状态设置失败参数错误!!!\n");
+                                      LOG_E("开关机状态设置失败参数错误!!!");
                                   }
                               }
                               else if (ds->type==cJSON_String) {
@@ -1578,10 +1601,10 @@ int parseDtu(char *json_string)
                                   {
                                       device_status.ds = atoi(ds->valuestring);
                                       ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
-                                      rt_kprintf("开关机状态:%d\n",atoi(ds->valuestring));
+                                      LOG_I("开关机状态:%d\n",atoi(ds->valuestring));
                                   }
                                   else {
-                                      rt_kprintf("开关机状态设置失败参数错误!!!\n");
+                                      LOG_E("开关机状态设置失败参数错误!!!");
                                   }
                               }
 
@@ -1601,12 +1624,16 @@ int parseDtu(char *json_string)
                           UpLoad_Data();
                           rt_thread_delay(2000);
                           //2022/06/23,add:
-                          rt_sprintf(device_status.json_w_clock,"平台操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
-                          json_s = makeJson_Warn(device_status.json_w_clock, "修改时间");
-                          ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock));   //将修改屏幕参数操作记录保存到Flash中
-                          if(atoi(device_status.net)==0)
-                              DTU_Write("%s",json_s);
-                          rt_free(json_s);
+                          if(device_status.dtype==3)
+                          {
+                              rt_sprintf(device_status.json_w_clock,"平台操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)-%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
+                              json_s = makeJson_Warn(device_status.json_w_clock, "修改时间");
+                              ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock));   //将修改屏幕参数操作记录保存到Flash中
+                              if(atoi(device_status.net)==0)
+                                  DTU_Write("%s",json_s);
+                              rt_free(json_s);
+                          }
+
                           rt_thread_delay(1000);
                           MA_save();
                           rt_thread_delay(1000);

+ 19 - 0
Application_CBD/applications/hmi.c

@@ -1314,6 +1314,7 @@ static void Ctr_Mortor_entry(void* parameter)
             beep_set(500000, 500000/5);      //2kzh - 50%
             while(rt_pin_read(LIMIT_UP)==1)
             {
+                HMI_WRITE("sysTest.result.txt=\"对焦拍照触发次数:%d\"",photo_setup);
                 rt_pin_write(Motor_EN, 0); //驱动器失能
                 Hk_Take_io();
                 rt_pin_write(Motor_EN, 1); //驱动器使能
@@ -1355,66 +1356,83 @@ static void Ctr_Mortor_entry(void* parameter)
         {
             //转盘复位
             LOG_I("转盘复位!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:转盘复位!\"");
             rt_thread_delay(2000);
             ctr_turn(0,0);
             //转90
             LOG_I("第一次转盘!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:第一次转盘!\"");
             ctr_turn(90,0);
             rt_thread_delay(2000);
             //推杆电机:测试粘附:
             LOG_I("涂凡士林!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:涂凡士林!\"");
             ctr_Petroleum_jelly(10);
             rt_thread_delay(2000);
             //转90
             LOG_I("第二次转盘!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:第二次转盘!\"");
             ctr_turn(90,0);
             rt_thread_delay(2000);
             //采集,打开风机
             LOG_I("采集,打开风机!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:采集,打开风机!\"");
             ctr_Collect_Fan(ON);
             rt_thread_delay(5000);
             LOG_I("采集结束,关闭风机!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:采集结束,关闭风机!\"");
             rt_thread_delay(2000);
             ctr_Collect_Fan(OFF);
             //散热
             LOG_I("打开散热!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:打开散热!\"");
             rt_thread_delay(2000);
             ctr_Cool_Fan(ON);
             rt_thread_delay(5000);
             LOG_I("关闭散热!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:关闭散热!\"");
             rt_thread_delay(2000);
             ctr_Cool_Fan(OFF);
             //转90
             LOG_I("第三次转盘!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:第三次转盘!\"");
             ctr_turn(90,0);
             rt_thread_delay(5000);
             //滴液
             LOG_I("开始滴液!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:开始滴液!\"");
             rt_thread_delay(2000);
             ctr_shake(ON,device_status.shake_sec);
             rt_thread_delay(5000);
             LOG_I("停止滴液!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:停止滴液!\"");
             rt_thread_delay(2000);
             //加热
             LOG_I("开始加热!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:开始加热!\"");
             rt_thread_delay(2000);
             ctr_Heat(ON);
             rt_thread_delay(5000);
             LOG_I("停止加热!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:停止加热!\"");
             rt_thread_delay(2000);
             ctr_Heat(OFF);
             //制冷
             LOG_I("开始制冷!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:开始制冷!\"");
             rt_thread_delay(2000);
             ctr_Cold(ON);
             rt_thread_delay(5000);
             LOG_I("停止制冷!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:停止制冷!\"");
             rt_thread_delay(2000);
             ctr_Cold(OFF);
             //转90
             LOG_I("第四次转盘!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:第四次转盘!\"");
             ctr_turn(90,0);
             LOG_I("打开补光灯!!!");
+            HMI_WRITE("sysTest.result.txt=\"一键测试:打开补光灯!\"");
             rt_thread_delay(2000);
             ctr_led(ON);
             device_status.autotakepic=1;
@@ -1679,6 +1697,7 @@ 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]",device_status.collecting_sh1,device_status.collecting_eh1,device_status.collecting_sh2,device_status.collecting_eh2);
     }
     //RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
     if(device_status.update_flag==1)