From 0817c03a55b444ff4958723476f807486439e107 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期四, 24 七月 2025 17:43:29 +0800 Subject: [PATCH] 4G升级待详细测试,基本功能开发完成 --- keil/include/drivers/Usart.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/keil/include/drivers/Usart.c b/keil/include/drivers/Usart.c index c413b99..725449a 100644 --- a/keil/include/drivers/Usart.c +++ b/keil/include/drivers/Usart.c @@ -61,8 +61,41 @@ // 弃用此部分逻辑 // Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]); // 使用UART.c方法接入数据,以便使用STM32的逻辑 - Uart_SetChar(UART_ID_DBG_GPS, m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]); - DBG_Poll(); +// Uart_SetChar(UART_ID_DBG_GPS, m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]); +// DBG_Poll(); + +// //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--; + Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]); +// Usart1ParseDataHandler(m_EUART_DMA_RXBuf); +// DBG_Poll(); + //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; +} + +void INTERNET_CheckReceive(void) +{ + int32_t DMACnt = 0; + int32_t MaxDataLen = EUART_RX_BUF_SIZE; + + 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++; @@ -78,6 +111,9 @@ + + + #ifndef EXUART_USE_TXDMA //查询方式发送数据 void UART_CheckSend(void) -- Gitblit v1.9.3