Browse Source

1, 修复MCU累计历史温湿度数据到最大允许范围值(5天,1天24条,每条32字节)后整点唤醒再次采集温湿度环境数据程序卡死的问题;2,优化喂狗逻辑;3,优化串口日志;4,重新发布新的固件版本1.2.6.0

niujiuru 7 months atrás
parent
commit
5d0b4683c6

BIN
build/MCU_V1.2.6.0_2604101543.bin


BIN
build/ctrl_board_V1.2.6.0_2604101506.bin


BIN
build/ctrl_boot_V1.0.0.0_2604101543.bin


+ 11 - 0
build/readme.txt

@@ -0,0 +1,11 @@
+1,./ctrl_boot_V1.0.0.0_2604101543.bin
+
+bootloader
+
+2,./ctrl_board_V1.2.6.0_2604101506.bin
+
+application
+
+3,./MCU_V1.2.6.0_2604101543.bin
+
+合并后的flash烧录固件

+ 4 - 2
ctrl_board_g070_app/Core/Inc/main.h

@@ -72,8 +72,8 @@ void Error_Handler(void);
 /* 2.1 可独立修改的版本号宏定义 */
 /* 2.1 可独立修改的版本号宏定义 */
 #define VERSION_MAJOR      1       // 主版本号 (重大功能更新)
 #define VERSION_MAJOR      1       // 主版本号 (重大功能更新)
 #define VERSION_MINOR      2       // 次版本号 (新功能增加)
 #define VERSION_MINOR      2       // 次版本号 (新功能增加)
-#define VERSION_BUILD      5       // 构建版本 (Bug修复)
-#define VERSION_REVISION   3       // 修订版本 (小修改)
+#define VERSION_BUILD      6       // 构建版本 (Bug修复)
+#define VERSION_REVISION   0       // 修订版本 (小修改)
 
 
 /* 2.2 组合成32位版本号 */
 /* 2.2 组合成32位版本号 */
 #define MAKE_VERSION(major, minor, build, revision) \
 #define MAKE_VERSION(major, minor, build, revision) \
@@ -128,6 +128,8 @@ void Error_Handler(void);
 
 
 
 
 /* USER CODE BEGIN Private defines */
 /* USER CODE BEGIN Private defines */
+#define __DBG_LOG__ // 启用串口调试打印功能
+void dbg_log(const char *fmt, ...);
 
 
 /* USER CODE END Private defines */
 /* USER CODE END Private defines */
 
 

+ 42 - 5
ctrl_board_g070_app/Core/Src/main.c

@@ -17,6 +17,8 @@
   */
   */
 /* USER CODE END Header */
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 /* Includes ------------------------------------------------------------------*/
+#include <stdarg.h>
+#include <stdio.h>
 #include "main.h"
 #include "main.h"
 #include "rtc.h"
 #include "rtc.h"
 #include "gpio.h"
 #include "gpio.h"
@@ -112,15 +114,14 @@ int main(void)
     W25qxx_WriteByte((recvSize >> 16) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 2);  // 字节2
     W25qxx_WriteByte((recvSize >> 16) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 2);  // 字节2
     W25qxx_WriteByte((recvSize >> 24) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 3);  // 字节3
     W25qxx_WriteByte((recvSize >> 24) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 3);  // 字节3
 
 
-
-    LL_USART_TransmitData8(COM_DBG, (recvSize >> 0) & 0xFF); //调试口发
+    /*LL_USART_TransmitData8(COM_DBG, (recvSize >> 0) & 0xFF); //调试口发
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 8) & 0xFF); //调试口发
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 8) & 0xFF); //调试口发
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 16) & 0xFF); //调试口发
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 16) & 0xFF); //调试口发
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 24) & 0xFF); //调试口发
         LL_USART_TransmitData8(COM_DBG, (recvSize >> 24) & 0xFF); //调试口发
-    while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+    while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
     //复位
     //复位
     HAL_NVIC_SystemReset();
     HAL_NVIC_SystemReset();
   }
   }
@@ -141,8 +142,8 @@ int main(void)
   {
   {
     /* USER CODE END WHILE */
     /* USER CODE END WHILE */
     #if dbg_ymodem==1
     #if dbg_ymodem==1
