zhunk 2 месяцев назад
Родитель
Сommit
352fd71a0e

+ 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="1271054244246363834" 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="-486798775489886410" 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 - 0
Application_CBD/applications/control.c

@@ -1895,6 +1895,16 @@ void ResetInit(void)
                while(device_status.clear_status==1){
                    rt_thread_delay(1000);
                }
+#if DZ_260917_1 == 1
+               //再执行4次清扫
+               for(int i=0;i<4;i++)
+               {
+                   if(device_status.photo_ws==0)    device_status.clear_status=1;
+                   while(device_status.clear_status==1){
+                       rt_thread_delay(1000);
+                   }
+               }
+#endif
            }
            #if DZ_260519 == 1
            device_status.clear_status = 2;

+ 1 - 0
Application_CBD/applications/control.h

@@ -22,6 +22,7 @@
 #define DZ_260519        0              //进入工作后,每小时转一次仓
 #define DZ_260623_2      0              //中端款测报灯  每次工作前和雨控解除后  上下仓门打开 等待5分钟 清扫10次 关闭上下仓门 开始正常工作  假设8点开始正常工作 可能需要7点30或者35来执行这个动作
 #define DZ_260630_1      0              //针对屏幕自己触发时控时间修改的问题定制:禁用屏幕设置工作时间的功能(不处理屏幕设置时控时间的指令)
+#define DZ_260917_1      1              //resetinit中执行5次清扫;
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源

+ 3 - 0
Application_CBD/applications/dtu_uart2.c

@@ -1413,6 +1413,9 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"dat_f",utos);
     //信号强度
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
+#if DZ_260917_1 == 1
+    cJSON_AddStringToObject(pSubJson,"dz_v","DZ_260917_1");
+#endif
     #if 0
     //太阳能板电压
     cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);