modify buardrate

This commit is contained in:
huang 2024-02-29 11:15:49 +08:00
parent 38a087717c
commit 1dffac3f88
2 changed files with 11 additions and 10 deletions

View File

@ -62,7 +62,6 @@ extern RxBuffer2;
extern uint16_t UART_ReceiveData(USART_TypeDef* USARTx); extern uint16_t UART_ReceiveData(USART_TypeDef* USARTx);
void InitBoardHardware() void InitBoardHardware()
{ {
_SysTick_Config(SystemCoreClock / TICK_PER_SECOND); _SysTick_Config(SystemCoreClock / TICK_PER_SECOND);
/* initialize memory system */ /* initialize memory system */
InitBoardMemory(MEMORY_START_ADDRESS, (void*)MEMORY_END_ADDRESS); InitBoardMemory(MEMORY_START_ADDRESS, (void*)MEMORY_END_ADDRESS);
@ -70,17 +69,19 @@ void InitBoardHardware()
#ifdef BSP_USING_UART4 #ifdef BSP_USING_UART4
InstallConsole("uart4", "uart4_drv", "uart4_dev4"); InstallConsole("uart4", "uart4_drv", "uart4_dev4");
#endif #endif
// #ifdef BSP_USING_UART2
// InstallConsole("uart2", "uart2_drv", "uart2_dev2");
// #endif
#ifdef BSP_USING_ETH #ifdef BSP_USING_ETH
InitHwEth(); InitHwEth();
#endif #endif
KPrintf("consle init completed.\n"); KPrintf("consle init completed.\n");
KPrintf("board initialization......\n"); KPrintf("board initialization......\n");
KPrintf("board init done.\n"); KPrintf("board init done.\n");
KPrintf("start okernel...\n"); KPrintf("start okernel...\n");
// while (1) {
// uint32_t ans = (uint32_t)UART_ReceiveData(USART3);
// KPrintf("%d\n", ans);
// for (int i = 0; i < 10000; i++)
// ;
// }
} }

View File

@ -167,7 +167,7 @@ static int SerialGetChar(struct SerialHardwareDevice* serial_dev)
} }
static const struct SerialDataCfg data_cfg_init = { static const struct SerialDataCfg data_cfg_init = {
.serial_baud_rate = 1500000, .serial_baud_rate = BAUD_RATE_9600,
.serial_data_bits = DATA_BITS_8, .serial_data_bits = DATA_BITS_8,
.serial_stop_bits = STOP_BITS_1, .serial_stop_bits = STOP_BITS_1,
.serial_parity_mode = PARITY_NONE, .serial_parity_mode = PARITY_NONE,
@ -259,7 +259,7 @@ void USART1_IRQHandler(void)
uint16_t UART_ReceiveData(USART_TypeDef* USARTx) uint16_t UART_ReceiveData(USART_TypeDef* USARTx)
{ {
return (uint16_t)(USARTx->DATAR & (uint16_t)0x01FF); return (uint16_t)(USARTx->DATAR);
} }
#ifdef BSP_USING_UART2 #ifdef BSP_USING_UART2
@ -365,7 +365,7 @@ int InitHwUart(void)
GPIO_Init(GPIOA, &gpio_init_struct); GPIO_Init(GPIOA, &gpio_init_struct);
USART_InitTypeDef usart_init_struct; USART_InitTypeDef usart_init_struct;
usart_init_struct.USART_BaudRate = 1500000; usart_init_struct.USART_BaudRate = 9600;
usart_init_struct.USART_HardwareFlowControl = USART_HardwareFlowControl_None; usart_init_struct.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; usart_init_struct.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct.USART_WordLength = USART_WordLength_8b; usart_init_struct.USART_WordLength = USART_WordLength_8b;
@ -429,7 +429,7 @@ int InitHwUart(void)
GPIO_Init(GPIOB, &gpio_init_struct_2); GPIO_Init(GPIOB, &gpio_init_struct_2);
USART_InitTypeDef usart_init_struct_2; USART_InitTypeDef usart_init_struct_2;
usart_init_struct_2.USART_BaudRate = 1500000; usart_init_struct_2.USART_BaudRate = 9600;
usart_init_struct_2.USART_HardwareFlowControl = USART_HardwareFlowControl_None; usart_init_struct_2.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct_2.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; usart_init_struct_2.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct_2.USART_WordLength = USART_WordLength_8b; usart_init_struct_2.USART_WordLength = USART_WordLength_8b;
@ -493,7 +493,7 @@ int InitHwUart(void)
GPIO_Init(GPIOC, &gpio_init_struct_4); GPIO_Init(GPIOC, &gpio_init_struct_4);
USART_InitTypeDef usart_init_struct_4; USART_InitTypeDef usart_init_struct_4;
usart_init_struct_4.USART_BaudRate = 1500000; usart_init_struct_4.USART_BaudRate = 9600;
usart_init_struct_4.USART_HardwareFlowControl = USART_HardwareFlowControl_None; usart_init_struct_4.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
usart_init_struct_4.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; usart_init_struct_4.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
usart_init_struct_4.USART_WordLength = USART_WordLength_8b; usart_init_struct_4.USART_WordLength = USART_WordLength_8b;