-      LL_USART_TransmitData8(COM_DBG, ret); //调试口发
-      while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+      /*LL_USART_TransmitData8(COM_DBG, ret); //调试口发
+      while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
       HAL_Delay(1000);
       HAL_Delay(1000);
     #endif
     #endif
     /* USER CODE BEGIN 3 */
     /* USER CODE BEGIN 3 */
@@ -233,3 +234,39 @@ void assert_failed(uint8_t *file, uint32_t line)
   /* USER CODE END 6 */
   /* USER CODE END 6 */
 }
 }
 #endif /* USE_FULL_ASSERT */
 #endif /* USE_FULL_ASSERT */
+
+void dbg_log(const char *fmt, ...)
+{
+#ifdef __DBG_LOG__
+
+  char buf[64];
+
+  va_list args;
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+
+  // ⭐1:等待UART完全空闲(防STOP唤醒残留)
+  while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+
+  for (char *p = buf; *p; p++)
+  {
+    while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
+    LL_USART_TransmitData8(COM_DBG, *p);
+  }
+
+  // ⭐2:整帧发送完成(防止0x43 E1这种错位)
+  while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+
+  // 发送换行
+  while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
+  LL_USART_TransmitData8(COM_DBG, '\r');
+
+  while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
+  LL_USART_TransmitData8(COM_DBG, '\n');
+
+  // ⭐3:再等一次收尾
+  while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+
+#endif
+}

+ 31 - 19
ctrl_board_g070_app/User/app.c

@@ -1,5 +1,6 @@
 #include "app.h"
 #include "app.h"
 #include "main.h"
 #include "main.h"
+#include "usart.h"
 #include "sensor.h"
 #include "sensor.h"
 #include "para.h"
 #include "para.h"
 #include "rtc.h"
 #include "rtc.h"
@@ -12,32 +13,31 @@
 static void led_task(void)
 static void led_task(void)
 {
 {
     static uint32_t ticks = 0;
     static uint32_t ticks = 0;
+    uint32_t now = HAL_GetTick();
+    uint32_t diff = now - ticks;
 
 
-    if ((HAL_GetTick() - ticks) < 100)
+    if (diff < 100)
     {
     {
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_SET);
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_SET);
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_RESET);
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_RESET);
-#ifdef __debug__
-        HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_RESET);
-#endif
     }
     }
-    else if ((HAL_GetTick() - ticks) < 1000)
+    else if (diff < 1000)
     {
     {
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_RESET);
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_RESET);
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_SET);
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_SET);
-#ifdef __debug__
-        HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_SET);
-#endif
     }
     }
     else
     else
     {
     {
-        ticks = HAL_GetTick();
+        ticks = now;
     }
     }
 }
 }
 
 
 void app_init(void)
 void app_init(void)
 {
 {
+#ifdef __DBG_LOG__
     MX_USART1_UART_Init();
     MX_USART1_UART_Init();
+#endif
+
     para_init();
     para_init();
 
 
     pm_init();
     pm_init();
@@ -139,16 +139,33 @@ int app_chk_rtu_work_condition(rtc_time_t *now)
     return -1;
     return -1;
 }
 }
 
 
