zhunk 3 semanas atrás
pai
commit
da5723215b

Diferenças do arquivo suprimidas por serem muito extensas
+ 73 - 815
CBD_FOTA_BootLoader/.config


Diferenças do arquivo suprimidas por serem muito extensas
+ 74 - 816
CBD_FOTA_BootLoader/.config.old


Diferenças do arquivo suprimidas por serem muito extensas
+ 239 - 239
CBD_FOTA_BootLoader/.cproject


BIN
CBD_FOTA_BootLoader/.settings/.rtmenus


+ 2 - 2
CBD_FOTA_BootLoader/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Wed Feb 12 12:00:09 CST 2025
+#Sat Aug 08 14:28:32 CST 2020
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None
@@ -17,6 +17,6 @@ tool_chain=gcc
 uart_name=uart1
 tx_pin_name=PA9
 rtt_nano_path=
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+output_project_path=D\:/RT-ThreadStudio/workspace
 hardware_adapter=ST-LINK
 project_name=CBD_FOTA_BootLoader

+ 1 - 6
CBD_FOTA_BootLoader/Kconfig

@@ -15,11 +15,6 @@ config PKGS_DIR
     option env="PKGS_ROOT"
     default "packages"
 
-config PLATFORM_DIR
-    string
-    option env="PLATFORM_DIR"
-    default "D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/platform"
-
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
 source "$PKGS_DIR/packages/misc/samples/Kconfig"
@@ -29,4 +24,4 @@ config RT_STUDIO_BUILT_IN
     select ARCH_ARM_CORTEX_M3
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
-    default y
+    default y

+ 76 - 117
CBD_FOTA_BootLoader/applications/main.c

@@ -33,8 +33,8 @@
 #include "sys_config.h"
 #include <easyflash.h>
 
-#define BL_VERSION "1.1.4"
-#define COMPILE "20230901"
+#define BL_VERSION RT_FOTA_SW_VERSION
+#define COMPILE "20261013"
 
 #define RTU_DTU GET_PIN(B,13)
 #define Beep    GET_PIN(B, 4)
