zhunk 2 months ago
parent
commit
d3fbdcd189

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -19,7 +19,7 @@
 ///
 ///
 ///
-#define VERSION_BZY         "3.7.2"                   //孢子仪
+#define VERSION_BZY         "3.7.4"                   //孢子仪
 
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 extern volatile uint8_t focus_valid_flag;

+ 33 - 9
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -36,10 +36,11 @@
 
 /* JSON 通信超时看门狗:记录上次成功解析一帧 JSON 的 tick,
  * 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_router(OFF) -> 10s -> ctr_router(ON) 的心跳 */
+#define DTU_UPLOAD_TIMEOUT_MS   (1 * 60 * 60 * 1000UL)   /* 1 小时无数据主动上传 */
 #define DTU_JSON_TIMEOUT_MS     (2 * 60 * 60 * 1000UL)   /* 2 小时 */
 #define DTU_JSON_RESET_OFF_MS   (10 * 1000UL)              /* OFF 持续 10s */
 static volatile rt_tick_t g_dtu_json_last_tick = 0;       /* 上次成功解析 JSON 的时间 */
-
+static volatile rt_tick_t g_dtu_upload_last_tick = 0;     /* 上次主动上传心跳的时间(防止通信未恢复时每秒重复发) */
 
 Device_Status_typedef device_status;
 Device_slide_typedef slide_para;
@@ -136,19 +137,22 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
 }
 
 
-static dtu_thread_entry_send(void *parameter)
+static void dtu_thread_entry_send(void *parameter)
 {
     /* 安装信号 */
     rt_signal_install(SIGUSR2, parseDtu);
     rt_signal_unmask(SIGUSR2);
     /* 同时承担通信超时看门狗:每 1 秒轮询一次,
-     * 若超过 DTU_JSON_TIMEOUT_MS 仍未收到任何 JSON,
-     * 则执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) 的心跳 */
+     * 超过 DTU_UPLOAD_TIMEOUT_MS (1h) 未收到任何 JSON: 主动发送 UpLoad_Data 心跳探测对端;
+     * 超过 DTU_JSON_TIMEOUT_MS (2h) 仍未收到: 执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) */
     g_dtu_json_last_tick = rt_tick_get();   /* 启动时记一次,避免开机立刻触发 */
-    while(1){
+    g_dtu_upload_last_tick = g_dtu_json_last_tick;
+    while (1)
+    {
         rt_thread_mdelay(1000);
         rt_tick_t now = rt_tick_get();
         rt_tick_t diff;
+        rt_tick_t upload_diff;
         if (now >= g_dtu_json_last_tick)
         {
             diff = now - g_dtu_json_last_tick;
@@ -158,14 +162,33 @@ static dtu_thread_entry_send(void *parameter)
             /* tick 计数回绕:把差值视为 0,避免误触发 */
             diff = 0;
         }
+        if (now >= g_dtu_upload_last_tick)
+        {
+            upload_diff = now - g_dtu_upload_last_tick;
+        }
+        else
+        {
+            upload_diff = 0;
+        }
         rt_ubase_t diff_ms = (rt_ubase_t)((diff * 1000UL) / RT_TICK_PER_SECOND);
+        rt_ubase_t upload_diff_ms = (rt_ubase_t)((upload_diff * 1000UL) / RT_TICK_PER_SECOND);
+        /* 1h 未收到任何数据且距上次主动上传也已满 1h: 主动上传一次心跳,
+         * 探测对端是否在线; 对端若回复任意合法 JSON, g_dtu_json_last_tick 会被刷新 */
+        if (diff_ms >= DTU_UPLOAD_TIMEOUT_MS &&
+            upload_diff_ms >= DTU_UPLOAD_TIMEOUT_MS)
+        {
+            LOG_W("DTU JSON timeout (>%lu ms), 主动发送 UpLoad_Data 心跳",
+                   (unsigned long)DTU_UPLOAD_TIMEOUT_MS);
+            g_dtu_upload_last_tick = now;
+            UpLoad_Data();
+        }
         if (diff_ms >= DTU_JSON_TIMEOUT_MS)
         {
             LOG_W("DTU JSON timeout (>%lu ms), Heart OFF -> 10s -> ON",
                    (unsigned long)DTU_JSON_TIMEOUT_MS);
-            ctr_Heat(OFF);
+            ctr_router(OFF);
             rt_thread_mdelay(DTU_JSON_RESET_OFF_MS);
-            ctr_Heat(ON);
+            ctr_router(ON);
             /* 更新基准时间,等待下一个 2h 周期再判断;
              * 此时若通信已恢复,g_dtu_json_last_tick 会被 lwjsonSTREAMDONE 主动刷新 */
             g_dtu_json_last_tick = rt_tick_get();
@@ -173,7 +196,6 @@ static dtu_thread_entry_send(void *parameter)
     }
 }
 
-
 static void dtu_thread_entry_recv(void *parameter)
 {
     static char accum_buf[MAX_DTU_SIZE];  // 累积缓冲区(根据实际数据量调整)
@@ -212,6 +234,8 @@ static void dtu_thread_entry_recv(void *parameter)
                  memset(accum_buf,0,sizeof(accum_buf));
                  //rt_thread_kill(dtu_send_data, SIGUSR2);
                  lwjson_stream_reset(&lwparser);
+                 /* 成功解析一帧 JSON,更新"上次心跳"时间戳 */
+                 g_dtu_json_last_tick = rt_tick_get();
                  break;
               case lwjsonERRMEM:             // 5, 嵌套的太深("LWJSON_CFG_STREAM_STACK_SIZE")
                  LOG_E("parser stack overflow (ERRMEM), resetting parser!");
@@ -1027,7 +1051,7 @@ int parseDtu(char *json_string)
               }else{
                   send_signal(SIGUSR2);
               }
-              ctr_Heat(OFF);
+              ctr_Heat(OFF);    //关闭风机
               device_status.autotakepic = 2;
           }
 

