zhunk 1 tahun lalu
induk
melakukan
ff32239dcc

TEMPAT SAMPAH
Application_cbd_apm32f1/.settings/.rtmenus


+ 2 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 6 - 16
Application_cbd_apm32f1/applications/hmi.c

@@ -1862,26 +1862,22 @@ void Check_ParamConfig(void)
         ctr_router(OFF);
         ctr_router(OFF);
 #endif
 #endif
         Hmi_Fresh();
         Hmi_Fresh();
-        if(device_status.dtype!=7)
-        {
-            Control_clear();
-            Control_Check();    //自检
-        }
+
+        Control_clear();
+        Control_Check();    //自检
+
         dtu_data_play();
         dtu_data_play();
         sht30_collect();
         sht30_collect();
 #if SENSOR_EN==1
 #if SENSOR_EN==1
         mb_master_samlpe();
         mb_master_samlpe();
 #endif
 #endif
-        thread_485_play();
-#if ROBOT_EN == 0
+
         uint16_t connect_num=0;
         uint16_t connect_num=0;
         //等待联网,
         //等待联网,
         while(atoi(device_status.net)==1)
         while(atoi(device_status.net)==1)
         {
         {
             if(Read_Real_Voltage()/100>5&&device_status.power_status==0)
             if(Read_Real_Voltage()/100>5&&device_status.power_status==0)
                 ctr_RTU_DTU(ON);
                 ctr_RTU_DTU(ON);
-            if(device_status.dtype==7)
-                HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();
             char *readinfo =  makeJson_ReadInfo();
             DTU_Write("%s",readinfo);
             DTU_Write("%s",readinfo);
             rt_free(readinfo);
             rt_free(readinfo);
@@ -1901,7 +1897,7 @@ void Check_ParamConfig(void)
                 break;
                 break;
             }
             }
             #else
             #else
-            if(connect_num==10) //180
+            if(connect_num==180) //180
             {
             {
                 device_status.timeSwitch = 0;
                 device_status.timeSwitch = 0;
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
@@ -1924,17 +1920,11 @@ void Check_ParamConfig(void)
             if(connect_num>5) break;
             if(connect_num>5) break;
         }
         }
 
 
-        if(device_status.version_type==6) device_status.timeSwitch = 1; //吸虫塔,只有时控
-
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
         rt_thread_delay(1000);
         dtu_send_data_start();
         dtu_send_data_start();
         Workstatus_check();
         Workstatus_check();
         Work_Loop_Task();
         Work_Loop_Task();
-#if MATCH_DEVICE == 1
-        //device_status.selfcheck_ws = 3;
-#endif
-#endif
     }
     }
 }
 }
 void ResetParamDefault(void)
 void ResetParamDefault(void)