Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/YixingShen/tinyusb
Browse files Browse the repository at this point in the history
  • Loading branch information
YixingShen committed Jan 25, 2024
2 parents a7de4ac + ab7538d commit 611f9d9
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions hw/bsp/stm32f1/family.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ void board_init(void) {
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();

// Enable UART Clock
UART_CLK_EN();

#if CFG_TUSB_OS == OPT_OS_NONE
// 1ms tick timer
SysTick_Config(SystemCoreClock / 1000);
Expand All @@ -86,7 +83,10 @@ void board_init(void) {
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(BUTTON_PORT, &GPIO_InitStruct);

#ifdef UART_DEV
// UART
UART_CLK_EN();

GPIO_InitStruct.Pin = UART_TX_PIN | UART_RX_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
Expand All @@ -105,6 +105,7 @@ void board_init(void) {
.Init.OverSampling = UART_OVERSAMPLING_16
};
HAL_UART_Init(&UartHandle);
#endif

// USB Pins
// Configure USB DM and DP pins.
Expand Down

0 comments on commit 611f9d9

Please sign in to comment.