From 59a4e01d92da432e9736b24c085089cd31963833 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 21 五月 2025 15:19:22 +0800
Subject: [PATCH] 修改了串口读取的bug，现在是通过飞线控制的 PCA蓝牙IRQ拉低，修改灯的闪灯逻辑，
---
keil/include/drivers/Usart.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/keil/include/drivers/Usart.c b/keil/include/drivers/Usart.c
index 6d4af12..179e553 100644
--- a/keil/include/drivers/Usart.c
+++ b/keil/include/drivers/Usart.c
@@ -11,8 +11,10 @@
volatile int8_t m_EUART_TxFrm_Head = 0; //数据发送帧队列头指针
volatile int8_t m_EUART_TxFrm_FreeFrmLen = 0; //数据发送帧队列剩余帧数
//DMA数据接收缓存
-uint8_t m_EUART_DMA_RXBuf[EUART_RX_BUF_SIZE]; //DMA数据接收缓存
+uint8_t m_EUART_DMA_RXBuf[EUART_RX_BUF_SIZE]; //DMA数据接收缓存 m_EUART_DMA_RXBuf_1
+uint8_t m_EUART_DMA_RXBuf_1[USART_RX_BUF_SIZE];
volatile int32_t m_EUART_DMA_RXPtr = 0; //当前数据地址
+volatile int32_t m_EUART_DMA_RXPtr_1 = 0;
//int16_t DMA_rxtemp = 0,DMA_rxtemp2 = 0; //当前数据地址缓存
//uint16_t datadelaycount = 0; //剩余1位数据延时等待处理
//标志变量
@@ -22,6 +24,7 @@
volatile uint8_t m_bEUARTTxEn = 0; //使能发送
void (*Usart1ParseDataCallback)(uint8_t);
+void (*Usart0ParseDataCallback)(uint8_t);
void Usart1InitVariables(void)
{
m_EUART_TxFrm_FreeFrmLen = EUART_TX_FRM_SIZE-1;
@@ -35,11 +38,12 @@
//uint16_t t1,t2,t3,t4;
uint16_t t3;
-uint32_t cndtr=0;
+
void UART_CheckReceive(void)
{
+ uint32_t cndtr=0;
int32_t DMACnt = 0;
- int32_t MaxDataLen = EUART_RX_BUF_SIZE;
+ int32_t MaxDataLen = USART_RX_BUF_SIZE;
cndtr=get_uart1_dma_cndtr();
//缺少check保护
//如果正在往发送队列中添加数据，退出
@@ -54,24 +58,58 @@
m_bEUARTCheckingRec = 0;
return;
}
- DMACnt = EUART_RX_BUF_SIZE - cndtr;
- while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ DMACnt = USART_RX_BUF_SIZE - cndtr;
+ while( m_EUART_DMA_RXPtr_1 != DMACnt && MaxDataLen > 0)
{
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ Usart0ParseDataCallback(m_EUART_DMA_RXBuf_1[m_EUART_DMA_RXPtr_1]);
//waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ m_EUART_DMA_RXPtr_1++;
+ if( m_EUART_DMA_RXPtr_1 >= USART_RX_BUF_SIZE )
{
- m_EUART_DMA_RXPtr = 0;
+ m_EUART_DMA_RXPtr_1 = 0;
}
- DMACnt = EUART_RX_BUF_SIZE - cndtr;
+ DMACnt = USART_RX_BUF_SIZE - cndtr;
MaxDataLen--;
}
m_bEUARTCheckingRec = 0;
}
-
+void UART0_CheckReceive(void)
+{
+ uint32_t cndtr=0;
+ int32_t DMACnt = 0;
+ int32_t MaxDataLen = EUART_RX_BUF_SIZE;
+ cndtr=get_uart0_dma_cndtr();
+ //缺少check保护
+ //如果正在往发送队列中添加数据，退出
+ if(m_bEUARTPushingFrms)
+ return;
+ //判断是否正在Check
+ if(m_bEUARTCheckingRec)
+ return;
+ m_bEUARTCheckingRec = 1;
+ if(cndtr== 0)
+ {
+ m_bEUARTCheckingRec = 0;
+ return;
+ }
+ DMACnt = EUART_RX_BUF_SIZE - cndtr;
+ while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ {
+ Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ //waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
+ m_EUART_DMA_RXPtr++;
+ if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ {
+ m_EUART_DMA_RXPtr = 0;
+ }
+ DMACnt = EUART_RX_BUF_SIZE - cndtr;
+ MaxDataLen--;
+ }
+ m_bEUARTCheckingRec = 0;
+
+}
#ifndef EXUART_USE_TXDMA
//查询方式发送数据
--
Gitblit v1.9.3