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

+ 1 - 1
Application_BZYV2-NHT/applications/control.h

@@ -33,7 +33,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
-#define VERSION_BZY         "2.6.1"                   //孢子仪
+#define VERSION_BZY         "2.7.1"                   //孢子仪
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/

+ 3 - 6
Application_BZYV2-NHT/applications/dtu_uart2.c

@@ -107,6 +107,7 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
         {
             /* 消息队列满 */
             rt_kprintf("message queue full!\n");
+            rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
         }
         return result;
 }
@@ -800,17 +801,13 @@ int parseDtu(char *json_string)
               }
               //补光灯开灯和关灯
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
-
-//                   rt_pin_mode(ROUTER,PIN_MODE_OUTPUT);
-//                   rt_pin_write(ROUTER,ON);
                   ctr_Cold(ON);
-
+                  ctr_led(ON);
               }
               if(strstr(item_cmd->valuestring,"ledoff")!=RT_NULL){
 
-//                    rt_pin_mode(ROUTER,PIN_MODE_OUTPUT);
-//                    rt_pin_write(ROUTER,OFF);
                   ctr_Cold(OFF);
+                  ctr_led(OFF);
                   slidelock();
               }
               //采集风机开和关

+ 13 - 7
Application_BZYV2-NHT/packages/ota_downloader-latest/src/ymodem_ota.c

@@ -44,7 +44,7 @@ static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_si
     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);
+    rt_kprintf("Ymodem file_size:%d\n", update_file_total_size);
 
     update_file_cur_size = 0;
 
@@ -61,7 +61,7 @@ static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_si
         return RYM_CODE_CAN;
     }
 
-    //LOG_I("Start erase. Size (%d)", update_file_total_size);
+    LOG_I("Start erase. Size (%d)", update_file_total_size);
 
     /* erase DL section */
     if (fal_partition_erase(dl_part, 0, update_file_total_size) < 0)
@@ -105,7 +105,7 @@ void ymodem_ota(uint8_t argc, char **argv)
                 return;
             } else {
                 /* change default partition to save firmware */
-                recv_partition = argv[2];  
+                recv_partition = argv[2];
             }
         }else{
             rt_kprintf("Usage: ymodem_ota -p <partiton name>.\n");
@@ -132,12 +132,18 @@ void ymodem_ota(uint8_t argc, char **argv)
     }
     else
     {
+        /* wait some time for terminal response finish */
+        rt_thread_delay(RT_TICK_PER_SECOND);
         rt_console_set_device("uart1");
         rt_kprintf("Update firmware fail.\n");
-//        /* wait some time for terminal response finish */
-//        rt_thread_delay(rt_tick_from_millisecond(1000));
-//        extern void rt_hw_cpu_reset(void);
-//        rt_hw_cpu_reset();
+        /* wait some time for terminal response finish */
+        rt_thread_delay(rt_tick_from_millisecond(200));
+
+        /* Reset the device, Start old firmware */
+        extern void rt_hw_cpu_reset(void);
+        rt_hw_cpu_reset();
+        /* wait some time for terminal response finish */
+        rt_thread_delay(rt_tick_from_millisecond(200));
     }
 
     return;

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

+ 1 - 1
CBD_FOTA_BootLoader/applications/rt_fota.c

@@ -48,7 +48,7 @@
 #endif
 
 #ifndef RT_FOTA_ALGO_BUFF_SIZE
-#define RT_FOTA_ALGO_BUFF_SIZE				4096
+#define RT_FOTA_ALGO_BUFF_SIZE				2048    //stm32f103flash分页是2K
 #endif
 
 /**

+ 5 - 0
CBD_FOTA_BootLoader/readme.md

@@ -1,4 +1,9 @@
 # 版本说明
+#define BL_VERSION "1.1.5"
+#define COMPILE "20250421"
+- 1. 修复app升级报错:
+	rt_fota.c  #define RT_FOTA_ALGO_BUFF_SIZE				4096 改为2048
+# 版本说明
 #define BL_VERSION "1.1.4"
 #define COMPILE "20230901"
 - 1. rt_fota.c中880行增加__set_CONTROL(0);