From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 31 May 2024 19:15:47 +0800
Subject: [PATCH] 测试和修改了一些功能bug

---
 HARDWARE/UART/uart.h |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/HARDWARE/UART/uart.h b/HARDWARE/UART/uart.h
index f80b405..40f069c 100644
--- a/HARDWARE/UART/uart.h
+++ b/HARDWARE/UART/uart.h
@@ -8,32 +8,44 @@
 
 // ��λ���汻�ɼ����ɼ�����
 #define UP_COMM_TX_PORT 			GPIOA
-#define UP_COMM_TX_PIN 			GPIO_Pin_8
+#define UP_COMM_TX_PIN 			GPIO_Pin_9
 #define UP_COMM_RX_PORT 			GPIOA
-#define UP_COMM_RX_PIN 			GPIO_Pin_9
+#define UP_COMM_RX_PIN 			GPIO_Pin_8
+#define UP_COMM_RE_PORT 			GPIOA
+#define UP_COMM_RE_PIN 			GPIO_Pin_10
+
+#define UP_COMM_RE_RECV_EN 			GPIO_ResetBits(UP_COMM_RE_PORT,UP_COMM_RE_PIN)
+#define UP_COMM_RE_SEND_EN 			GPIO_SetBits(UP_COMM_RE_PORT,UP_COMM_RE_PIN)
 
 #define	UP_COMM_UARTX					UART5
+#define	UP_COMM_UARTX_IRQn					UART5_IRQn
 #define UP_COMM_RECV_BUFF_LEN_MAX 1024
 
+#define	UP_COMM_DMA_CHX			DMA_CH2
 
 //RS485��ȡ������
 #define RS485_READ_DATA_TX_PORT 		GPIOB
-#define RS485_READ_DATA_TX_PIN 		GPIO_Pin_0
+#define RS485_READ_DATA_TX_PIN 		GPIO_Pin_1
 #define RS485_READ_DATA_RX_PORT 		GPIOB
-#define RS485_READ_DATA_RX_PIN 		GPIO_Pin_1
+#define RS485_READ_DATA_RX_PIN 		GPIO_Pin_0
 
 #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 WRC_TX_PORT 		GPIOA
-#define WRC_TX_PIN 		GPIO_Pin_8
-#define WRC_RX_PORT 		GPIOA
-#define WRC_RX_PIN 		GPIO_Pin_9
+#define	RS485_READ_DATA_DMA_CHX			DMA_CH3
 
-#define	WRC_UARTX					UART2
+// Զ��TX UART5
+#define WRC_TX_PORT 		GPIOE
+#define WRC_TX_PIN 		GPIO_Pin_4
+#define WRC_RX_PORT 		GPIOE
+#define WRC_RX_PIN 		GPIO_Pin_3
+
+#define	WRC_UARTX					UART1
+#define	WRC_UARTX_IRQn					UART1_IRQn
 #define WRC_RECV_BUFF_LEN_MAX 1024
+
+#define	WRC_DMA_CHX			DMA_CH3
 
 #pragma pack(1)
 
@@ -43,10 +55,20 @@
 extern u16 USART_RX_STA;         		//����״̬���	
 
 extern uint8_t RS485_read_data_recv_buff[RS485_READ_DATA_RECV_BUFF_LEN_MAX];
+extern uint8_t up_comm_recv_buff[UP_COMM_RECV_BUFF_LEN_MAX];
+extern uint8_t WRC_recv_buff[WRC_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 up_comm_uart_Init(uint32_t	BaudRate,UART_ParityBitTypeDef	ParityBit,UART_StopBitTypeDef		StopBit);
+void up_comm_RX_DMA_CH2_Init(void);
+void up_comm_RX_DMA_CH2_reload(void);
+
+void WRC_uart_Init(uint32_t	BaudRate,UART_ParityBitTypeDef	ParityBit,UART_StopBitTypeDef		StopBit);
+void WRC_RX_DMA_CH3_Init(void);
+void WRC_RX_DMA_CH3_reload(void);
 
 void UARTx_SendData_Normal(UART_Type* UARTx,uint8_t * pSendData,uint16_t send_len);
 

--
Gitblit v1.9.3