@@ -157,84 +157,53 @@ void HMI_WRITE(char *fmt, ...)
 }
 static void HMI_Decode(char *cmd,uint8_t cmd_len)
 {
-    //擦除APP分区,将df_area分区固件搬运至app分区
+    //擦除APP分区并从df_area备份恢复固件(v1.3.0:校验 magic/CRC 后恢复,保留备份)
     if(strstr(rx_buffer,"resetapp")!=NULL)
     {
         rt_kprintf("固件恢复!!!\n");
         HMI_WRITE("固件恢复!!!");
-        const char *dst_part_name = "app";
-        const char *src_part_name = "df_area";
-        const struct fal_partition *dst_part;
-        const struct fal_partition *src_part;
-        dst_part = fal_partition_find(dst_part_name);
-        src_part = fal_partition_find(src_part_name);
-        if (dst_part == RT_NULL || src_part == RT_NULL)
+        if (rt_fota_restore_app_from_df(0) != RT_FOTA_NO_ERR)
         {
-            if (dst_part == RT_NULL)
-            rt_kprintf("%s partition is not exist!\n", dst_part_name);
-            if (src_part == RT_NULL)
-            rt_kprintf("%s partition is not exist!\n", src_part_name);
+            rt_kprintf("resetapp: no valid backup or restore failed!\n");
+            HMI_WRITE("恢复失败:无有效备份!");
         }
         else
         {
-                        rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
-                        HMI_WRITE("Clone %s partition to %s partition:", src_part_name, dst_part_name);
-                        if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
-                        {
-                            int clone_pos = 0;
-                            int clone_len = 0, clone_tol_len;
-                            static int clone_num;
-                            rt_uint8_t *buf = rt_malloc(4096);
-
-                            if (dst_part->len < src_part->len)
-                                clone_tol_len = dst_part->len;
-                            else
-                                clone_tol_len = src_part->len;
-
-                            while ((clone_pos < clone_tol_len) && (buf != RT_NULL))
-                            {
-                                clone_len = fal_partition_read(src_part, clone_pos, buf, 4096);
-                                if (clone_len < 0)
-                                {
-                                    rt_kprintf("\nread %s partition failed, clone stop!\n", src_part_name);
-                                    break;
-                                }
-
-                                if (fal_partition_write(dst_part, clone_pos, buf, clone_len) < 0)
-                                {
-                                    rt_kprintf("\nwrite %s partition failed, clone stop!\n", dst_part_name);
-                                    break;
-                                }
-
-
-                                clone_pos += clone_len;
-                                clone_num++;
-                                HMI_WRITE("debug.update.val=%d",clone_num);
-                                if(clone_num==99) clone_num = 0;
-                            }
-
-                            if (clone_pos >= clone_tol_len)
-                            {
-                                HMI_WRITE("Clone partition success, total %d bytes!", clone_tol_len);
-                                rt_kprintf("\nClone partition success, total %d bytes!\n", clone_tol_len);
-                                HMI_WRITE("debug.update.val=100");
-                                HMI_WRITE("debug.update.val=100");
-                                HMI_WRITE("debug.update.val=100");
-                            }
-                            else
-                            {
-                                HMI_WRITE("Clone partition failed!");
-                                rt_kprintf("Clone partition failed!");
-                            }
-                            if (buf)
-                                rt_free(buf);
-                        }
+            rt_kprintf("resetapp done.\n");
+            HMI_WRITE("固件恢复完成!");
         }
     }
-    //备份app分区至df_area分区
+    //备份app分区至df_area分区(v1.3.0)
     else if(strstr(rx_buffer, "backupapp")!=NULL)
     {
-
+        rt_kprintf("backupapp: backup app partition to df_area...\n");
+        HMI_WRITE("备份固件...");
+        if (rt_fota_backup_app_to_df() != RT_FOTA_NO_ERR)
+        {
+            rt_kprintf("backupapp failed!\n");
+            HMI_WRITE("备份失败!");
+        }
+        else
+        {
+            rt_kprintf("backupapp done.\n");
+            HMI_WRITE("固件备份完成!");
+        }
+    }
+    //从df_area备份恢复app分区(v1.3.0 调试命令,保留备份方便重复执行)
+    else if(strstr(rx_buffer, "dbg_restore")!=NULL)
+    {
+        rt_kprintf("dbg_restore: restore app partition from df_area backup...\n");
+        HMI_WRITE("恢复固件...");
+        if (rt_fota_restore_app_from_df(0) != RT_FOTA_NO_ERR)
+        {
+            rt_kprintf("dbg_restore: no valid backup or restore failed!\n");
+            HMI_WRITE("恢复失败:无有效备份!");
+        }
+        else
+        {
+            rt_kprintf("dbg_restore done.\n");
+            HMI_WRITE("固件恢复完成!");
+        }
     }
     //启动程序
     else if(strstr(rx_buffer, "startup")!=NULL)
@@ -253,11 +222,20 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //擦除app分区
     else if (strstr(rx_buffer, "eraseapp")!=NULL) {
-        struct fal_partition fal_erase;
-        fal_erase.offset=204800;
-        rt_sprintf(fal_erase.name, "%s","app");
-        rt_sprintf(fal_erase.flash_name, "%s","onchip_flash");
-        fal_partition_erase(&fal_erase,0,319488);
+        const struct fal_partition *fal_erase;
+        fal_erase = fal_partition_find("app");
+        if (fal_erase != RT_NULL)
+        {
+            rt_kprintf("eraseapp: erase %s partition(%d bytes)...\n", fal_erase->name, fal_erase->len);
+            if (fal_partition_erase(fal_erase, 0, fal_erase->len) < 0)
+                rt_kprintf("eraseapp failed!\n");
+            else
+                rt_kprintf("eraseapp done.\n");
+        }
+        else
+        {
+            rt_kprintf("eraseapp: 'app' partition is not exist!\n");
+        }
     }
     //擦除easyflash
     else if(strstr(rx_buffer, "eraseeasyflash")!=NULL){
@@ -268,11 +246,20 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("easyflash擦除成功!");
     }
     else if(strstr(rx_buffer, "erasedf_area")!=NULL){
-        struct fal_partition fal_erase;
-        fal_erase.offset=15729152;
-        rt_sprintf(fal_erase.name, "%s","df_area");
-        rt_sprintf(fal_erase.flash_name, "%s","w25q16m");
-        fal_partition_erase(&fal_erase,0,524288);
+        const struct fal_partition *fal_erase;
+        fal_erase = fal_partition_find("df_area");
+        if (fal_erase != RT_NULL)
+        {
+            rt_kprintf("erasedf_area: erase %s partition(%d bytes)...\n", fal_erase->name, fal_erase->len);
+            if (fal_partition_erase(fal_erase, 0, fal_erase->len) < 0)
+                rt_kprintf("erasedf_area failed!\n");
+            else
+                rt_kprintf("erasedf_area done.\n");
+        }
+        else
+        {
+            rt_kprintf("erasedf_area: 'df_area' partition is not exist!\n");
+        }
     }
 }
 /*HMI*/
