From 5bdc868b2ef673bbce5e0abbc2a7bf8f7f8fa55e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 27 四月 2021 11:59:30 +0800
Subject: [PATCH] V2.17 增加基站汇总模式，青岛待测试
---
源码/核心板/Src/OnChipDevices/Usart.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
index fec7f44..6e9b0e5 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
@@ -9,7 +9,7 @@
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; //当前数据地址
+volatile int32_t m_EUART_DMA_RXPtr = 0,m_EUART2_DMA_RXPtr = 0; //当前数据地址
//标志变量
volatile uint8_t m_bEUARTPushingFrms = 0; //正在往发送队列存数据
volatile uint8_t m_bEUARTCheckingSend = 0; //正在确认数据发送
@@ -204,8 +204,7 @@
//发送一个字节数据
EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
- EXT_UART2->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
- s_count++;
+ s_count++;
if(s_count >= m_EUART_TxFrames[m_EUART_TxFrm_Tail].len) //一帧数据发送完毕
{
s_count = 0;
@@ -438,14 +437,14 @@
return;
}
DMACnt = EUART_RX_BUF_SIZE - (UART2_RX_DMA_CH->CNDTR);
- while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ while( m_EUART2_DMA_RXPtr != DMACnt && MaxDataLen > 0)
{
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART2_DMA_RXPtr]);
delay_us(10);
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ m_EUART2_DMA_RXPtr++;
+ if( m_EUART2_DMA_RXPtr >= EUART_RX_BUF_SIZE )
{
- m_EUART_DMA_RXPtr = 0;
+ m_EUART2_DMA_RXPtr = 0;
}
DMACnt = EUART_RX_BUF_SIZE - (UART2_RX_DMA_CH->CNDTR);
MaxDataLen--;
--
Gitblit v1.9.3