zhunk 1 год назад
Родитель
Сommit
95ff804d96

+ 1 - 1
Application_cbd_apm32f1/.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="-436559387563516312" 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="-406456977695124745" 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_apm32f1/applications/control.h

@@ -21,7 +21,7 @@
 
 #define LAMP_CURRENT    400
 
-#define VERSION_V5          "2.0.5(HK)"             //5.0
+#define VERSION_V5          "2.1.5(HK)"             //5.0
 
 extern rt_event_t event_485_play;
 

+ 0 - 17
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -399,23 +399,6 @@ static void syswatch_thread_entry(void *parameter)
             rt_hw_cpu_reset();
             #endif
         }
-        if(((alarm_new.tm_hour)==22 ||
-                (alarm_new.tm_hour)==0 ||
-                (alarm_new.tm_hour)==1 ||
-                (alarm_new.tm_hour)==2 ||
-                (alarm_new.tm_hour)==3 ||
-                (alarm_new.tm_hour)==4||
-                (alarm_new.tm_hour)==5||
-                (alarm_new.tm_hour)==6||
-                (alarm_new.tm_hour)==7)&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
-        {
-            ctr_router(ON);
-        }
-
-        if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
-        {
-            ctr_router(OFF);
-        }
         #endif
         rt_thread_delay(RT_TICK_PER_SECOND);
         syswatch_wdt_feed();