zhunk 4 months atrás
parent
commit
be6dc86be3

+ 4 - 4
Application_CBD/applications/control.h

@@ -29,13 +29,13 @@
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
 #if DZ_260630_1 == 0
-     #define VERSION_HK          "1.68.41(HK)"            //4.0海康-1200W
+     #define VERSION_HK          "1.69.41(HK)"            //4.0海康-1200W
 #else
     #define VERSION_HK          "1.68.41(HK-DZ260630_1)"  //4.0海康-1200W
 #endif
 #if DZ_260623_2 == 0
 #if DZ_260630_1 == 0
-    #define VERSION_HK_2000W    "1.68.40(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "1.69.40(2000W)"         //4.0水稻
 #else
     #define VERSION_HK_2000W    "1.68.40(2000W-DZ260630_1)"         //4.0水稻
 #endif
@@ -44,12 +44,12 @@
 #endif
 #endif
 #if DZ_260519 == 0
-#define VERSION_ZP          "1.68.1(ZP)"                //1.0转盘
+#define VERSION_ZP          "1.69.1(ZP)"                //1.0转盘
 #else
 #define VERSION_ZP          "DZ_260519"                 //1.0转盘
 #endif
 
-#define VERSION_GK          "1.68.1(GK)"                //1.0高空
+#define VERSION_GK          "1.69.1(GK)"                //1.0高空
 
 #define VERSION_XCT         "1.13.6(HK)"                //吸虫塔-海康
 #define VERSION_Robot       "1.0(robot)"                //展厅机器人

+ 2 - 0
Application_CBD/applications/dtu_uart2.c

@@ -235,6 +235,8 @@ static void dtu_thread_entry_send(void *parameter)
                             HMI_WRITE("sleep=%d",1);    //屏幕休眠
                             DTU_Write("%s",makeJson_Warn("power down","power"));
                             device_status.power_status = 0;
+                            rt_thread_delay(1000);
+                            UpLoad_Data();
                             rt_thread_delay(5000);
                             ctr_router(OFF);
                             RTU_Power_Off_Safe();

+ 2 - 0
Application_CBD/applications/sht30_collect.c

@@ -189,6 +189,7 @@ static void adc_collect_thread_entry(void *parameter)
                 checkrain_unlock = 0;
                 handle_rain = 1;
                 prework_state = 0;
+                ctr_Cold(ON);   //20260713
             }
         }
         else {
@@ -198,6 +199,7 @@ static void adc_collect_thread_entry(void *parameter)
             {
                 checkrain_unlock = 0;
                 device_status.rain_status = 0;
+                ctr_Cold(OFF);      //20260713
 #if DZ_260623_2 == 1
                 if(prework_state == 0&& handle_rain == 1)
                 {

+ 1 - 1
Application_CBD/packages/EasyFlash-latest/inc/ef_cfg.h

@@ -92,7 +92,7 @@
 #define EF_START_ADDR             PKG_EASYFLASH_START_ADDR
 
 /* ENV area size. It's at least one empty sector for GC. So it's definition must more then or equal 2 flash sector size. */
-#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 16) /* default is the double erase min size 2024-07-10 2 to 16*/
+#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 256) /* default is the double erase min size 2024-07-10 2 to 16*/
 
 /* print debug information of flash */
 #ifdef PKG_EASYFLASH_DEBUG

+ 8 - 0
Application_CBD/readme.md

@@ -1,3 +1,11 @@
+# 2026-07-13 更新说明
+	#define VERSION_HK          "1.69.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.69.40(2000W)"         //4.0水稻
+	#define VERSION_ZP          "1.69.1(ZP)"            //1.0转盘
+	#define VERSION_GK          "1.69.1(GK)"            //1.0高空
+	1、触发雨控打开制冷,解除雨控关闭制冷接口;
+	2、调整easyflash分区大小为4096*256;
+	3、检测到外部断电立即上报最新数据;
 # 2026-06-12 更新说明
 	1、为保证每小时上传4张照片,
 # 2026-06-06 更新说明

+ 3 - 2
CBD_FOTA_BootLoader/applications/main.c

@@ -33,8 +33,8 @@
 #include "sys_config.h"
 #include <easyflash.h>
 
-#define BL_VERSION "1.1.5"
-#define COMPILE "20250428"
+#define BL_VERSION RT_FOTA_SW_VERSION
+#define COMPILE "20260713"
 
 #define RTU_DTU GET_PIN(B,13)
 #define Beep    GET_PIN(B, 4)
@@ -354,6 +354,7 @@ int main(void)
 #endif
     extern void rt_fota_init(void);
     easyflash_init();
+    rt_fota_print_log();
     rt_fota_init();
     HMI_Thread();
     Beep_Tip(100);

+ 1 - 1
CBD_FOTA_BootLoader/applications/sys_config.h

@@ -5,7 +5,7 @@
 
 
 /* RT-FOTA module define */
-#define RT_FOTA_SW_VERSION      "1.0.0"
+#define RT_FOTA_SW_VERSION      "1.2.5"
 
 /* Enable Ymodem OTA */
 #define PKG_USING_YMODEM_OTA

+ 1 - 1
CBD_FOTA_BootLoader/packages/EasyFlash-latest/inc/ef_cfg.h

@@ -92,7 +92,7 @@
 #define EF_START_ADDR             PKG_EASYFLASH_START_ADDR
 
 /* ENV area size. It's at least one empty sector for GC. So it's definition must more then or equal 2 flash sector size. */
-#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 2) /* default is the double erase min size */
+#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 256) /* default is the double erase min size */
 
 /* print debug information of flash */
 #ifdef PKG_EASYFLASH_DEBUG

+ 5 - 2
CBD_FOTA_BootLoader/readme.md

@@ -1,5 +1,8 @@
-
-
+# 版本说明 2026-07-13
+	#define BL_VERSION "1.2.5"
+	#define COMPILE "20260713"
+	1、增大easyflash env分区大小为4096*256
+	2、增加版本号打印
 
 # 版本说明
 #define BL_VERSION "1.1.5"