+void print_reset_source()
+{
+    uint32_t reset_source = HAL_RCC_GetResetSource();
+
+    if (reset_source == 0)
+    {
+        dbg_log("Reset: UNKNOWN (flags cleared or first boot)");
+        return;
+    }
+
+    dbg_log("Reset source: 0x%08lX", (unsigned long)reset_source);
+}
+
 void app_run(void)
 void app_run(void)
 {
 {
 #ifndef __debug__
 #ifndef __debug__
     uint32_t last_timestamp = 0;
     uint32_t last_timestamp = 0;
 #endif
 #endif
 
 
+#ifdef __DBG_LOG__
+    print_reset_source();
+#endif
+
     while (1)
     while (1)
     {
     {
-        LL_USART_TransmitData8(COM_DBG, 0x01); //调试口发
-        while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+        /*LL_USART_TransmitData8(COM_DBG, 0x01); //调试口发
+        while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
         led_task();
         led_task();
 
 
         sensor_task();
         sensor_task();
@@ -166,8 +183,8 @@ void app_run(void)
         }
         }
         if (pm_get_wakeup_events() & PM_WAKUP_EVT_WUT)
         if (pm_get_wakeup_events() & PM_WAKUP_EVT_WUT)
         {
         {
-            LL_USART_TransmitData8(COM_DBG, 0x50); //调试口发
-            while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+            /*LL_USART_TransmitData8(COM_DBG, 0x50); //调试口发
+            while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
 
 
             rtc_time_t time;
             rtc_time_t time;
             uint32_t timestamp;
             uint32_t timestamp;
@@ -192,8 +209,8 @@ void app_run(void)
                 if ((timestamp > last_timestamp) && (timestamp - last_timestamp > PM_WUT_PERIOD))
                 if ((timestamp > last_timestamp) && (timestamp - last_timestamp > PM_WUT_PERIOD))
                 {
                 {
                     sensor_init(timestamp);
                     sensor_init(timestamp);
+                    last_timestamp = timestamp;
                 }
                 }
-                last_timestamp = timestamp;
             }
             }
 
 
             // 检查是否需要启动RTU
             // 检查是否需要启动RTU
@@ -209,11 +226,6 @@ void app_run(void)
                 {
                 {
                     rtu_init(2);
                     rtu_init(2);
                 }
                 }
-                // if(reason==-1){
-                //     LL_USART_TransmitData8(COM_DBG, 0x55); //调试口发
-                //     while (!LL_USART_IsActiveFlag_TC(COM_DBG));
-                //     rtu_init(1);
-                // }
             }
             }
 #else
 #else
             // 调试模式下每个唤醒周期都采集一次数据
             // 调试模式下每个唤醒周期都采集一次数据

+ 5 - 5
ctrl_board_g070_app/User/para.c

@@ -11,7 +11,7 @@ static const para_t default_para =
         .light_mode_hours = 10,
         .light_mode_hours = 10,
         .time_mode_start = 0,
         .time_mode_start = 0,
         .time_mode_end = 23,
         .time_mode_end = 23,
-        .photo_interval = 60,
+        .photo_interval = 30,
         .crc = 0x0000 // 占位符,实际会重新计算
         .crc = 0x0000 // 占位符,实际会重新计算
 };
 };
 
 
@@ -123,8 +123,8 @@ int para_init(void)
     uint8_t app_flag;
     uint8_t app_flag;
     // 1. 读取备份标志
     // 1. 读取备份标志
     W25qxx_ReadBytes(&app_flag, EXT_FLASH_APP_FLAG_BOOT_ADDR, 1U);
     W25qxx_ReadBytes(&app_flag, EXT_FLASH_APP_FLAG_BOOT_ADDR, 1U);
-    LL_USART_TransmitData8(COM_DBG, app_flag); //调试口发
-    while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+    /*LL_USART_TransmitData8(COM_DBG, app_flag); //调试口发
+    while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
     if(app_flag==0xFF){
     if(app_flag==0xFF){
         W25qxx_EraseSector(EXT_FLASH_APP_FLAG_BOOT_ADDR/0x1000);  //擦除
         W25qxx_EraseSector(EXT_FLASH_APP_FLAG_BOOT_ADDR/0x1000);  //擦除
         W25qxx_WriteByte(0xBB,EXT_FLASH_APP_FLAG_BOOT_ADDR);      //写入0xBB
         W25qxx_WriteByte(0xBB,EXT_FLASH_APP_FLAG_BOOT_ADDR);      //写入0xBB
@@ -135,8 +135,8 @@ int para_init(void)
         W25qxx_WriteByte(0xBB,EXT_FLASH_APP_FLAG_BOOT_ADDR);      //写入0xBB
         W25qxx_WriteByte(0xBB,EXT_FLASH_APP_FLAG_BOOT_ADDR);      //写入0xBB
     }
     }
     W25qxx_ReadBytes(&app_flag, EXT_FLASH_APP_BACKUP_FLAG_ADDR, 1U);
     W25qxx_ReadBytes(&app_flag, EXT_FLASH_APP_BACKUP_FLAG_ADDR, 1U);
-    LL_USART_TransmitData8(COM_DBG, app_flag); //调试口发
-    while (!LL_USART_IsActiveFlag_TC(COM_DBG));
+    /*LL_USART_TransmitData8(COM_DBG, app_flag); //调试口发
+    while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
     if(app_flag!=0xAA){
     if(app_flag!=0xAA){
         backup_app_to_ext();
         backup_app_to_ext();
     }
     }

+ 7 - 3
ctrl_board_g070_app/User/pm.c

@@ -4,6 +4,7 @@
 #include "app_rtc.h"
 #include "app_rtc.h"
 #include "spi.h"
 #include "spi.h"
 #include "usart.h"
 #include "usart.h"
+#include "wdt.h"
 
 
 #define PM_LOCK_COUNT 10
 #define PM_LOCK_COUNT 10
 #define PM_LOCK_NAME_LEN 16
 #define PM_LOCK_NAME_LEN 16
@@ -102,8 +103,8 @@ void pm_enter_low_power_mode(void)
         HAL_SPI_DeInit(&hspi2);
         HAL_SPI_DeInit(&hspi2);
         __HAL_RCC_SPI2_CLK_DISABLE();
         __HAL_RCC_SPI2_CLK_DISABLE();
 
 
-        LL_USART_Disable(USART1);
-        LL_USART_DeInit(USART1);
+        /*LL_USART_Disable(USART1);
+        LL_USART_DeInit(USART1);*/
 
 
         // 设置RTC,30S后唤醒
         // 设置RTC,30S后唤醒
         // 设置整分钟对齐
         // 设置整分钟对齐
@@ -130,6 +131,8 @@ void pm_enter_low_power_mode(void)
         // 进入低功耗
         // 进入低功耗
         HAL_SuspendTick();
         HAL_SuspendTick();
 #ifndef __debug__
 #ifndef __debug__
+        wdt_feed(); // 睡眠前喂一次狗
+        dbg_log("Entering low power mode, will wake up in %d seconds", (next_wakeup_second > current_seconds) ? (next_wakeup_second - current_seconds) : (60 - current_seconds));
         HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
         HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
 #else
 #else
         wakeup_events = 0;
         wakeup_events = 0;
@@ -137,7 +140,7 @@ void pm_enter_low_power_mode(void)
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_RESET);
         HAL_GPIO_WritePin(LED_DBG_GPIO_Port, LED_DBG_Pin, GPIO_PIN_RESET);
 #endif
 #endif
         HAL_ResumeTick();
         HAL_ResumeTick();
-        
+
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_SET);
         HAL_GPIO_WritePin(LED_SYS_GPIO_Port, LED_SYS_Pin, GPIO_PIN_SET);
 
 
         // 系统被唤醒后LED亮起20ms
         // 系统被唤醒后LED亮起20ms
@@ -175,5 +178,6 @@ void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin)
 
 
 void HAL_RTCEx_WakeUpTimerEventCallback(RTC_HandleTypeDef *hrtc)
 void HAL_RTCEx_WakeUpTimerEventCallback(RTC_HandleTypeDef *hrtc)
 {
 {
+    wdt_feed(); // 唤醒后喂一次狗
     wakeup_events |= PM_WAKUP_EVT_WUT;
     wakeup_events |= PM_WAKUP_EVT_WUT;
 }
 }

+ 9 - 7
ctrl_board_g070_app/User/rec.c

@@ -36,16 +36,17 @@ int read_record(int index, record_t *out_rec);
 // 带重试的Flash写函数
 // 带重试的Flash写函数
 int flash_write_with_retry(uint8_t *pBuffer, uint32_t SectorAddress, uint32_t WriteAddr, uint32_t NumByteToWrite)
 int flash_write_with_retry(uint8_t *pBuffer, uint32_t SectorAddress, uint32_t WriteAddr, uint32_t NumByteToWrite)
 {
 {
+    static uint8_t write_verify_buf[4096];
+
     for (int i = 0; i < FLASH_RETRY_TIMES; i++)
     for (int i = 0; i < FLASH_RETRY_TIMES; i++)
     {
     {
         W25qxx_WriteSector(pBuffer, SectorAddress, WriteAddr, NumByteToWrite);
         W25qxx_WriteSector(pBuffer, SectorAddress, WriteAddr, NumByteToWrite);
 
 
         HAL_Delay(10); // 短暂延时
         HAL_Delay(10); // 短暂延时
         // 验证写入结果
         // 验证写入结果
-        uint8_t verify_buf[64];
-        W25qxx_ReadSector(verify_buf, SectorAddress, WriteAddr, NumByteToWrite);
+        W25qxx_ReadSector(write_verify_buf, SectorAddress, WriteAddr, NumByteToWrite);
 
 
-        if (memcmp(pBuffer, verify_buf, NumByteToWrite) == 0)
+        if (memcmp(pBuffer, write_verify_buf, NumByteToWrite) == 0)
         {
         {
             return 0; // 成功
             return 0; // 成功
         }
         }
@@ -58,18 +59,19 @@ int flash_write_with_retry(uint8_t *pBuffer, uint32_t SectorAddress, uint32_t Wr
 // 带重试的Flash擦除函数(扇区)
 // 带重试的Flash擦除函数(扇区)
 int flash_erase_with_retry(uint32_t sector)
 int flash_erase_with_retry(uint32_t sector)
 {
 {
+    uint8_t erase_verify_buf[64];
+
     for (int i = 0; i < FLASH_RETRY_TIMES; i++)
     for (int i = 0; i < FLASH_RETRY_TIMES; i++)
     {
     {
         W25qxx_EraseSector(sector);
         W25qxx_EraseSector(sector);
 
 
         // 验证是否全为 0xFF
         // 验证是否全为 0xFF
-        uint8_t verify_buf[64];
-        W25qxx_ReadSector(verify_buf, sector, 0, sizeof(verify_buf));
+        W25qxx_ReadSector(erase_verify_buf, sector, 0, sizeof(erase_verify_buf));
 
 
         int all_ff = 1;
         int all_ff = 1;
-        for (int j = 0; j < sizeof(verify_buf); j++)
+        for (int j = 0; j < sizeof(erase_verify_buf); j++)
         {
         {
-            if (verify_buf[j] != 0xFF)
+            if (erase_verify_buf[j] != 0xFF)
             {
             {
                 all_ff = 0;
                 all_ff = 0;
                 break;
                 break;

+ 2 - 1
ctrl_board_g070_app/User/rtu.c

@@ -5,6 +5,7 @@
 #include "pm.h"
 #include "pm.h"
 #include "rtu.h"
 #include "rtu.h"
 #include "usart.h"
 #include "usart.h"
+#include "w25qxx.h"
 #include "crc.h"
 #include "crc.h"
 #include "rec.h"
 #include "rec.h"
 #include "string.h"
 #include "string.h"
@@ -567,7 +568,7 @@ int rtu_rx_proc(uint8_t *buf, int len)
             }
             }
 
 
             rtu_ctx.ota_ongoing = 1;
             rtu_ctx.ota_ongoing = 1;
-            uint8_t err = 0x01;
+            //uint8_t err = 0x01;
             //rtu_send_pkt(1, CMD_OTA_START, &err, 1);
             //rtu_send_pkt(1, CMD_OTA_START, &err, 1);
             // 需要升级:关闭帧接收中断,进入 YMODEM 升级流程
             // 需要升级:关闭帧接收中断,进入 YMODEM 升级流程
             LL_USART_DisableIT_RXNE(COM_RTU);
             LL_USART_DisableIT_RXNE(COM_RTU);