From d4e52e570a19bee6932b8ad34c5bd5966b1d3d3a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 08 十一月 2021 16:45:53 +0800
Subject: [PATCH] 菲曼模组测试完成
---
源码/核心板/Src/OnChipDevices/Usart.c | 158 +++++++++++-----------------------------------------
1 files changed, 35 insertions(+), 123 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 822e860..fbc2616 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"
@@ -3,7 +3,7 @@
#include <stdio.h>
#include "modbus.h"
#include "Rcc_Nvic_Systick.h"
-
+#include "global_param.h"
//数据发送队列变量
EUART_Frame m_EUART_TxFrames[EUART_TX_FRM_SIZE]; //数据发送帧队列
volatile int8_t m_EUART_TxFrm_Tail = 0; //数据发送帧队列尾指针
@@ -86,7 +86,7 @@
//初始化管脚
GPIO_InitStructure.GPIO_Pin = EU_RX_PIN;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING; //Rx上拉输入
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; //Rx上拉输入
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(EU_RX_GPIO, &GPIO_InitStructure);
@@ -124,16 +124,17 @@
UART_DMAConfiguration();
}
-u8 overrun_flag=0;
+u8 overrun_flag=0,receiveingdata_flag,gpsdataready_flag;
+u8 RTCMdata[2000];
+u32 lastusartdata_timer;
+u16 rtcm_i,gps_packlen;
u16 t1,t2,t3,t4;
+extern volatile uint32_t time32_incr;
void UART_CheckReceive(void)
{
int32_t DMACnt = 0;
int32_t MaxDataLen = EUART_RX_BUF_SIZE;
- u8 rxbuf_len = 0;
- u8 buftemp1 = 0;
- u8 buftemp2 = 0;
- u8 i = 0;
+
//如果正在往发送队列中添加数据，退出
if(m_bEUARTPushingFrms)
return;
@@ -146,127 +147,36 @@
m_bEUARTCheckingRec = 0;
return;
}
-
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);//DMACnt是DMA通道接收到数据总长度,CNDTR是dma剩余未使用数量
-
- if(DMACnt!=m_EUART_DMA_RXPtr)
+ if(time32_incr-lastusartdata_timer>300&&receiveingdata_flag)
{
- //DMA有未处理数据
- DMA_rxtemp=m_EUART_DMA_RXPtr+1;
- delay_us(10);
- overrun_flag=0;
- if( DMA_rxtemp >= EUART_RX_BUF_SIZE )
+ gpsdataready_flag = 1;
+ receiveingdata_flag = 0;
+ gps_packlen = rtcm_i;
+ rtcm_i = 0;
+ t1++;
+ if(g_com_map[DEV_ROLE])
{
- DMA_rxtemp = 0;
+ UWBSendOnePackData(RTCMdata,gps_packlen);
+ gpsdataready_flag = 0;
}
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);//DMACnt是DMA通道接收到数据总长度,CNDTR是dma剩余未使用数量
- if(DMACnt!=DMA_rxtemp&&(cmd_mode==0))
+ }
+ DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
+ while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ {
+ receiveingdata_flag = 1;
+ lastusartdata_timer = time32_incr;
+ //Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ RTCMdata[rtcm_i++] = m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr];
+ //delay_us(10);
+ m_EUART_DMA_RXPtr++;
+ if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
{
- //DMA有超过2位数据未处理
- DMA_rxtemp = 0;//清空数组指针
- datadelaycount = 0;//等待次数清零
- buftemp1 = m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr];
- buftemp2 = m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr+1];
- if((buftemp1==0x55)&&(buftemp2==0xAA))
- {
- //私有协议
- cmd_mode = 1;
- }
- else if(buftemp1==RS485_Addr)
- {
- if((buftemp2==03)||(buftemp2==06)||(buftemp2==16))//功能码正确
- {
- //modubs协议
- t1++;
- cmd_mode=2;
- DMA_rxtemp2=m_EUART_DMA_RXPtr+7;
- if( DMA_rxtemp2 >= EUART_RX_BUF_SIZE-1 )
- {
- DMA_rxtemp2 -= EUART_RX_BUF_SIZE;
- overrun_flag=1;
- }
- }
- else
- {
- m_EUART_DMA_RXPtr+=2;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
- {
- m_EUART_DMA_RXPtr = 0;
- }
- }
- }
- else
- {
- //无效码，干扰码
- if(cmd_mode==0)
- {
- m_EUART_DMA_RXPtr+=2;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
- {
- m_EUART_DMA_RXPtr = 0;
- }
- }
- }
+ m_EUART_DMA_RXPtr = 0;
}
- else
- {
- //只有1位数据未处理
- if(++datadelaycount > WAITDELAYCOUNT)
- { //超出等待次数
- datadelaycount = 0;
- cmd_mode=0;
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
- {
- m_EUART_DMA_RXPtr = 0;
- }
- }
- }
- if(cmd_mode==1)
- {
- //私有协议
- while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
- {
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
- {
- m_EUART_DMA_RXPtr = 0;
- }
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- MaxDataLen--;
- }
- }
- else if(cmd_mode==2)
- {
- //modbus协议
- // delay_ms(10);//等待数据接收完成
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- if((overrun_flag==0&&DMACnt>DMA_rxtemp2)||(overrun_flag==1&&DMACnt<DMA_rxtemp&&DMACnt>DMA_rxtemp2))
- { while(m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
- {
- RS485_RX_BUFF[i] = m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr];
- m_EUART_DMA_RXPtr++;
- if(++i >= EUART_RX_BUF_SIZE)i = 0;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
- {
- m_EUART_DMA_RXPtr = 0;
- }
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- MaxDataLen--;
- }
-// m_EUART_DMA_RXPtr++;//数据指向下一位
-// if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
-// {
-// m_EUART_DMA_RXPtr = 0;
-// }
- t2++;
- RS485_Service();
- }
- }
- }
-
- m_bEUARTCheckingRec = 0;
+ DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
+ MaxDataLen--;
+ }
+ m_bEUARTCheckingRec = 0;
}
#ifndef EXUART_USE_TXDMA
@@ -313,6 +223,8 @@
t4++;
#ifdef BAUDRATE_19200
delay_us(500);
+ #else
+ delay_us(10);
#endif
// temp32 = GPIOC->CRH; //C10复用推挽输出
// temp32 &= ~(0x00000000F<<8);
--
Gitblit v1.9.3