diff --git a/app/by_frame.c b/app/by_frame.c index ea3ed2c..6370cdb 100644 --- a/app/by_frame.c +++ b/app/by_frame.c @@ -16,7 +16,7 @@ void by_frame_init(void) { lwrb_init(&lwrb_ctx, frame_buffer_recv, sizeof(frame_buffer_recv)); // lwrb 最大元素数量为 buff 大小减一 uart_init(BY_FRAME_UART_INDEX, BY_FRAME_UART_BAUDRATE, BY_FRAME_UART_TX_PIN, BY_FRAME_UART_RX_PIN); - // uart_rx_interrupt(BY_FRAME_UART_INDEX, ENABLE); + uart_rx_interrupt(BY_FRAME_UART_INDEX, ENABLE); } void by_frame_send(uint32_t *data_array) @@ -46,12 +46,12 @@ void by_frame_send(uint32_t *data_array) */ void by_frame_parse(uint32_t *data_array) { - uint32_t len = lwrb_get_full(&lwrb_ctx); // 缓冲区大小 - uint8_t status = 0; // 状态 0-未找到帧头 1-找到帧头 2-校验 - uint16_t frame_start = 0; // 帧起始位置 - uint8_t frame_buf[4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)] = {0}; // 帧 - uint8_t buf[(4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)) * 2] = {0}; // 用于解析的数据块 - const uint8_t data_byte_num = BY_FRAME_DATA_NUM * sizeof(uint32_t); + uint32_t len = lwrb_get_full(&lwrb_ctx); // 缓冲区大小 + uint8_t status = 0; // 状态 0-未找到帧头 1-找到帧头 2-校验 + uint16_t frame_start = 0; // 帧起始位置 + uint8_t frame_buf[4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)] = {0}; // 帧 + uint8_t buf[(4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)) * 2] = {0}; // 用于解析的数据块 + const uint8_t data_byte_num = BY_FRAME_DATA_NUM * sizeof(uint32_t); if (len < 2 * (4 + data_byte_num)) { // 当前要求缓冲区满 diff --git a/app/by_frame.h b/app/by_frame.h index d23799b..a724f40 100644 --- a/app/by_frame.h +++ b/app/by_frame.h @@ -18,8 +18,6 @@ #define BY_FRAME_DATA_NUM (3) -extern uint8_t frame_buffer[50]; - extern void by_frame_init(void); void by_frame_send(uint32_t *data_array); void by_frame_parse(uint32_t *data_array); diff --git a/app/isr.c b/app/isr.c index 9a43be0..7b28552 100644 --- a/app/isr.c +++ b/app/isr.c @@ -94,6 +94,12 @@ void USART2_IRQHandler(void) if (USART_GetITStatus(USART2, USART_IT_RXNE) != RESET) { USART_ClearITPendingBit(USART2, USART_IT_RXNE); } + + if (USART_GetFlagStatus(USART2, USART_FLAG_ORE) != RESET) { + + USART_ClearFlag(USART2, USART_FLAG_ORE); // ORE ־λ + USART_ReceiveData(USART2); + } } void USART3_IRQHandler(void) {