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

BIN
Application_CBD/.settings/.rtmenus


BIN
Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o


+ 3 - 3
Application_CBD/applications/control.h

@@ -13,10 +13,10 @@
 #include <board.h>
 
 #include <rtdevice.h>
-#define VERSION_HK "1.10.41(HK)"         //版本
-#define VERSION_ZP "1.10.1(ZP)"         //版本
+#define VERSION_HK "1.11.41(HK)"         //版本
+#define VERSION_ZP "1.11.1(ZP)"         //版本
 
-#define CompileTime "20210414"
+#define CompileTime "20210426"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/

+ 2 - 2
Application_CBD/applications/dtu_uart2.c

@@ -160,8 +160,8 @@ static void dtu_thread_entry_recv(void *parameter)
 static void dtu_thread_entry_send(void *parameter)
 {
 
-    static uint8_t dev_sta = 1;//开机置1
     static uint8_t power_sta = 1;//开机置1
+    static uint8_t dev_sta = 1;//开机置1
     rt_thread_delay(10000);  //20S等待联网
     if(atoi(device_status.net)==1) num_updata = 0;
     while(1)
@@ -174,7 +174,7 @@ static void dtu_thread_entry_send(void *parameter)
                     {
                         HMI_WRITE("sleep=%d",1);
                     }
-                    if(Read_Real_Voltage()/100<10&&power_sta==1)
+                    if(Read_Real_Voltage()/100<12&&power_sta==1)
                     {
                         rt_thread_delay(500);
                         static char warn_power[20];

+ 1 - 0
Application_CBD/applications/sht30_collect.c

@@ -168,6 +168,7 @@ static void Power_ReadCheck(void *parameter)
             device_status.bat_status = 1; //欠压
         }
         else {
+            //power_sta = 1;
             device_status.bat_status = 0; //解除欠压
             ctr_router(ON);               //打开路由器供电
             ctr_photo(ON);                //打开相机供电