Skip to content

Commit cdd1622

Browse files
hierophecthierophect
committed
Fix oscillator oversight in clocks.c
1 parent 788464a commit cdd1622

6 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
#define MICROPY_HW_NEOPIXEL (&pin_PC00)
3636

37+
#define BOARD_OSC_DIV 12
38+
3739
// On-board flash
3840
#define SPI_FLASH_MOSI_PIN (&pin_PB05)
3941
#define SPI_FLASH_MISO_PIN (&pin_PB04)

‎ports/stm32f4/boards/pyboard_v11/mpconfigboard.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#define FLASH_SIZE (0x100000)
3333
#define FLASH_PAGE_SIZE (0x4000)
3434

35+
#define BOARD_OSC_DIV 12
3536

3637
#define DEFAULT_I2C_BUS_SCL (&pin_PB06)
3738
#define DEFAULT_I2C_BUS_SDA (&pin_PB07)

‎ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@
3232
#define FLASH_SIZE (0x100000)
3333
#define FLASH_PAGE_SIZE (0x4000)
3434

35+
#define BOARD_OSC_DIV 8
36+
3537
#define DEFAULT_I2C_BUS_SCL (&pin_PB10)
3638
#define DEFAULT_I2C_BUS_SDA (&pin_PB09)

‎ports/stm32f4/peripherals/stm32f4/stm32f401xe/clocks.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* THE SOFTWARE.
2626
*/
2727
#include "stm32f4xx_hal.h"
28+
#include "py/mpconfig.h"
2829

2930
void stm32f4_peripherals_clocks_init(void) {
3031
//System clock init
@@ -44,7 +45,7 @@ void stm32f4_peripherals_clocks_init(void) {
4445
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
4546
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
4647
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
47-
RCC_OscInitStruct.PLL.PLLM = 12;
48+
RCC_OscInitStruct.PLL.PLLM = BOARD_OSC_DIV;
4849
RCC_OscInitStruct.PLL.PLLN = 336;
4950
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
5051
RCC_OscInitStruct.PLL.PLLQ = 7;

‎ports/stm32f4/peripherals/stm32f4/stm32f405xx/clocks.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* THE SOFTWARE.
2626
*/
2727
#include "stm32f4xx_hal.h"
28+
#include "py/mpconfig.h"
2829

2930
void stm32f4_peripherals_clocks_init(void) {
3031
//TODO: All parameters must be moved to board level, due to relationship with HSE Osc.
@@ -46,7 +47,7 @@ void stm32f4_peripherals_clocks_init(void) {
4647
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
4748
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
4849
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
49-
RCC_OscInitStruct.PLL.PLLM = 12;
50+
RCC_OscInitStruct.PLL.PLLM = BOARD_OSC_DIV;
5051
RCC_OscInitStruct.PLL.PLLN = 336;
5152
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
5253
RCC_OscInitStruct.PLL.PLLQ = 7;

‎ports/stm32f4/peripherals/stm32f4/stm32f412zx/clocks.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* THE SOFTWARE.
2626
*/
2727
#include "stm32f4xx_hal.h"
28+
#include "py/mpconfig.h"
2829

2930
void stm32f4_peripherals_clocks_init(void) {
3031
//System clock init
@@ -46,7 +47,7 @@ void stm32f4_peripherals_clocks_init(void) {
4647
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
4748
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
4849
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
49-
RCC_OscInitStruct.PLL.PLLM = 8;
50+
RCC_OscInitStruct.PLL.PLLM = BOARD_OSC_DIV;
5051
RCC_OscInitStruct.PLL.PLLN = 200;
5152
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
5253
RCC_OscInitStruct.PLL.PLLQ = 7;

0 commit comments

Comments
 (0)