-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2750 from hathach/fix-ch32v203-setup
rework fsdev driver, fix ch32v203 race condition and stability issue
- Loading branch information
Showing
15 changed files
with
659 additions
and
654 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| set(MCU_VARIANT stm32f103xe) | ||
| set(JLINK_DEVICE stm32f103ze) | ||
|
|
||
| string(TOUPPER ${MCU_VARIANT} MCU_VARIANT_UPPER) | ||
|
|
||
| set(LD_FILE_GNU ${ST_CMSIS}/Source/Templates/gcc/linker/${MCU_VARIANT_UPPER}_FLASH.ld) | ||
| set(LD_FILE_IAR ${ST_CMSIS}/Source/Templates/iar/linker/${MCU_VARIANT}_flash.icf) | ||
|
|
||
| function(update_board TARGET) | ||
| target_compile_definitions(${TARGET} PUBLIC | ||
| STM32F103xE | ||
| HSE_VALUE=8000000U | ||
| ) | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020, Ha Thach (tinyusb.org) | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * This file is part of the TinyUSB stack. | ||
| */ | ||
|
|
||
| #ifndef BOARD_H_ | ||
| #define BOARD_H_ | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| // LED | ||
| #define LED_PORT GPIOF | ||
| #define LED_PIN GPIO_PIN_6 | ||
| #define LED_STATE_ON 1 | ||
|
|
||
| // Button | ||
| #define BUTTON_PORT GPIOG | ||
| #define BUTTON_PIN GPIO_PIN_8 | ||
| #define BUTTON_STATE_ACTIVE 0 | ||
|
|
||
| // USB Connect | ||
| #define USB_CONNECT_PORT GPIOG | ||
| #define USB_CONNECT_PIN GPIO_PIN_11 | ||
| #define USB_CONNECT_STATE 0 | ||
|
|
||
| // UART | ||
| //#define UART_DEV USART1 | ||
| //#define UART_CLK_EN __HAL_RCC_USART1_CLK_ENABLE | ||
| //#define UART_GPIO_PORT GPIOA | ||
| //#define UART_GPIO_AF GPIO_AF1_USART1 | ||
| //#define UART_TX_PIN GPIO_PIN_9 | ||
| //#define UART_RX_PIN GPIO_PIN_10 | ||
|
|
||
| //--------------------------------------------------------------------+ | ||
| // RCC Clock | ||
| //--------------------------------------------------------------------+ | ||
| static inline void board_stm32f1_clock_init(void) | ||
| { | ||
| RCC_ClkInitTypeDef clkinitstruct = {0}; | ||
| RCC_OscInitTypeDef oscinitstruct = {0}; | ||
| RCC_PeriphCLKInitTypeDef rccperiphclkinit = {0}; | ||
|
|
||
| /* Enable HSE Oscillator and activate PLL with HSE as source */ | ||
| oscinitstruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; | ||
| oscinitstruct.HSEState = RCC_HSE_ON; | ||
| oscinitstruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; | ||
| oscinitstruct.PLL.PLLMUL = RCC_PLL_MUL9; | ||
| oscinitstruct.PLL.PLLState = RCC_PLL_ON; | ||
| oscinitstruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; | ||
| HAL_RCC_OscConfig(&oscinitstruct); | ||
|
|
||
| /* USB clock selection */ | ||
| rccperiphclkinit.PeriphClockSelection = RCC_PERIPHCLK_USB; | ||
| rccperiphclkinit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5; | ||
| HAL_RCCEx_PeriphCLKConfig(&rccperiphclkinit); | ||
|
|
||
| /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */ | ||
| clkinitstruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2); | ||
| clkinitstruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; | ||
| clkinitstruct.AHBCLKDivider = RCC_SYSCLK_DIV1; | ||
| clkinitstruct.APB1CLKDivider = RCC_HCLK_DIV2; | ||
| clkinitstruct.APB2CLKDivider = RCC_HCLK_DIV1; | ||
| HAL_RCC_ClockConfig(&clkinitstruct, FLASH_LATENCY_2); | ||
| } | ||
|
|
||
| static inline void board_vbus_sense_init(void) | ||
| { | ||
| } | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif /* BOARD_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| MCU_VARIANT = stm32f103xe | ||
|
|
||
| CFLAGS += -DSTM32F103xE -DHSE_VALUE=8000000U | ||
|
|
||
| # Linker | ||
| LD_FILE_GCC = ${ST_CMSIS}/Source/Templates/gcc/linker/STM32F103XE_FLASH.ld | ||
| LD_FILE_IAR = ${ST_CMSIS}/Source/Templates/iar/linker/${MCU_VARIANT}_flash.icf | ||
|
|
||
| # For flash-jlink target | ||
| JLINK_DEVICE = stm32f103ze | ||
|
|
||
| # flash target ROM bootloader | ||
| flash: flash-jlink |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.