From 5102fff8a13c0319d8125a51d3d2354e7aacdcea Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 31 七月 2025 16:40:06 +0800
Subject: [PATCH] 修改为2HZ发poll包，修改second task从原来2s一次为1s一次
---
keil/include/drivers/Usart.c | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/keil/include/drivers/Usart.c b/keil/include/drivers/Usart.c
index 3256a82..f57a0aa 100644
--- a/keil/include/drivers/Usart.c
+++ b/keil/include/drivers/Usart.c
@@ -11,17 +11,31 @@
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数据接收缓存
-volatile int32_t m_EUART_DMA_RXPtr = 0; //当前数据地址
+uint8_t m_EUART0_DMA_RXBuf[EUART0_RX_BUF_SIZE]; //DMA数据接收缓存
+uint8_t m_EUART1_DMA_RXBuf[EUART1_RX_BUF_SIZE]; //DMA数据接收缓存
+volatile int32_t m_EUART0_DMA_RXPtr = 0; //当前数据地址
+extern int32_t m_EUART1_DMA_RXPtr;
+//volatile int32_t m_EUART1_DMA_RXPtr = 0; //当前数据地址
//int16_t DMA_rxtemp = 0,DMA_rxtemp2 = 0; //当前数据地址缓存
//uint16_t datadelaycount = 0; //剩余1位数据延时等待处理
//标志变量
+volatile uint8_t m_bEUART0PushingFrms = 0; //正在往发送队列存数据
+volatile uint8_t m_bEUART0CheckingSend = 0; //正在确认数据发送
+volatile uint8_t m_bEUART0CheckingRec = 0; //正在确认接收数据
+volatile uint8_t m_bEUART0TxEn = 0; //使能发送
+
+extern uint8_t m_bEUART1PushingFrms; //正在往发送队列存数据
+extern uint8_t m_bEUART1CheckingSend; //正在确认数据发送
+extern uint8_t m_bEUART1CheckingRec; //正在确认接收数据
+extern uint8_t m_bEUART1TxEn; //使能发送
+
volatile uint8_t m_bEUARTPushingFrms = 0; //正在往发送队列存数据
volatile uint8_t m_bEUARTCheckingSend = 0; //正在确认数据发送
volatile uint8_t m_bEUARTCheckingRec = 0; //正在确认接收数据
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,41 +49,75 @@
//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 = EUART1_RX_BUF_SIZE;
cndtr=get_uart1_dma_cndtr();
//缺少check保护
//如果正在往发送队列中添加数据，退出
- if(m_bEUARTPushingFrms)
+ if(m_bEUART1PushingFrms)
return;
//判断是否正在Check
- if(m_bEUARTCheckingRec)
+ if(m_bEUART1CheckingRec)
return;
- m_bEUARTCheckingRec = 1;
+ m_bEUART1CheckingRec = 1;
if(cndtr== 0)
{
- m_bEUARTCheckingRec = 0;
+ m_bEUART1CheckingRec = 0;
return;
}
- DMACnt = EUART_RX_BUF_SIZE - cndtr;
- while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ DMACnt = EUART1_RX_BUF_SIZE - cndtr;
+ while( m_EUART1_DMA_RXPtr != DMACnt && MaxDataLen > 0)
{
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ Usart1ParseDataCallback(m_EUART1_DMA_RXBuf[m_EUART1_DMA_RXPtr]);
//waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ m_EUART1_DMA_RXPtr++;
+ if( m_EUART1_DMA_RXPtr >= EUART0_RX_BUF_SIZE )
{
- m_EUART_DMA_RXPtr = 0;
+ m_EUART1_DMA_RXPtr = 0;
}
- DMACnt = EUART_RX_BUF_SIZE - cndtr;
+ DMACnt = EUART0_RX_BUF_SIZE - cndtr;
MaxDataLen--;
}
- m_bEUARTCheckingRec = 0;
+ m_bEUART1CheckingRec = 0;
}
+void UART0_CheckReceive(void)
+{ uint32_t cndtr=0;
+ int32_t DMACnt = 0;
+ int32_t MaxDataLen = EUART0_RX_BUF_SIZE;
+ cndtr=get_uart0_dma_cndtr();
+ //缺少check保护
+ //如果正在往发送队列中添加数据，退出
+ if(m_bEUART0PushingFrms)
+ return;
+ //判断是否正在Check
+ if(m_bEUART0CheckingRec)
+ return;
+ m_bEUART0CheckingRec = 1;
+ if(cndtr== 0)
+ {
+ m_bEUART0CheckingRec = 0;
+ return;
+ }
+ DMACnt = EUART0_RX_BUF_SIZE - cndtr;
+ while( m_EUART0_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ {
+ Usart0ParseDataCallback(m_EUART0_DMA_RXBuf[m_EUART0_DMA_RXPtr]);
+ //waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
+ m_EUART0_DMA_RXPtr++;
+ if( m_EUART0_DMA_RXPtr >= EUART0_RX_BUF_SIZE )
+ {
+ m_EUART0_DMA_RXPtr = 0;
+ }
+ DMACnt = EUART0_RX_BUF_SIZE - cndtr;
+ MaxDataLen--;
+ }
+ m_bEUART0CheckingRec = 0;
+
+}
#ifndef EXUART_USE_TXDMA
@@ -80,9 +128,9 @@
// static int32_t s_count = 0;
//// uint32_t temp32 = 0;
- if(m_bEUARTPushingFrms || m_bEUARTCheckingSend)
- return;
- m_bEUARTCheckingSend = 1;
+// if(m_bEUARTPushingFrms || m_bEUARTCheckingSend)
+// return;
+// m_bEUARTCheckingSend = 1;
// //判断队列是否为空以及DMA是否空闲
// //if ((EXT_UART->ISR & UART_FLAG_TXE) == (uint16_t)RESET) //上次发送未完成//MK8000修改
--
Gitblit v1.9.3