From 4a13529748c983ff0d5627a28365ad7737141016 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 二月 2022 09:31:49 +0800
Subject: [PATCH] V1.62
---
源码/核心板/Src/OnChipDevices/Usart.c | 139 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 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 e208c34..776f8d1 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,7 @@
#include "Usart.h"
#include <string.h>
#include <stdio.h>
-
+#include "modbus.h"
//数据发送队列变量
EUART_Frame m_EUART_TxFrames[EUART_TX_FRM_SIZE]; //数据发送帧队列
volatile int8_t m_EUART_TxFrm_Tail = 0; //数据发送帧队列尾指针
@@ -10,6 +10,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; //正在确认数据发送
@@ -121,11 +123,17 @@
}
+extern u8 cmd_mode;
+u8 overrun_flag=0;
+u16 t1,t2,t3,t4;
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;
@@ -138,20 +146,127 @@
m_bEUARTCheckingRec = 0;
return;
}
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+
+ DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);//DMACnt是DMA通道接收到数据总长度,CNDTR是dma剩余未使用数量
+
+ if(DMACnt!=m_EUART_DMA_RXPtr)
{
- Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ //DMA有未处理数据
+ DMA_rxtemp=m_EUART_DMA_RXPtr+1;
delay_us(10);
- m_EUART_DMA_RXPtr++;
- if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ overrun_flag=0;
+ if( DMA_rxtemp >= EUART_RX_BUF_SIZE )
{
- m_EUART_DMA_RXPtr = 0;
+ DMA_rxtemp = 0;
}
- DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);
- MaxDataLen--;
- }
- m_bEUARTCheckingRec = 0;
+ DMACnt = EUART_RX_BUF_SIZE - (EUART_RX_DMA_CH->CNDTR);//DMACnt是DMA通道接收到数据总长度,CNDTR是dma剩余未使用数量
+ 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 = 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;
+ }
+ }
+ }
+ }
+ 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;
}
--
Gitblit v1.9.3