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

+ 3 - 2
Application_CBD/applications/control.h

@@ -18,15 +18,16 @@
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
 #define Color_EN         0              //定制色诱
-#define BZYV2_EN         0              //孢子仪2.0
+
 #define BOOT_ERR         1              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
+#define DZ_250723        1              //触发雨控后隔天再解除
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
     #define VERSION_HK          "1.56.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "1.55.40(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "1.56dz.40(2000W)"         //4.0水稻
 #endif
 
 #define VERSION_ZP          "1.47.1(ZP)"            //1.0转盘

+ 1 - 1
Application_CBD/applications/main.c

@@ -111,7 +111,7 @@ static int wdt_init(void)
 /*空闲钩子函数*/
 static void idle_hook(void)
 {
-    #if 0
+    #if 1
     #if Color_EN == 0
     time_t now;
     time(&now);

+ 2 - 0
Application_CBD/applications/sht30_collect.c

@@ -301,7 +301,9 @@ static void Power_ReadCheck(void *parameter)
                 if(rain_cnt==600&&Read_Rain_Voltage()<250)
                 {
                     rain_cnt = 0;
+                    #if DZ_250723 == 1
                     device_status.rain_status = 0;
+                    #endif
                 }
             }
             LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());

+ 3 - 0
Application_CBD/readme.md

@@ -1,3 +1,6 @@
+# 2025-07-23 更新说明
+	1. 定制:水稻版本更新1.56dz.40(2000W)
+	2. 8:20后触发雨控当天不再解除隔天解除;
 # 2025-05-19 更新说明
 #define VERSION_HK          "1.56.41(HK)"            //4.0海康-1200W
 #define VERSION_HK_2000W    "1.55.40(2000W)"         //4.0水稻