djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use our own flag for board crystal config.

This commit is contained in:
Scott Shawcroft 2020-04-21 14:14:30 -07:00
parent bebf27e733
commit 17d038830d
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
14 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm/boards/espruino_pico/mpconfigboard.h
View File

@ -36,5 +36,5 @@
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)

2
ports/stm/boards/espruino_wifi/mpconfigboard.h
View File

@ -33,5 +33,5 @@
#define FLASH_PAGE_SIZE (0x4000) //16K
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
#define BOARD_OVERWRITE_SWD (1)

2
ports/stm/boards/feather_stm32f405_express/mpconfigboard.h
View File

@ -36,7 +36,7 @@
#define BOARD_OSC_DIV (12)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
// On-board flash
#define SPI_FLASH_MOSI_PIN (&pin_PB05)

2
ports/stm/boards/meowbit_v121/mpconfigboard.h
View File

@ -36,7 +36,7 @@
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
#define BOARD_OSC_DIV (12)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
#define HSE_VALUE ((uint32_t)12000000U)
#define LSE_VALUE ((uint32_t)32000U)

2
ports/stm/boards/nucleo_f767zi/mpconfigboard.h
View File

@ -33,4 +33,4 @@
#define FLASH_PAGE_SIZE (0x4000)
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)

2
ports/stm/boards/nucleo_h743zi_2/mpconfigboard.h
View File

@ -32,4 +32,4 @@
#define FLASH_PAGE_SIZE (0x4000)
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)

3
ports/stm/boards/pyb_nano_v2/mpconfigboard.h
View File

@ -33,8 +33,7 @@
#define FLASH_PAGE_SIZE (0x4000)
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define LSE_VALUE ((uint32_t)32768U)
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
// On-board flash
#define SPI_FLASH_MOSI_PIN (&pin_PB15)

2
ports/stm/boards/pyboard_v11/mpconfigboard.h
View File

@ -33,7 +33,7 @@
#define FLASH_PAGE_SIZE (0x4000)
#define BOARD_OSC_DIV (12)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
#define HSE_VALUE ((uint32_t)12000000U)
#define LSE_VALUE ((uint32_t)32000U)

2
ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.h
View File

@ -35,7 +35,7 @@
#define BOARD_OSC_DIV (25)
#define BOARD_NO_VBUS_SENSE (1)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
#define HSE_VALUE ((uint32_t)25000000U)
// On-board flash

4
ports/stm/boards/stm32f411ve_discovery/mpconfigboard.h
View File

@ -34,8 +34,8 @@
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
// The schematic has a 32k crystal that isn't fitted. Uncommented the line below if you add it.
// #define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
// #define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
// #define LSE_VALUE ((uint32_t)32000U)

2
ports/stm/boards/stm32f412zg_discovery/mpconfigboard.h
View File

@ -34,7 +34,7 @@
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
#define DEFAULT_I2C_BUS_SCL (&pin_PB10)
#define DEFAULT_I2C_BUS_SDA (&pin_PB09)

2
ports/stm/boards/stm32f4_discovery/mpconfigboard.h
View File

@ -34,4 +34,4 @@
#define BOARD_OSC_DIV (8)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSE
#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)

2
ports/stm/boards/thunderpack/mpconfigboard.h
View File

@ -44,7 +44,7 @@
#define BOARD_OVERWRITE_SWD (1)
#define BOARD_NO_VBUS_SENSE (1)
#define BOARD_RTC_CLOCK RCC_RTCCLKSOURCE_LSI
#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
#define HSE_VALUE ((uint32_t)24000000U)
// Status LEDs

11
ports/stm/supervisor/port.c
View File

@ -152,7 +152,7 @@ __attribute__((used, naked)) void Reset_Handler(void) {
static RTC_HandleTypeDef _hrtc;
#if BOARD_RTC_CLOCK == RCC_RTCCLKSOURCE_LSE
#if BOARD_HAS_LOW_SPEED_CRYSTAL
#define RTC_CLOCK_FREQUENCY LSE_VALUE
#else
#define RTC_CLOCK_FREQUENCY LSI_VALUE
@ -170,14 +170,17 @@ safe_mode_t port_init(void) {
stm32_peripherals_gpio_init();
HAL_PWR_EnableBkUpAccess();
#if BOARD_RTC_CLOCK == RCC_RTCCLKSOURCE_LSE
#if BOARD_HAS_LOW_SPEED_CRYSTAL
__HAL_RCC_LSE_CONFIG(RCC_LSE_ON);
while(__HAL_RCC_GET_FLAG(RCC_FLAG_LSERDY) == RESET) {}
#else
__HAL_RCC_LSI_ENABLE();
#endif
__HAL_RCC_RTC_CONFIG(BOARD_RTC_CLOCK);
#if BOARD_HAS_LOW_SPEED_CRYSTAL
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
#else
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
#endif
__HAL_RCC_RTC_ENABLE();
_hrtc.Instance = RTC;
_hrtc.Init.HourFormat = RTC_HOURFORMAT_24;