Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 22:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: fixed some F4 clocks, and support no crystal on F4

Browse Source 
this fixes up some of the F4 varients that were running at the wrong
clock, and also gives support for running F4s with no crystal
This commit is contained in:
Andrew Tridgell 2022-01-26 11:04:27 +11:00
parent a8b98bfcc4
commit 040ff007ea
1 changed files with 90 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h
View File

@ -92,8 +92,8 @@
#define STM32_HSE_ENABLED FALSE
#define STM32_HSI_ENABLED TRUE
#define STM32_PLLSRC STM32_PLLSRC_HSI
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 216
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 432
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 9
#elif STM32_HSECLK == 8000000U
@ -102,8 +102,8 @@
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 9
#elif STM32_HSECLK == 16000000U
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 216
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 432
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 9
#elif STM32_HSECLK == 24000000U
@ -115,17 +115,60 @@
#error "Unsupported F7 HSE clock"
#endif
#else // F4
// F4 clock config
#if STM32_HSECLK == 8000000U
#if HAL_EXPECTED_SYSCLOCK == 100000000
// low frequency variants of F4, such as F412
#if STM32_HSECLK == 0U
#undef STM32_HSE_ENABLED
#undef STM32_HSI_ENABLED
#undef STM32_PLLSRC
#define STM32_HSE_ENABLED FALSE
#define STM32_HSI_ENABLED TRUE
#define STM32_PLLSRC STM32_PLLSRC_HSI
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 100
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 2
#elif STM32_HSECLK == 8000000U
#define STM32_PLLM_VALUE 4
#define STM32_PLLN_VALUE 100
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 2
#elif STM32_HSECLK == 16000000U
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 100
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 2
#elif STM32_HSECLK == 24000000U
#define STM32_PLLM_VALUE 12
#define STM32_PLLN_VALUE 100
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 2
#else
#error "Unsupported F4 HSE clock"
#endif
#elif HAL_EXPECTED_SYSCLOCK == 168000000
// medium frequency variants of F4, such as F405, F427
#if STM32_HSECLK == 0U
#undef STM32_HSE_ENABLED
#undef STM32_HSI_ENABLED
#undef STM32_PLLSRC
#define STM32_HSE_ENABLED FALSE
#define STM32_HSI_ENABLED TRUE
#define STM32_PLLSRC STM32_PLLSRC_HSI
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 336
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 7
#elif STM32_HSECLK == 8000000U
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 336
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 7
#elif STM32_HSECLK == 16000000U
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 384
#define STM32_PLLP_VALUE 4
#define STM32_PLLQ_VALUE 8
#define STM32_PLLN_VALUE 336
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 7
#elif STM32_HSECLK == 24000000U
#define STM32_PLLM_VALUE 24
#define STM32_PLLN_VALUE 336
@ -134,6 +177,44 @@
#else
#error "Unsupported F4 HSE clock"
#endif
#elif HAL_EXPECTED_SYSCLOCK == 180000000
// high frequency variants of F4, such as F469
#if STM32_HSECLK == 0U
#undef STM32_HSE_ENABLED
#undef STM32_HSI_ENABLED
#undef STM32_PLLSRC
#define STM32_HSE_ENABLED FALSE
#define STM32_HSI_ENABLED TRUE
#define STM32_PLLSRC STM32_PLLSRC_HSI
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 360
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 6
#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#elif STM32_HSECLK == 8000000U
#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 360
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 6
#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#elif STM32_HSECLK == 16000000U
#define STM32_PLLM_VALUE 16
#define STM32_PLLN_VALUE 360
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 6
#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#elif STM32_HSECLK == 24000000U
#define STM32_PLLM_VALUE 24
#define STM32_PLLN_VALUE 360
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 6
#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#else
#error "Unsupported F4 HSE clock"
#endif
#else
#error "Unsupported F4 EXPECTED_CLOCK"
#endif // HAL_EXPECTED_SYSCLOCK
#endif // MCU
#endif // HAL_CUSTOM_CLOCK_TREE