From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 18 五月 2021 16:26:09 +0800 Subject: [PATCH] 修改基站类型未附值BUG --- 源码/核心板/Src/OnChipDevices/Usart.h | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 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 0cb0059..7884cfa 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,6 +3,12 @@ #define __USART_H__ #include "stm32f10x.h" +//#define BAUDRATE_19200 + +#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 @@ -20,12 +26,14 @@ #define EU_TX_GPIO GPIOA #endif -#define EXUART_BAUD_RADE 115200 + +#define EXUART_BAUD_RADE 9600 // 9600 19200 115200 + #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 //接收缓存大小 @@ -44,7 +52,7 @@ void UART_PushFrame(uint8_t* pdata, int32_t data_len); void UART_PopFrame(void); extern void (*Usart1ParseDataCallback)(uint8_t); - +extern u8 cmd_mode; #endif -- Gitblit v1.9.3