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

+ 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 - 0
Application_cbd_apm32f1/applications/control.h

@@ -22,6 +22,7 @@
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define TG_MODULE        0             //推杆电机结构模块化控制
+#define DINGZHI_0722     0             //控制一个电机每天12点工作12秒
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
 #else

+ 2 - 0
Application_cbd_apm32f1/applications/main.c

@@ -32,7 +32,9 @@ int main(void)
     led_set_level(1,0);
     clock_information();
     Beep_Tip(100);
+    #if DINGZHI_0722 == 0
     Check_ParamConfig();
+    #endif
     //打印内存占用
     memtrace(0, NULL);
     while(1)

+ 1 - 1
Application_cbd_apm32f1/drivers/board.h

@@ -88,7 +88,7 @@ extern "C"
 
 #define BSP_USING_UART5         //485
 #define BSP_UART5_TX_PIN       "PC12"
-#define BSP_UART5_RX_PIN       "PC2"
+#define BSP_UART5_RX_PIN       "PD2"
 #define BSP_UART5_RX_BUFSIZE   128
 #define BSP_UART5_TX_BUFSIZE   128
 

+ 11 - 3
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -389,16 +389,25 @@ static void syswatch_thread_entry(void *parameter)
     
     while(1)
     {
-        #if 1
         time_t now;
         time(&now);
         alarm_new =*localtime(&now);
         if((alarm_new.tm_hour)==12&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
         {
-            #if ROBOT_EN == 0
+            #if ROBOT_EN == 0 && DINGZHI_0722 == 0
             rt_hw_cpu_reset();
             #endif
+            #if DINGZHI_0722 == 1
+            ctr_cangmen_up(OPEN);
+            #endif
+        }
+#if DINGZHI_0722 == 1
+        if((alarm_new.tm_hour)==12&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==12))
+        {
+            ctr_cangmen_up(OFF);
         }
+#endif
+        #if MATCH_DEVICE == 1
         if(((alarm_new.tm_hour)==22 ||
                 (alarm_new.tm_hour)==0 ||
                 (alarm_new.tm_hour)==1 ||
@@ -411,7 +420,6 @@ static void syswatch_thread_entry(void *parameter)
         {
             ctr_router(ON);
         }
-
         if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
         {
             ctr_router(OFF);