From bdb6df06265abb3a961de33fb791ad138b79a94b Mon Sep 17 00:00:00 2001 From: leon Date: Sun, 16 Aug 2026 11:27:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4=E6=8C=87?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Inc/main.h | 3 +++ Core/Src/main.c | 31 +++++++++++++++++++----- USB_DEVICE/App/usbd_cdc_if.c | 46 ++++++++++++++++++++---------------- 3 files changed, 53 insertions(+), 27 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 701a2f7..9cb3271 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -57,6 +57,9 @@ void Error_Handler(void); /* 采集标志:1=正在采集,0=停止采集。由USB虚拟串口命令置位/清零 */ extern volatile uint8_t g_acqFlag; +/* 采集剩余时间(ms),TIM3每1ms递减,减到0自动停止采集 */ +extern volatile uint16_t g_acqRemainMs; + /* USB虚拟串口发送忙标志:1=正在发送,0=空闲。由CDC发送完成回调清零 */ extern volatile uint8_t g_usbTxBusy; diff --git a/Core/Src/main.c b/Core/Src/main.c index 24980d4..a19f5e3 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -51,6 +51,9 @@ /* 采集标志:1=正在采集,0=停止采集 */ volatile uint8_t g_acqFlag = 0; +/* 采集剩余时间(ms),减到0自动停止采集 */ +volatile uint16_t g_acqRemainMs = 0; + /* USB虚拟串口发送忙标志 */ volatile uint8_t g_usbTxBusy = 0; @@ -231,6 +234,7 @@ void SystemClock_Config(void) /** * @brief TIM3 周期中断回调(1ms)。 * 采集时:先装填USART2 DMA接收4字节,再发送0x00触发DAQ返回数据。 + * 每次中断递减采集剩余时间,减到0自动停止。 * TX与RX使用各自独立的状态机(gState/RxState),可并发不冲突。 */ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) @@ -242,14 +246,29 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) if (g_acqFlag) { - /* 清理上一周期未完成的接收(DAQ未应答等),避免帧错位 */ - if (huart2.RxState != HAL_UART_STATE_READY) + if (g_acqRemainMs == 0U) { - HAL_UART_DMAStop(&huart2); + /* 无剩余时间,确保停止 */ + g_acqFlag = 0; + } + else + { + /* 清理上一周期未完成的接收(DAQ未应答等),避免帧错位 */ + if (huart2.RxState != HAL_UART_STATE_READY) + { + HAL_UART_DMAStop(&huart2); + } + /* 先装填4字节DMA接收,再触发DAQ,确保不丢失应答首字节 */ + HAL_UART_Receive_DMA(&huart2, g_uartRxBuf, 4); + HAL_UART_Transmit_IT(&huart2, &g_uartTxByte, 1); /* RS485 DE由硬件自动控制 */ + + /* 递减剩余时间,减到0则本次为最后一帧并自动停止 */ + g_acqRemainMs--; + if (g_acqRemainMs == 0U) + { + g_acqFlag = 0; + } } - /* 先装填4字节DMA接收,再触发DAQ,确保不丢失应答首字节 */ - HAL_UART_Receive_DMA(&huart2, g_uartRxBuf, 4); - HAL_UART_Transmit_IT(&huart2, &g_uartTxByte, 1); /* RS485 DE由硬件自动控制 */ } } diff --git a/USB_DEVICE/App/usbd_cdc_if.c b/USB_DEVICE/App/usbd_cdc_if.c index 68b8a40..be71986 100644 --- a/USB_DEVICE/App/usbd_cdc_if.c +++ b/USB_DEVICE/App/usbd_cdc_if.c @@ -262,13 +262,14 @@ static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len) { /* USER CODE BEGIN 6 */ /* 命令帧解析状态机 - * 帧格式: 55 AA p0 p1 p2 p3 CC (共7字节) - * 55 AA 11 11 11 11 CC -> 置采集标志 - * 55 AA 00 00 00 00 CC -> 清采集标志 + * 帧格式: 55 AA XX YY CC (共5字节) + * XX YY = 采集时间(ms),小端格式(XX为低字节, YY为高字节) + * 时间>0 : 启动采集,采集指定时长后自动停止 + * 时间=0 : 强制停止当前采集 */ - static uint8_t rxState = 0; /* 0:等55 1:等AA 2:收4字节 3:等CC */ - static uint8_t payload[4]; - static uint8_t idx = 0; + static uint8_t rxState = 0; /* 0:等55 1:等AA 2:收XX 3:收YY 4:等CC */ + static uint8_t timeL = 0; /* 采集时间低字节 */ + static uint8_t timeH = 0; /* 采集时间高字节 */ uint32_t i; for (i = 0U; i < *Len; i++) @@ -287,7 +288,6 @@ static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len) if (b == 0xAA) { rxState = 2; - idx = 0; } else if (b == 0x55) { @@ -299,26 +299,31 @@ static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len) } break; - case 2: /* 收集4字节载荷 */ - payload[idx++] = b; - if (idx >= 4U) - { - rxState = 3; - } + case 2: /* 采集时间低字节 XX */ + timeL = b; + rxState = 3; break; - case 3: /* 等待帧尾 0xCC */ + case 3: /* 采集时间高字节 YY */ + timeH = b; + rxState = 4; + break; + + case 4: /* 等待帧尾 0xCC */ if (b == 0xCC) { - if ((payload[0] == 0x11) && (payload[1] == 0x11) && - (payload[2] == 0x11) && (payload[3] == 0x11)) + uint16_t acqMs = (uint16_t)((uint16_t)timeL | ((uint16_t)timeH << 8)); + if (acqMs == 0U) { - g_acqFlag = 1; /* 开始采集 */ + /* 时间为0,强制停止当前采集 */ + g_acqRemainMs = 0U; + g_acqFlag = 0U; } - else if ((payload[0] == 0x00) && (payload[1] == 0x00) && - (payload[2] == 0x00) && (payload[3] == 0x00)) + else { - g_acqFlag = 0; /* 停止采集 */ + /* 启动采集;先置剩余时间再置标志,确保TIM3中断读到正确时长 */ + g_acqRemainMs = acqMs; + g_acqFlag = 1U; } rxState = 0; } @@ -334,7 +339,6 @@ static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len) default: rxState = 0; - idx = 0; break; } }