ソースを参照

修复三色灯异常问题

zhunk 1 年間 前
親
コミット
ad8a73eceb

+ 1 - 0
Application_APM32F103/packages/LedBlink-latest

@@ -0,0 +1 @@
+Subproject commit 29fddf8130d6b8bf7839b67556f9eabce56f4b49

+ 1 - 0
Application_APM32F103/packages/syswatch-latest

@@ -0,0 +1 @@
+Subproject commit 523113fcc10a9d747effd2428fe570766f713c22

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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="-414164999204249117" 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="-411634754427827492" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 2 - 3
Application_CBD/applications/control.c

@@ -1719,15 +1719,14 @@ void ResetInit(void)
                    rt_thread_delay(1000);
                    rt_thread_delay(1000);
                }
                }
            }
            }
-
-
+           #if LAMP_EN == 0
            //排虫
            //排虫
            if(device_status.handle_bugger==0){
            if(device_status.handle_bugger==0){
                device_status.run_sta = 111;     //排虫
                device_status.run_sta = 111;     //排虫
            }else{
            }else{
                device_status.run_sta = 112;     //收虫
                device_status.run_sta = 112;     //收虫
            }
            }
-
+            #endif
     }
     }
     else {
     else {
         if(device_status.power_status==1)
         if(device_status.power_status==1)

+ 1 - 1
Application_CBD/applications/control.h

@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
-    #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
+    #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
 #else
     #define VERSION_HK          "1.55.41(HK)"            //4.0海康-1200W
     #define VERSION_HK          "1.55.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.54.40(2000W)"         //4.0水稻
     #define VERSION_HK_2000W    "1.54.40(2000W)"         //4.0水稻