From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理

---
 HARDWARE/UART/uart.h |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/HARDWARE/UART/uart.h b/HARDWARE/UART/uart.h
index 6dc8882..f80b405 100644
--- a/HARDWARE/UART/uart.h
+++ b/HARDWARE/UART/uart.h
@@ -6,30 +6,34 @@
 
 #define UART0_RECV_BUFF_LEN_MAX 200
 
-// ����TX UART0/LPUART0
-#define IR_TX_PORT 			GPIOF
-#define IR_TX_PIN 			GPIO_Pin_4
-// ����RX
-#define IR_RX_PORT 			GPIOF
-#define IR_RX_PIN 			GPIO_Pin_3
+// ��λ���汻�ɼ����ɼ�����
+#define UP_COMM_TX_PORT 			GPIOA
+#define UP_COMM_TX_PIN 			GPIO_Pin_8
+#define UP_COMM_RX_PORT 			GPIOA
+#define UP_COMM_RX_PIN 			GPIO_Pin_9
 
-// ����TX UART3
-#define MAIN_TX_PORT 		GPIOC
-#define MAIN_TX_PIN 		GPIO_Pin_10
+#define	UP_COMM_UARTX					UART5
+#define UP_COMM_RECV_BUFF_LEN_MAX 1024
 
-// ����RX
-#define MAIN_RX_PORT 		GPIOC
-#define MAIN_RX_PIN 		GPIO_Pin_11
+
+//RS485��ȡ������
+#define RS485_READ_DATA_TX_PORT 		GPIOB
+#define RS485_READ_DATA_TX_PIN 		GPIO_Pin_0
+#define RS485_READ_DATA_RX_PORT 		GPIOB
+#define RS485_READ_DATA_RX_PIN 		GPIO_Pin_1
+
+#define	RS485_READ_DATA_UARTX					UART1
+#define	RS485_READ_DATA_UARTX_IRQn					UART1_IRQn
+#define RS485_READ_DATA_RECV_BUFF_LEN_MAX 256
 
 // Զ��TX UART5
-#define GPRS_TX_PORT 		GPIOA
-#define GPRS_TX_PIN 		GPIO_Pin_8
+#define WRC_TX_PORT 		GPIOA
+#define WRC_TX_PIN 		GPIO_Pin_8
+#define WRC_RX_PORT 		GPIOA
+#define WRC_RX_PIN 		GPIO_Pin_9
 
-// Զ��RX
-#define GPRS_RX_PORT 		GPIOA
-#define GPRS_RX_PIN 		GPIO_Pin_9
-
-
+#define	WRC_UARTX					UART2
+#define WRC_RECV_BUFF_LEN_MAX 1024
 
 #pragma pack(1)
 
@@ -37,15 +41,12 @@
 #pragma pack()
 
 extern u16 USART_RX_STA;         		//����״̬���	
-extern uint8_t  USART1_RX_BUF[UART0_RECV_BUFF_LEN_MAX]; //���ջ���,���USART_REC_LEN���ֽ�.ĩ�ֽ�Ϊ���з� 
 
+extern uint8_t RS485_read_data_recv_buff[RS485_READ_DATA_RECV_BUFF_LEN_MAX];
+void RS485_read_data_uart_Init(uint32_t	BaudRate,UART_ParityBitTypeDef	ParityBit,UART_StopBitTypeDef		StopBit);
+void RS485_read_data_RX_DMA_CH3_Init(void);
+void RS485_read_data_RX_DMA_CH3_reload(void);
 
-void Uart0_Init(void);
-void Uart0_RX_DMA_CH7_Init(void);
-void Uart3_Init(void);
-void Uart3_RX_DMA_CH1_Init(void);
-void Uart5_Init(void);
-void Uart5_RX_DMA_CH5_Init(void);
 
 void UARTx_SendData_Normal(UART_Type* UARTx,uint8_t * pSendData,uint16_t send_len);
 

--
Gitblit v1.9.3