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 | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 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 6ed2bf7..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,6 +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; //数据发送帧队列尾指针
@@ -9,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; //正在确认数据发送
@@ -16,7 +21,6 @@
volatile uint8_t m_bEUARTTxEn = 0; //使能发送
void (*Usart1ParseDataCallback)(uint8_t);
-
void Usart1InitVariables(void)
{
m_EUART_TxFrm_FreeFrmLen = EUART_TX_FRM_SIZE-1;
@@ -82,14 +86,18 @@
//初始化管脚
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);
GPIO_InitStructure.GPIO_Pin = EU_TX_PIN;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP
GPIO_Init(EU_TX_GPIO, &GPIO_InitStructure);
+ GPIO_InitStructure.GPIO_Pin = EU_485_PIN;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP
+ GPIO_Init(EU_485_GPIO, &GPIO_InitStructure);
+ OUT485_DISABLE;
#ifdef UART_GPIO_REMAP_ENABLE
GPIO_PinRemapConfig(UART_GPIO_REMAP, ENABLE);
#endif
@@ -109,14 +117,19 @@
USART_ClockInit(EXT_UART, &USART_ClockInitStructure);
USART_Init(EXT_UART, &USART_InitStructure);
-
+// USART_ITConfig(EXT_UART, USART_IT_RXNE, ENABLE);//??????,????? ??????????
// Enable the USARTx
USART_Cmd(EXT_UART, ENABLE);
//DMA配置（须放到UART初始化之后）
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;
@@ -134,10 +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]);
+ 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 )
{
@@ -148,7 +178,6 @@
}
m_bEUARTCheckingRec = 0;
}
-
#ifndef EXUART_USE_TXDMA
//查询方式发送数据
@@ -174,7 +203,9 @@
{
if(m_bEUARTTxEn)
{
+ OUT485_DISABLE;
m_bEUARTTxEn = 0;
+ t3++;
// temp32 = GPIOC->CRH; //C10悬空输入
// temp32 &= ~(0x00000000F<<8);
// temp32 |= (0x000000004<<8);
@@ -184,14 +215,23 @@
m_bEUARTCheckingSend = 0;
return;
}
+
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);
// GPIOC->CRH = temp32;// */
}
+
//发送一个字节数据
EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
s_count++;
@@ -287,4 +327,29 @@
m_EUART_TxFrm_Head = EUART_TX_FRM_SIZE-1;
m_EUART_TxFrm_FreeFrmLen++;
}
+void USART_putc(char c)
+{
+ //while(!(USART2->SR & 0x00000040));
+ //USART_SendData(USART2,c);
+ /* e.g. write a character to the USART */
+ USART_SendData(USART1, c);
+
+ /* Loop until the end of transmission */
+ while (USART_GetFlagStatus(USART1, USART_FLAG_TC) == RESET) ;
+}
+void USART_puts(uint8_t *s,uint8_t len)
+{
+ int i;
+ for(i=0; i<len; i++)
+ {
+ USART_putc(s[i]);
+ }
+}
+int fputc(int ch, FILE *f)
+{
+
+ USART_SendData(USART1, (unsigned char) ch);// USART1 ???? USART2 ?
+ while (!(USART1->SR & USART_FLAG_TXE));
+ return (ch);
+}
--
Gitblit v1.9.3