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 | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 66396fa..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"
@@ -1,7 +1,9 @@
#include "Usart.h"
#include <string.h>
#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; //数据发送帧队列尾指针
@@ -10,6 +12,8 @@
//DMA数据接收缓存
uint8_t m_EUART_DMA_RXBuf[EUART_RX_BUF_SIZE]; //DMA数据接收缓存
volatile int32_t m_EUART_DMA_RXPtr = 0; //当前数据地址
+int16_t DMA_rxtemp = 0,DMA_rxtemp2 = 0; //当前数据地址缓存
+u16 datadelaycount = 0; //剩余1位数据延时等待处理
//标志变量
volatile uint8_t m_bEUARTPushingFrms = 0; //正在往发送队列存数据
volatile uint8_t m_bEUARTCheckingSend = 0; //正在确认数据发送
@@ -82,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);
@@ -120,7 +124,12 @@
UART_DMAConfiguration();
}
-
+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;
@@ -138,11 +147,27 @@
m_bEUARTCheckingRec = 0;
return;
}
+ if(time32_incr-lastusartdata_timer>300&&receiveingdata_flag)
+ {
+ gpsdataready_flag = 1;
+ receiveingdata_flag = 0;
+ gps_packlen = rtcm_i;
+ rtcm_i = 0;
+ t1++;
+ if(g_com_map[DEV_ROLE])
+ {
+ UWBSendOnePackData(RTCMdata,gps_packlen);
+ gpsdataready_flag = 0;
+ }
+ }
DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
{
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
- delay_us(10);
+ 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 )
{
@@ -153,7 +178,6 @@
}
m_bEUARTCheckingRec = 0;
}
-
#ifndef EXUART_USE_TXDMA
//查询方式发送数据
@@ -181,6 +205,7 @@
{
OUT485_DISABLE;
m_bEUARTTxEn = 0;
+ t3++;
// temp32 = GPIOC->CRH; //C10悬空输入
// temp32 &= ~(0x00000000F<<8);
// temp32 |= (0x000000004<<8);
@@ -190,10 +215,17 @@
m_bEUARTCheckingSend = 0;
return;
}
- OUT485_ENABLE;
+
if(!m_bEUARTTxEn)
{
m_bEUARTTxEn = 1;
+ OUT485_ENABLE;
+ t4++;
+ #ifdef BAUDRATE_19200
+ delay_us(500);
+ #else
+ delay_us(10);
+ #endif
// temp32 = GPIOC->CRH; //C10复用推挽输出
// temp32 &= ~(0x00000000F<<8);
// temp32 |= (0x000000009<<8);
--
Gitblit v1.9.3