File diff suppressed because it is too large
+ 974 - 125
Application_cbd_apm32f1/applications/hmi.c


+ 1 - 1
Application_cbd_apm32f1/applications/selfcheck.c

@@ -301,5 +301,5 @@ int rt_software_timer_init(void)
     }
 }
 
-INIT_APP_EXPORT(rt_software_timer_init);
+//INIT_APP_EXPORT(rt_software_timer_init);
 

+ 46 - 37
Application_cbd_apm32f1/drivers/drv_usart_v2.c

@@ -375,7 +375,19 @@ static rt_size_t stm32_transmit(struct rt_serial_device     *serial,
 
     if (uart->uart_dma_flag & RT_DEVICE_FLAG_DMA_TX)
     {
-        HAL_UART_Transmit_DMA(&uart->handle, buf, size);
+        if (HAL_UART_Transmit_DMA(&uart->handle, buf, size) != HAL_OK)
+        {
+            /* 启动失败(典型为 gState 卡在上次传输的 BUSY_TX): 中止残留传输后重试一次 */
+            HAL_UART_AbortTransmit(&uart->handle);
+            if (HAL_UART_Transmit_DMA(&uart->handle, buf, size) != HAL_OK)
+            {
+                /* 仍失败: 主动上报 TX_DMADONE, 防止 serial_v2 框架永久阻塞在 tx_cpt 上
+                 * (阻塞期间持有应用层互斥锁, 会导致该串口发送整体瘫痪) */
+                LOG_E("%s tx dma start failed, drop %d bytes", uart->config->name, size);
+                rt_hw_serial_isr(serial, RT_SERIAL_EVENT_TX_DMADONE);
+                return 0;
+            }
+        }
         return size;
     }
 
@@ -395,38 +407,24 @@ static void dma_recv_isr(struct rt_serial_device *serial, rt_uint8_t isr_flag)
     uart = rt_container_of(serial, struct stm32_uart, serial);
 
     level = rt_hw_interrupt_disable();
-    recv_len = 0;
     counter = __HAL_DMA_GET_COUNTER(&(uart->dma_rx.handle));
 
-    switch (isr_flag)
-    {
-    case UART_RX_DMA_IT_IDLE_FLAG:
-        if (counter <= uart->dma_rx.remaining_cnt)
-            recv_len = uart->dma_rx.remaining_cnt - counter;
-        else
-            recv_len = serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter;
-        break;
+    /* 统一按环形距离计算新增数据量: (bufsz + 上次计数 - 当前计数) % bufsz
+     * 修复原 TC(回绕) 分支的竞态: ISR 被延迟(如片内 flash 擦写长时间关中断)时
+     * counter 已回绕越过 remaining_cnt, 原判断导致整段数据丢失且索引永久错位/多报重复 */
+    recv_len = (serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter)
+               % serial->config.rx_bufsz;
 
-    case UART_RX_DMA_IT_HT_FLAG:
-        if (counter < uart->dma_rx.remaining_cnt)
-            recv_len = uart->dma_rx.remaining_cnt - counter;
-        break;
-
-    case UART_RX_DMA_IT_TC_FLAG:
-        if(counter >= uart->dma_rx.remaining_cnt)
-            recv_len = serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter;
-
-    default:
-        break;
-    }
+    /* 无论 recv_len 是否为 0 都必须同步计数, 否则后续事件全部错算 */
+    uart->dma_rx.remaining_cnt = counter;
 
     if (recv_len)
     {
-        uart->dma_rx.remaining_cnt = counter;
         rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8));
     }
     rt_hw_interrupt_enable(level);
 
