From 32fa4a5edfbd06a3c0be40a2f3890aae2c1a4d23 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 20 十二月 2019 10:50:00 +0800
Subject: [PATCH] ver1.15
---
源码/核心板/Src/OnChipDevices/Usart.c | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 1e90ab7..bcf91be 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"
@@ -12,7 +12,7 @@
//DMA数据接收缓存
uint8_t m_EUART_DMA_RXBuf[EUART_RX_BUF_SIZE]; //DMA数据接收缓存
volatile int32_t m_EUART_DMA_RXPtr = 0; //当前数据地址
-u16 DMA_rxtemp = 0; //当前数据地址缓存
+int16_t DMA_rxtemp = 0,DMA_rxtemp2 = 0; //当前数据地址缓存
u16 datadelaycount = 0; //剩余1位数据延时等待处理
//标志变量
volatile uint8_t m_bEUARTPushingFrms = 0; //正在往发送队列存数据
@@ -124,7 +124,8 @@
UART_DMAConfiguration();
}
-
+u8 overrun_flag=0;
+u16 t1,t2,t3,t4;
void UART_CheckReceive(void)
{
int32_t DMACnt = 0;
@@ -151,31 +152,39 @@
if(DMACnt!=m_EUART_DMA_RXPtr)
{
//DMA有未处理数据
- DMA_rxtemp=m_EUART_DMA_RXPtr;
- DMA_rxtemp++;
+ DMA_rxtemp=m_EUART_DMA_RXPtr+1;
+ delay_us(10);
+ overrun_flag=0;
if( DMA_rxtemp >= EUART_RX_BUF_SIZE )
{
DMA_rxtemp = 0;
}
DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);//DMACnt是DMA通道接收到数据总长度,CNDTR是dma剩余未使用数量
- if(DMACnt!=DMA_rxtemp)
+ if(DMACnt!=DMA_rxtemp&&(cmd_mode==0))
{
//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==0))
+ if((buftemp1==0x55)&&(buftemp2==0xAA))
{
//私有协议
cmd_mode = 1;
}
- else if((buftemp1==RS485_Addr)&&(cmd_mode==0))
+ 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
{
@@ -205,6 +214,7 @@
if(++datadelaycount > WAITDELAYCOUNT)
{ //超出等待次数
datadelaycount = 0;
+ cmd_mode=0;
m_EUART_DMA_RXPtr++;
if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
{
@@ -230,9 +240,10 @@
else if(cmd_mode==2)
{
//modbus协议
- delay_ms(1);//等待数据接收完成
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- while(m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ 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++;
@@ -249,7 +260,9 @@
// {
// m_EUART_DMA_RXPtr = 0;
// }
- RS485_Service();
+ t2++;
+ RS485_Service();
+ }
}
}
@@ -282,6 +295,7 @@
{
OUT485_DISABLE;
m_bEUARTTxEn = 0;
+ t3++;
// temp32 = GPIOC->CRH; //C10悬空输入
// temp32 &= ~(0x00000000F<<8);
// temp32 |= (0x000000004<<8);
@@ -291,10 +305,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