@@ -325,7 +312,17 @@ static void Hmi_thread_entry(void *parameter)
         result = rt_mq_recv(&rx_mq, &msg, sizeof(msg), 1000);
         if (result == RT_EOK)
         {
+                /* 防止越界:msg.size 为环形缓冲区累计未读长度,可能超过 rx_buffer 容量 */
+                if (msg.size > sizeof(rx_buffer) - 1)
+                {
+                    LOG_W("HMI rx data truncated: %d > %d", (int)msg.size, (int)(sizeof(rx_buffer) - 1));
+                    msg.size = sizeof(rx_buffer) - 1;
+                }
                 rx_length = rt_device_read(msg.dev, 0, rx_buffer, msg.size);
+                if (rx_length > sizeof(rx_buffer) - 1)
+                {
+                    rx_length = sizeof(rx_buffer) - 1;
+                }
                 rx_buffer[rx_length] = '\0';
                 LOG_I("%s\n",rx_buffer);
                 HMI_Decode(rx_buffer,rx_length);
@@ -346,43 +343,6 @@ static void Hmi_thread_entry(void *parameter)
         //rt_kprintf("workSta.vbat.txt=%c%d.%02d%c\n",hmi_str,voltage/100,voltage%100,hmi_str);
     }
 }
-
-/* 获取STM32F401的复位原因 */
-static void print_reset_reason(void)
-{
-    uint32_t rst_status = RCC->CSR;
-    bool is_iwdg = false;
-
-    rt_kprintf("\n========== Reset Reason ==========\n");
-
-    if (rst_status & RCC_CSR_LPWRRSTF)
-        rt_kprintf("❌ Low Power reset\n");
-
-    if (rst_status & RCC_CSR_WWDGRSTF)
-        rt_kprintf("❌ Window Watchdog reset\n");
-
-    if (rst_status & RCC_CSR_IWDGRSTF)
-    {
-        rt_kprintf("❌ Independent Watchdog reset\n");
-        is_iwdg = true;
-    }
-
-    if (rst_status & RCC_CSR_SFTRSTF)
-        rt_kprintf("✅ Software reset\n");
-
-    if (rst_status & RCC_CSR_PORRSTF)
-        rt_kprintf("✅ Power-on reset\n");
-
-    if (rst_status & RCC_CSR_PINRSTF)
-        rt_kprintf("✅ NRST pin reset\n");
-
-    rt_kprintf("RCC_CSR: 0x%08X\n", rst_status);
-    rt_kprintf("==================================\n");
-
-    /* 清除复位标志(重要!)*/
-    RCC->CSR |= RCC_CSR_RMVF;
-}
-
 int main(void)
 {
 
@@ -390,9 +350,8 @@ int main(void)
     finsh_set_prompt("rt-fota />");
 #endif
     extern void rt_fota_init(void);
-    rt_fota_print_log();
     easyflash_init();
-    print_reset_reason();
+    rt_fota_print_log();
     rt_fota_init();
     HMI_Thread();
     Beep_Tip(100);

Diferenças do arquivo suprimidas por serem muito extensas
+ 1344 - 1102
CBD_FOTA_BootLoader/applications/rt_fota.c


+ 4 - 0
CBD_FOTA_BootLoader/applications/rt_fota.h

@@ -51,3 +51,7 @@ typedef enum {
 
 #endif /* _RT_FOTA_H_ */
 int rt_fota_start_application(void);
+
+/* v1.3.0 升级回滚接口(main.c 的 uart4 屏幕命令 backupapp / dbg_restore / resetapp 亦使用) */
+int rt_fota_backup_app_to_df(void);
+int rt_fota_restore_app_from_df(int consume_backup);

+ 1 - 1
CBD_FOTA_BootLoader/applications/sys_config.h

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

+ 1 - 1
CBD_FOTA_BootLoader/drivers/board.h

@@ -36,7 +36,7 @@ extern "C"
 #define ROM_END                ((uint32_t)(ROM_START + ROM_SIZE * 1024))
 
 #define RAM_START              (0x20000000)
-#define RAM_SIZE               (128)
+#define RAM_SIZE               (64)
 #define RAM_END                (RAM_START + RAM_SIZE * 1024)
 
 /*-------------------------- ROM/RAM CONFIG END --------------------------*/

+ 41 - 13
CBD_FOTA_BootLoader/drivers/drv_flash_f1.c

@@ -136,13 +136,19 @@ int stm32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
  *
  * @return result
  */
+/* 擦除分块(页数):APM32 要求在 flash 操作期间关闭中断,但大分区整片擦除
+ * 若全程关中断会使 IWDG 无法喂狗(312KB 最坏 >10s)——按此粒度分块,
+ * 每块内关中断完成"解锁→擦除→上锁",块间开中断让喂狗/调度正常工作 */
+#define FLASH_ERASE_CHUNK_PAGES      16
+
 int stm32_flash_erase_bank(uint32_t bank, rt_uint32_t addr, size_t size)
 {
     rt_err_t result = RT_EOK;
-    uint32_t PAGEError = 0;
+    uint32_t page_addr;
 
     /*Variable used for Erase procedure*/
     FLASH_EraseInitTypeDef EraseInitStruct;
+    uint32_t PAGEError = 0;
 
     if ((addr + size) > STM32_FLASH_END_ADDRESS)
     {
@@ -150,23 +156,45 @@ int stm32_flash_erase_bank(uint32_t bank, rt_uint32_t addr, size_t size)
         return -RT_EINVAL;
     }
 
-    HAL_FLASH_Unlock();
+    page_addr = GetPage(addr);
 
-    /* Fill EraseInit structure*/
-    EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-    EraseInitStruct.PageAddress = GetPage(addr);
-    EraseInitStruct.NbPages     = (size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE;
-    EraseInitStruct.Banks       = bank;
-    
-    if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
+    while (page_addr < (addr + size))
     {
-        result = -RT_ERROR;
-        goto __exit;
+        rt_uint32_t chunk_pages;
+
+        chunk_pages = (addr + size - page_addr + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE;
+        if (chunk_pages > FLASH_ERASE_CHUNK_PAGES)
+        {
+            chunk_pages = FLASH_ERASE_CHUNK_PAGES;
+        }
+
+        /* Fill EraseInit structure*/
+        EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+        EraseInitStruct.PageAddress = page_addr;
+        EraseInitStruct.NbPages     = chunk_pages;
+        EraseInitStruct.Banks       = bank;
+
+        /* APM32: 解锁前关闭中断,上锁后打开(与写路径一致) */
+        __disable_irq();
+        HAL_FLASH_Unlock();
+
+        if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
+        {
+            result = -RT_ERROR;
+        }
+
+        HAL_FLASH_Lock();
+        __enable_irq();
+
+        if (result != RT_EOK)
+        {
+            goto __exit;
+        }
+
+        page_addr += chunk_pages * FLASH_PAGE_SIZE;
     }
 
 __exit:
-    HAL_FLASH_Lock();
-
     if (result != RT_EOK)
     {
         return result;

+ 1 - 1
CBD_FOTA_BootLoader/drivers/fal_cfg.h

@@ -46,7 +46,7 @@ extern struct fal_flash_dev nor_flash0;
 {                                                                                    \
     {FAL_PART_MAGIC_WORD,        "bl",     "onchip_flash",                           0,                       200*1024,       0}, \
     {FAL_PART_MAGIC_WORD,        "app",     "onchip_flash",                          200*1024,                312*1024,       0}, \
-    {FAL_PART_MAGIC_WORD, "easyflash",     FAL_USING_NOR_FLASH_DEV_NAME,             0,                       1*1024*1024,   0}, \
+    {FAL_PART_MAGIC_WORD, "easyflash",     FAL_USING_NOR_FLASH_DEV_NAME,             0,                       3*1024*1024,   0}, \
     {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024,             512*1024,      0}, \
     {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024 + 512*1024,  512*1024,      0}, \
 }

+ 34 - 8
CBD_FOTA_BootLoader/packages/ota_downloader-latest/src/ymodem_ota.c

@@ -36,13 +36,29 @@ static const struct fal_partition * dl_part = RT_NULL;
 
 static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_size_t len)
 {
-    char *file_name, *file_size;
+    char *file_size;
+    rt_size_t name_len;
+    char *p, *end;
 
-    /* calculate and store file size */
-    file_name = (char *)&buf[0];
-    file_size = (char *)&buf[rt_strlen(file_name) + 1];
-    update_file_total_size = atol(file_size);
-    //rt_kprintf("Ymodem file_size:%d\n", update_file_total_size);
+    /* 在首包数据范围内定位文件名结束符并解析文件大小(限定 len,防非 NUL 结尾包越界读) */
+    name_len = 0;
+    while (name_len < len && buf[name_len] != 0)
+    {
+        name_len++;
+    }
+    if (name_len == 0 || name_len >= len)
+    {
+        LOG_E("Firmware download failed! Invalid file name in handshake packet!");
+        return RYM_CODE_CAN;
+    }
+    file_size = (char *)&buf[name_len + 1];
+
+    update_file_total_size = 0;
+    end = (char *)&buf[len];
+    for (p = file_size; p < end && *p >= '0' && *p <= '9'; p++)
+    {
+        update_file_total_size = update_file_total_size * 10 + (rt_size_t)(*p - '0');
+    }
 
     update_file_cur_size = 0;
 
@@ -53,9 +69,9 @@ static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_si
         return RYM_CODE_CAN;
     }
 
-    if (update_file_total_size > dl_part->len)
+    if (update_file_total_size == 0 || update_file_total_size > dl_part->len)
     {
-        LOG_E("Firmware is too large! File size (%d), '%s' partition size (%d)", update_file_total_size, recv_partition, dl_part->len);
+        LOG_E("Firmware size invalid or too large! File size (%d), '%s' partition size (%d)", update_file_total_size, recv_partition, dl_part->len);
         return RYM_CODE_CAN;
     }
 
@@ -72,6 +88,14 @@ static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_si
 
 static enum rym_code ymodem_on_data(struct rym_ctx *ctx, rt_uint8_t *buf, rt_size_t len)
 {
+    /* 已收满首包声明的文件长度后拒绝继续写入,防止超发数据写入未擦除区域;
+     * 末包含 0x1A 填充属正常,故只在“已满后”拦截 */
+    if (update_file_cur_size >= update_file_total_size)
+    {
+        LOG_E("Firmware download failed! Data overrun: %d >= %d", update_file_cur_size, update_file_total_size);
+        return RYM_CODE_CAN;
+    }
+
     /* write data of application to DL partition  */
     if (fal_partition_write(dl_part, update_file_cur_size, buf, len) < 0)
     {
@@ -116,6 +140,8 @@ void ymodem_ota(uint8_t argc, char **argv)
     if (!rym_recv_on_device(&rctx, rt_console_get_device(), RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
                             ymodem_on_begin, ymodem_on_data, NULL, RT_TICK_PER_SECOND))
     {
+        rt_console_set_device("uart1");
+        rt_thread_delay(rt_tick_from_millisecond(200));
         rt_kprintf("Download firmware to flash success.\n");
         rt_kprintf("System now will restart...\r\n");
 

+ 68 - 7
CBD_FOTA_BootLoader/readme.md

@@ -1,11 +1,72 @@
-# 版本说明 20260714
-	#define BL_VERSION "1.2.4"
-	1、修复flash读取慢引发的升级搬运固件过程复位,复位原因是看门狗复位;
-	2、easyflash分区调整;
-	3、看门狗超时时间由10S改为25S;
-	4、已经找到问题原因了,帮我修复flash读取慢导致固件搬运过程 flash读写阻塞cpu导致 不能及时喂狗引起看门狗重启,搬运前把app分区固件先备份到df_area,如果往app分区搬运过程中异常中断会导致启动失败这时从df_area分区恢复
-	5、使用rtc的bkp寄存器存放app是否正常启动的标志位,启动app失败会触发固件恢复上一个版本;
+# 版本说明 2026-10-13(第六次)
+	#define BL_VERSION "1.3.1"
+	#define COMPILE "20261013"
+	1、rt_fota.c:新增 msh 命令 dr2(uart1 控制台 shell),查看/设置 RTC_BKP_DR2 启动标志:
+	   dr2          查看当前值并标注含义(0 正常 / 0x5AA5 升级请求 / 0xDEAD 启动失败标记 / 其它未知;0xDEAD 与未知值在上电时将触发回滚尝试)
+	   dr2 0        清 0;手动进入 bootloader 维护后、重新上电前调用,避免残留非 0 值(如启动失败检测写入的 0xDEAD)
+	                在下次上电被误判为“APP 未正常启动”而误触发 app 回滚
+	   dr2 <val>    写入指定值(调试用):0xDEAD 验证启动失败回滚、0x5AA5 验证 ymodem 升级入口
+	2、全量重编 147 条命令 0 失败、新增代码 0 告警;text 167884 / bin 170016B(v1.3.0 基线 169420B)
+
+# 版本说明 2026-10-13(第五次)
+	#define BL_VERSION "1.3.0"
+	#define COMPILE "20261013"
+	1、rt_fota.c:升级回滚机制——升级搬运(fm_area→app)前自动备份当前 APP 固件到 df_area;
+	   备份格式:4KB 头(magic "FBK1" + 数据长度 + 数据 CRC32)+ APP 分区镜像;头最后写入,
+	   任一步骤掉电都不会残留半新半旧的"有效备份"
+	2、rt_fota.c:跳转 APP 前(向量表/栈校验通过后)写 RTC_BKP_DR2=0xDEAD"启动尝试"标记;
+	   APP 启动后(Application_CBD main 开头)清 0 表示启动成功
+	3、rt_fota.c:进入 bootloader 后检测 RTC_BKP_DR2——非 0(且非 0x5AA5 升级请求)说明 APP 未正常启动:
+	   标记 0xDEAD;若有有效备份则从 df_area 回滚 APP,并对齐 fm_area 版本(防同一升级包回滚后再次自动应用);
+	   自动回滚成功后消费备份(擦除备份头,防"恢复-崩溃"循环反复擦写 flash)
+	4、main.c:uart4 屏幕命令新增 dbg_restore(从 df_area 有效备份恢复 app,保留备份便于重复执行);
+	   填充 backupapp(手动备份 app→df_area);resetapp 改为同一"校验后恢复"路径
+	   (原裸搬运对带格式头的 df_area 会写坏 app;如需裸搬运可用 shell 的 fota clone)
+	5、注意:df_area 此后由本机制自动维护(带 4KB 备份头),原 rt_fota_thread_entry 中
+	   "df_area 作为默认固件分区(RBL)的启动失败兜底"路径不再生效(校验自然失败后跳过)
+	6、边界:无 VBAT 电池冷启动时 DR2 可能为随机非 0 值,将触发一次回滚尝试(有备份时);
+	   如需仅在明确 0xDEAD 时触发,可把 rt_fota_check_boot_state 的判定收紧
+	7、全量重编 147 条命令 0 失败、新增代码 0 告警;text 167288 / bin 169420B
+
+# 版本说明 2026-10-08(第四次)
+	#define BL_VERSION "1.2.9"
+	#define COMPILE "20261008"
+	1、ymodem_ota.c:Ymodem 下载完整性加固——首包文件名/大小解析限定在包长范围内(防非 NUL 结尾包与 atol 越界读),并拒绝 size=0;
+	   收满首包声明长度后拒绝继续写入数据(防超发数据写入未擦除区域造成静默损坏)
+	2、ymodem_ota.c:下载成功后先切回 uart1 再打印成功信息(既有改动,一并纳入本次发版)
+
+# 版本说明 2026-10-08(第三次)
+	#define BL_VERSION "1.2.8"
+	#define COMPILE "20261008"
+	1、rt_fota.c:跳转 APP 交接序列规范化——跳转前禁用并清除全部 NVIC 中断、清除 PendSV/SysTick 挂起、SCB->VTOR 指向 APP、恢复 PRIMASK 后再跳转(消除 APP 带屏蔽启动与残留中断隐患)
+	2、drv_flash_f1.c:擦除路径补齐“解锁前关中断”(APM32 要求,与写路径一致);大分区擦除按 16 页分块、块间开中断,保证 IWDG 喂狗不受影响
+	3、rt_fota.c:stop_in_bootloader 读取兼容字符串 "0"/"1" 与二进制 0/1(修复新设备因默认值 "0"(0x30) 被误判为停留引导模式的缺陷)
+	4、main.c:eraseapp / erasedf_area 改用 fal_partition_find 获取真实分区对象(修正 erasedf_area 旧 16MB 偏移和未初始化 len),并增加执行结果打印
+
+# 版本说明 2026-10-08(第二次)
+	#define BL_VERSION "1.2.7"
+	#define COMPILE "20261008"
+	1、rt_fota.c:新增 RTC 备份寄存器 DR2 升级请求检测——读取 RTC_BKP_DR2==0x5AA5(应用侧 JSONRPC "update" 指令写入)时,停留 bootloader 并执行 ymodem_ota 升级;读取后立即清标志防重复进入
+	2、rt_fota.c:补 HMI_WRITE extern 声明,消除隐式声明编译告警
+
+# 版本说明 2026-10-08
+	#define BL_VERSION "1.2.6"
+	#define COMPILE "20261008"
+	1、main.c:修复HMI串口接收缓冲区溢出(rx_buffer读取长度钳位至255)
+	2、rt_fota.c:升级包压缩块长度block_size越界校验(防止堆越界)
+	3、rt_fota.c:quicklz解压长度预校验(防止解压输出越界)
+
+# 版本说明 2026-07-13
+	#define BL_VERSION "1.2.5"
+	#define COMPILE "20260713"
+	1、增大easyflash env分区大小为4096*256
+	2、增加版本号打印
+
 # 版本说明
+#define BL_VERSION "1.1.5"
+#define COMPILE "20250428"
+#define RT_FOTA_ALGO_BUFF_SIZE				2048        //2025-0428 CHANGE 2048
+
 #define BL_VERSION "1.1.4"
 #define COMPILE "20230901"
 - 1. rt_fota.c中880行增加__set_CONTROL(0);

BIN
CBD_FOTA_BootLoader/rt-thread/tools/building.pyc


BIN
CBD_FOTA_BootLoader/rt-thread/tools/eclipse.pyc


BIN
CBD_FOTA_BootLoader/rt-thread/tools/menuconfig.pyc


BIN
CBD_FOTA_BootLoader/rt-thread/tools/mkdist.pyc


BIN
CBD_FOTA_BootLoader/rt-thread/tools/utils.pyc


+ 10 - 161
CBD_FOTA_BootLoader/rtconfig.h

@@ -158,18 +158,6 @@
 /* Wiced WiFi */
 
 /* end of Wiced WiFi */
-
-/* CYW43012 WiFi */
-
-/* end of CYW43012 WiFi */
-
-/* BL808 WiFi */
-
-/* end of BL808 WiFi */
-
-/* CYW43439 WiFi */
-
-/* end of CYW43439 WiFi */
 /* end of Wi-Fi */
 
 /* IoT Cloud */
@@ -195,24 +183,10 @@
 
 /* language packages */
 
-/* JSON: JavaScript Object Notation, a lightweight data-interchange format */
-
-/* end of JSON: JavaScript Object Notation, a lightweight data-interchange format */
-
-/* XML: Extensible Markup Language */
-
-/* end of XML: Extensible Markup Language */
 /* end of language packages */
 
 /* multimedia packages */
 
-/* LVGL: powerful and easy-to-use embedded GUI library */
-
-/* end of LVGL: powerful and easy-to-use embedded GUI library */
-
-/* u8g2: a monochrome graphic library */
-
-/* end of u8g2: a monochrome graphic library */
 /* end of multimedia packages */
 
 /* tools packages */
@@ -229,21 +203,6 @@
 
 /* system packages */
 
-/* enhanced kernel services */
-
-/* end of enhanced kernel services */
-
-/* acceleration: Assembly language or algorithmic acceleration packages */
-
-/* end of acceleration: Assembly language or algorithmic acceleration packages */
-
-/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
-
-/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
-
-/* Micrium: Micrium software products porting for RT-Thread */
-
-/* end of Micrium: Micrium software products porting for RT-Thread */
 #define PKG_USING_FAL
 #define FAL_DEBUG_CONFIG
 #define FAL_DEBUG 1
@@ -262,74 +221,16 @@
 #define SYSWATCH_THREAD_STK_SIZE 512
 #define SYSWATCH_THREAD_NAME "syswatch"
 #define SYSWATCH_WDT_NAME "wdt"
-#define SYSWATCH_WDT_TIMEOUT 25
+#define SYSWATCH_WDT_TIMEOUT 10
 #define PKG_USING_SYSWATCH_LATEST_VERSION
-/* end of system packages */
-
-/* peripheral libraries and drivers */
-
-/* HAL & SDK Drivers */
-
-/* STM32 HAL & SDK Drivers */
-
-/* end of STM32 HAL & SDK Drivers */
-
-/* Infineon HAL Packages */
-
-/* end of Infineon HAL Packages */
-
-/* Kendryte SDK */
-
-/* end of Kendryte SDK */
-
-/* MM32 HAL & SDK Drivers */
-
-/* end of MM32 HAL & SDK Drivers */
-
-/* WCH HAL & SDK Drivers */
-
-/* end of WCH HAL & SDK Drivers */
-
-/* AT32 HAL & SDK Drivers */
-
-/* end of AT32 HAL & SDK Drivers */
-
-/* HC32 DDL Drivers */
-
-/* end of HC32 DDL Drivers */
-
-/* NXP HAL & SDK Drivers */
-
-/* end of NXP HAL & SDK Drivers */
-
-/* NUVOTON Drivers */
-
-/* end of NUVOTON Drivers */
-
-/* GD32 Drivers */
-
-/* end of GD32 Drivers */
-
-/* HPMicro SDK */
 
-/* end of HPMicro SDK */
-
-/* FT32 HAL & SDK Drivers */
-
-/* end of FT32 HAL & SDK Drivers */
-
-/* NOVOSNS Drivers */
-
-/* end of NOVOSNS Drivers */
-/* end of HAL & SDK Drivers */
-
-/* sensors drivers */
+/* Micrium: Micrium software products porting for RT-Thread */
 
-/* end of sensors drivers */
+/* end of Micrium: Micrium software products porting for RT-Thread */
+/* end of system packages */
 
-/* touch drivers */
+/* peripheral libraries and drivers */
 
-/* end of touch drivers */
 #define PKG_USING_SIGNAL_LED
 #define PKG_USING_SIGNAL_LED_LATEST_VERSION
 
@@ -342,74 +243,22 @@
 
 /* end of AI packages */
 
-/* Signal Processing and Control Algorithm Packages */
-
-/* end of Signal Processing and Control Algorithm Packages */
-
 /* miscellaneous packages */
 
-/* project laboratory */
-
-/* end of project laboratory */
-
-/* samples: kernel and components samples */
-
-/* end of samples: kernel and components samples */
-
-/* entertainment: terminal games and other interesting software packages */
-
-/* end of entertainment: terminal games and other interesting software packages */
 #define PKG_USING_FASTLZ
 #define PKG_USING_FASTLZ_V101
 #define PKG_USING_QUICKLZ
 #define QLZ_COMPRESSION_LEVEL 3
 #define PKG_USING_QUICKLZ_V101
-/* end of miscellaneous packages */
-
-/* Arduino libraries */
-
 
-/* Projects and Demos */
-
-/* end of Projects and Demos */
-
-/* Sensors */
-
-/* end of Sensors */
-
-/* Display */
-
-/* end of Display */
-
-/* Timing */
-
-/* end of Timing */
-
-/* Data Processing */
-
-/* end of Data Processing */
-
-/* Data Storage */
-
-/* Communication */
-
-/* end of Communication */
-
-/* Device Control */
-
-/* end of Device Control */
-
-/* Other */
-
-/* end of Other */
-
-/* Signal IO */
+/* samples: kernel and components samples */
 
-/* end of Signal IO */
+/* end of samples: kernel and components samples */
 
-/* Uncategorized */
+/* entertainment: terminal games and other interesting software packages */
 
-/* end of Arduino libraries */
+/* end of entertainment: terminal games and other interesting software packages */
+/* end of miscellaneous packages */
 /* end of RT-Thread online packages */
 
 /* samples: kernel and components samples */

BIN
CBD_FOTA_BootLoader/rtconfig.pyc