zhunk 4 месяцев назад
Родитель
Сommit
f0db85fdf7

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -21,7 +21,7 @@
 #define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        0             //推杆电机结构模块化控制
+#define TG_MODULE        1             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
 #define WENKONG          1             //温控功能1-开启 0-关闭

+ 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 "20250421"
+#define BL_VERSION RT_FOTA_SW_VERSION
+#define COMPILE "20260714"
 
 #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 - 0
CBD_FOTA_BootLoader/readme.md

@@ -1,3 +1,8 @@
+# 版本说明 20260714
+	#define BL_VERSION "1.2.5"
+	#define COMPILE "20260714"
+	1. easyflash分区大小调整;
+	2. 打印版本;
 # 版本说明
 #define BL_VERSION "1.1.5"
 #define COMPILE "20250421"