From c7bcc24c444c9b9197beb9ce6541f85e6b4f8c5c Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 06 四月 2021 11:00:08 +0800 Subject: [PATCH] 增加WIFI串口输出模式,待测试 --- 源码/核心板/Src/OnChipDevices/Usart.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" index 3041a96..7201f11 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" @@ -3,8 +3,11 @@ #define __USART_H__ #include "stm32f10x.h" -#include <string.h> +#define EU_485_PIN GPIO_Pin_7 +#define EU_485_GPIO GPIOB +#define OUT485_ENABLE GPIO_WriteBit(EU_485_GPIO, EU_485_PIN, Bit_SET); +#define OUT485_DISABLE GPIO_WriteBit(EU_485_GPIO, EU_485_PIN, Bit_RESET); //#define UART_GPIO_REMAP_ENABLE #ifdef UART_GPIO_REMAP_ENABLE @@ -27,7 +30,9 @@ #define EUART_RX_DMA_CH DMA1_Channel5 #define EUART_TX_DMA_CH DMA1_Channel4 -#define EUART_TX_FRM_SIZE 4 //发送队列中的最大帧数 + + +#define EUART_TX_FRM_SIZE 14 //发送队列中的最大帧数 #define EUART_TX_FRMBUF_SIZE 200 //发送队列每帧缓存大小 #define EUART_RX_BUF_SIZE 200 //接收缓存大小 @@ -46,7 +51,8 @@ void UART_PushFrame(uint8_t* pdata, int32_t data_len); void UART_PopFrame(void); extern void (*Usart1ParseDataCallback)(uint8_t); - - +////////////////////////////////////////////////////////// +#define EXT_UART2 USART2 +#define UART2_RX_DMA_CH DMA1_Channel6 #endif -- Gitblit v1.9.3