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

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -20,7 +20,7 @@
 #define ROBOT_EN         0            //定时重启:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION  "3.10.6"
+#define VERSION  "3.11.6"
 
 extern rt_event_t event_485_play;
 

+ 3 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -807,13 +807,16 @@ char * makeJson()
         if(device_status.all_ycct>=10){
             device_status.all_ycct = device_status.all_ycct / 10;
         }
+#if 0
         if(device_status.all_ycct==0&&device_status.gaoya_count!=0)
         {
             if(device_status.gaoya_count>=10) device_status.gaoya_count = device_status.gaoya_count/10;
             device_status.all_ycct = device_status.gaoya_count;
             device_status.gaoya_count = 0;
         }
+#endif
     }
+
     rt_sprintf(utos, "%d",device_status.all_ycct);
     cJSON_AddStringToObject(pSubJson,"volt_ct",utos);
 

+ 1 - 1
Application_cbd_apm32f1/packages/EasyFlash-v4.1.0/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 */
+#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
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,8 @@
+# 2026-07-13 更新说明
+	#版本:3.11.6
+	1、光栅不计数问题,被灰遮挡  出现频繁计数/不计数问题,现场清理即可;
+	2、取消高压计数上报;
+	3、#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 256)
 # 2026-07-06 更新说明
 	#版本:3.10.6
 	1、限制高压计数值,除以10

+ 2 - 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 "20260713"
 
 #define RTU_DTU GET_PIN(B,13)
 #define Beep    GET_PIN(B, 4)

+ 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 @@
+# 版本说明 20260713
+	#define BL_VERSION "1.2.5"
+	#define COMPILE "20260713"
+	1、调整easyflash env大小为4096*256
+	2、打印版本号;
 # 版本说明
 #define BL_VERSION "1.1.5"
 #define COMPILE "20250421"