yf_zjb 3 лет назад
Родитель
Сommit
ca2b1be964

+ 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>

+ 1 - 14
Application_CBD/applications/control.c

@@ -1209,19 +1209,6 @@ void ctr_router(uint8_t status_router)
         #endif
     }
 }
-//DTU_RTU供电
-void ctr_DTU_Power(uint8_t DTU_Power)
-{
-    rt_pin_mode(RTU_DTU, PIN_MODE_OUTPUT);
-
-    if(DTU_Power==ON)
-    {
-        rt_pin_write(ROUTER,ON);
-    }
-    else {
-        rt_pin_write(ROUTER,OFF);
-    }
-}
 //清扫-推杆电机
 void ctr_TG_Clear(uint16_t clear_timeout)
 {
@@ -1285,7 +1272,7 @@ void ctr_RTU_DTU(uint8_t status_rtu)
     }
     else
     {
-        rt_kprintf("RTU电源复位!!!\n");
+        LOG_W("RTU电源复位!!!");
         rt_pin_write(RTU_DTU,OFF);
     }
 }

+ 0 - 1
Application_CBD/applications/control.h

@@ -281,7 +281,6 @@ void Hk_Take_io(void);                          //触发拍照
 void HK_TakePhoto(void);                        //拍照
 void ctr_photo(uint8_t status_photo);
 void ctr_RTU_DTU(uint8_t status_rtu);
-void ctr_DTU_Power(uint8_t DTU_Power);
 void HardWare_Init(uint8_t boot);               //初始化
 void HardWare_Check(uint8_t boot);              //自检
 void ResetInit(void);                           //上电复位

+ 4 - 4
Application_CBD/applications/dtu_uart2.c

@@ -170,9 +170,9 @@ static void dtu_thread_entry_recv(void *parameter)
                     rx_err ++;
                     if (rx_err < 54000)
                     {
-                        ctr_DTU_Power(ON);
+                        ctr_RTU_DTU(ON);
                         ctr_photo(ON);
-                        ctr_DTU_Power(ON);
+                        ctr_RTU_DTU(ON);
                     }
                     else if(rx_err==54000)//90分钟未接收到数据
                     {
@@ -182,7 +182,7 @@ static void dtu_thread_entry_recv(void *parameter)
                             ctr_photo(OFF);
                         }
                         else {
-                            ctr_DTU_Power(OFF);
+                            ctr_RTU_DTU(OFF);
                         }
                     }
                     else if (rx_err==54100)
@@ -229,7 +229,7 @@ static void dtu_thread_entry_send(void *parameter)
                     else {
                         //打开路由器和RTU供电
                         ctr_router(ON);
-                        ctr_DTU_Power(ON);
+                        ctr_RTU_DTU(ON);
                     }
                 }
                 else {

+ 5 - 5
Application_CBD/applications/hmi.c

@@ -1776,10 +1776,10 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         ctr_router(ON);
         Hmi_Fresh();
-        #if Color_EN == 1
-        Control_clear();
-        Control_heat();
-        #endif
+         #if Color_EN == 1
+         Control_clear();
+         Control_heat();
+         #endif
         if(device_status.dtype!=7)
         {
             Control_clear();
@@ -1795,7 +1795,7 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
-
+            ctr_RTU_DTU(ON);
             if(device_status.dtype==7)
             HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();

+ 1 - 1
Application_CBD/applications/main.c

@@ -42,7 +42,7 @@ static void idle_hook(void);
 /********************************************************************/
 int main(void)
 {
-    ctr_DTU_Power(ON);
+
     CompileTime;      //读取固件的编译时间
     /* 初始化设备 */
     rt_device_init(wdg_dev);