+    UNUSED(isr_flag);
 }
 #endif  /* RT_SERIAL_USING_DMA */
 
@@ -530,18 +528,8 @@ static void uart_isr(struct rt_serial_device *serial)
         {
             UART_INSTANCE_CLEAR_FUNCTION(&(uart->handle), UART_FLAG_CTS);
         }
-        if (__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_TXE) != RESET)
-        {
-            UART_INSTANCE_CLEAR_FUNCTION(&(uart->handle), UART_FLAG_TXE);
-        }
-        if (__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_TC) != RESET)
-        {
-            UART_INSTANCE_CLEAR_FUNCTION(&(uart->handle), UART_FLAG_TC);
-        }
-        if (__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_RXNE) != RESET)
-        {
-            UART_INSTANCE_CLEAR_FUNCTION(&(uart->handle), UART_FLAG_RXNE);
-        }
+        /* 注意: 不在此清 TXE/TC/RXNE 正常收发标志 —— 极端时序下误清 TC 会导致
+         * DMA 发送完成回调丢失, 发送线程永久阻塞; RXNE 由 DMA/正常分支处理 */
     }
 }
 
@@ -1087,8 +1075,29 @@ void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
 {
     RT_ASSERT(huart != NULL);
     struct stm32_uart *uart = (struct stm32_uart *)huart;
-    LOG_D("%s: %s %d\n", __FUNCTION__, uart->config->name, huart->ErrorCode);
-    UNUSED(uart);
+    LOG_E("%s uart error: 0x%x", uart->config->name, huart->ErrorCode);
+
+    /* 复位 HAL 状态机: 否则 gState 卡在 BUSY 会导致后续发送全部失败且无任何日志 */
+    __HAL_UNLOCK(huart);
+    huart->gState    = HAL_UART_STATE_READY;
+    huart->RxState   = HAL_UART_STATE_READY;
+    huart->ErrorCode = HAL_UART_ERROR_NONE;
+
+#ifdef RT_SERIAL_USING_DMA
+    /* RX DMA 为循环模式常开: 若被错误中止则重启接收, 保证接收链路自愈 */
+    if (uart->uart_dma_flag & RT_DEVICE_FLAG_DMA_RX)
+    {
+        if (HAL_DMA_GetState(&uart->dma_rx.handle) != HAL_DMA_STATE_BUSY)
+        {
+            struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *)uart->serial.serial_rx;
+            if (rx_fifo != RT_NULL &&
+                HAL_UART_Receive_DMA(huart, rx_fifo->buffer, uart->serial.config.rx_bufsz) == HAL_OK)
+            {
+                uart->dma_rx.remaining_cnt = uart->serial.config.rx_bufsz;
+            }
+        }
+    }
+#endif
 }
 
 /**

+ 1 - 1
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\Application_BZYV2.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="2.6.15" />
+  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\BZYV2_1.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="3.7.4" />
 </configuration>

+ 9 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,12 @@
+# 2026-09-14 更新说明
+	#define VERSION_BZY         "3.7.4"                   //孢子仪	
+	1. 修复对焦拍照超时定时器没有初始化就打开导致报错的问题;
+# 2026-09-11 更新说明
+	#define VERSION_BZY         "3.7.3"                   //孢子仪
+	1. 修复串口驱动DMA发送失败不检查返回值导致的永久卡死:HAL_UART_Transmit_DMA失败时先HAL_UART_AbortTransmit复位残留状态重试一次,仍失败主动上报TX_DMADONE解除serial_v2框架tx_cpt永久阻塞(原故障下发送线程持dtu_write_mutex卡死,串口2发送整体瘫痪且1h心跳看门狗同步失效,只能复位恢复,即"对端收不到数据"的根因);
+	2、修复RX DMA回绕(TC)事件长度计算竞态:ISR被延迟(如easyflash片内flash擦写长时间关中断)时counter已回绕越过remaining_cnt,原判断导致整段数据丢失且索引永久错位/多报重复(即2.9.21"lwjson解析帧错乱"的底层根因),改为统一按环形距离(bufsz+上次计数-当前计数)%bufsz计算,且无论长度是否为0都同步remaining_cnt; 
+	3、HAL_UART_ErrorCallback由空壳(仅LOG_D且未开调试)改为LOG_E留痕并复位ErrorCode/gState/RxState,RX循环DMA被错误中止时自动重启接收,串口链路可自愈;uart_isr错误分支不再误清TXE/TC/RXNE正常收发标志(防误清TC导致发送完成回调丢失);
+	4、hmi.c 自动对焦算法重构
 # 2026-09-07 更新说明
 	#define VERSION_BZY         "3.7.2"                   //孢子仪
 	1. 优化采集有效天判断