Prechádzať zdrojové kódy

fix 光控重启和下发参数设置报错

yf_zjb 3 rokov pred
rodič
commit
6f4eddb563

+ 1 - 1
Application_BZY/.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="1297872936118873969" 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="1297603847426260181" 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>

+ 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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1349501965847690381" 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>

+ 6 - 2
Application_CBD/applications/control.c

@@ -341,13 +341,16 @@ uint8_t ctr_Collect_Fan(uint8_t status_collect)
 {
     device_status.collect_fan_status = status_collect;
     rt_pin_mode(Collect_Fan, PIN_MODE_OUTPUT);
+    rt_pin_mode(Cold_Pin,PIN_MODE_OUTPUT);
     if(status_collect==OFF)
     {
        rt_pin_write(Collect_Fan,OFF);
+       rt_pin_write(Cold_Pin,OFF);
     }
     if(status_collect==ON)
     {
        rt_pin_write(Collect_Fan,ON);
+       rt_pin_write(Cold_Pin,ON);
     }
     return device_status.collect_fan_status;
 }
@@ -532,11 +535,12 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
-    if(device_status.dtype==3)
-    DTU_Write("drop");
+    if(device_status.dtype==7)
+        DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     if(status_shake==ON&&device_status.shake_ws==1)
     {
+
         rt_pin_write(SHAKE_SW,ON);
         if(device_status.dtype==3)  rt_thread_delay(shake_sec*100);
         if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);

+ 12 - 4
Application_CBD/applications/dtu_uart2.c

@@ -30,7 +30,7 @@
 
 
 #define DTU_THREAD_PRIORITY         6          //线程优先级
-#define DTU_THREAD_STACK_SIZE       1024        //线程栈空间大小
+#define DTU_THREAD_STACK_SIZE       2048        //线程栈空间大小
 #define DTU_THREAD_TIMESLICE        5           //时间片
 
 
@@ -1051,23 +1051,29 @@ int parseDtu(char *json_string)
                       {
                           if(strstr(device_status.lat,lat->valuestring)==NULL)
                           {
+                              memset(device_status.lat,0,sizeof(device_status.lat));
+                              memset(device_status.lng,0,sizeof(device_status.lng));
                               rt_sprintf(device_status.lat,"%s",lat->valuestring);
                               rt_sprintf(device_status.lng,"%s",lng->valuestring);
                               ef_set_env_blob("lat", &device_status.lat, sizeof(device_status.lat));  //Iccid
                               ef_set_env_blob("lng", &device_status.lng, sizeof(device_status.lng));  //Iccid
                           }
                           else {
-                              rt_kprintf("经纬度信息同步:lat-%s,lng-%s\n",lat->valuestring,lng->valuestring);
+                              LOG_I("经纬度信息同步:lat-%s,lng-%s",lat->valuestring,lng->valuestring);
                         }
 
                       }else if(atoi(gps->valuestring)==0)
                       {
-                           sprintf(device_status.lat,"%s",lat->valuestring);
-                           sprintf(device_status.lng,"%s",lng->valuestring);
+                           memset(device_status.lat,0,sizeof(device_status.lat));
+                           memset(device_status.lng,0,sizeof(device_status.lng));
+                           rt_sprintf(device_status.lat,"%s",lat->valuestring);
+                           rt_sprintf(device_status.lng,"%s",lng->valuestring);
                       }
                   }
                   else {
                       rt_sprintf(device_status.gps,"0");
+                      memset(device_status.lat,0,sizeof(device_status.lat));
+                      memset(device_status.lng,0,sizeof(device_status.lng));
                       if(sizeof(device_status.lat)<3)
                       {
                           sprintf(device_status.lat,"%s","34.8088073");
@@ -1078,7 +1084,9 @@ int parseDtu(char *json_string)
                           sprintf(device_status.lng,"%s",lng->valuestring);
                     }
                   }
+                  if(driver_4g!=RT_NULL)
                   sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
+                  if(project!=RT_NULL)
                   sprintf(device_status.project,"%s",project->valuestring);
                   if(mqttcfg1!=NULL)
                   {

+ 2 - 2
Application_CBD/applications/sht30_collect.c

@@ -118,7 +118,7 @@ static void sht30_collect_thread_entry(void *parameter)
         if(Read_Light_Voltage()>500)
         {
             checklightnum++;
-            if(checklightnum==40)
+            if(checklightnum==20)
             {
                 device_status.sun_status = 1;
                 checklightnum =0;
@@ -127,7 +127,7 @@ static void sht30_collect_thread_entry(void *parameter)
         }
         else {
             checknightnum ++;
-            if(checknightnum==40)
+            if(checknightnum==20)
             {
                 device_status.sun_status = 0;
                 checknightnum = 0;

+ 1 - 1
CBD_FOTA_BootLoader/.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="1370230865913647974" 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="1369961777221034186" 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>