diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h index b3b2e00dbb..71cbac4765 100644 --- a/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/ARDUINO_GIGA/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (16000000) #define LSE_VALUE (32768) @@ -48,4 +46,6 @@ #include "stm32h7xx_hal_mmc.h" #endif +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h index 737a2e5b0d..dd71ad71b9 100644 --- a/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -48,4 +46,6 @@ #include "stm32h7xx_hal_mmc.h" #endif +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h index 737a2e5b0d..dd71ad71b9 100644 --- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -48,4 +46,6 @@ #include "stm32h7xx_hal_mmc.h" #endif +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h b/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h index c88a706510..a2293de902 100644 --- a/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h +++ b/ports/stm32/boards/B_L072Z_LRWAN1/stm32l0xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H -#include "boards/stm32l0xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -15,4 +13,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l0xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H diff --git a/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h b/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/B_L475E_IOT01A/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h b/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/CERB40/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h b/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h index 7d6344f0a2..9505fb7788 100644 --- a/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (16000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h index 7d6344f0a2..9505fb7788 100644 --- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (16000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h b/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/HYDRABUS/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h index 7d6344f0a2..9505fb7788 100644 --- a/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (16000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h index bd70912748..dfa27200ec 100644 --- a/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h @@ -5,10 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - -#include "stm32f4xx_hal_fmpi2c.h" - #define HAL_FMPI2C_MODULE_ENABLED // Oscillator values in Hz @@ -20,4 +16,7 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" +#include "stm32f4xx_hal_fmpi2c.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h b/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/LIMIFROG/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h b/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h index f186d5a292..24d394c398 100644 --- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h index b8b935915f..02da6f6576 100644 --- a/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define EXTERNAL_CLOCK_VALUE (12288000) @@ -15,4 +13,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (0) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h b/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h index f186d5a292..24d394c398 100644 --- a/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h index d5b2c4f7a2..10db1b4e23 100644 --- a/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F091RC/stm32f0xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H -#include "boards/stm32f0xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -15,4 +13,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f0xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F0XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F401RE/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F411RE/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F412ZG/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F413ZH/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F429ZI/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F446RE/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h index 9355a3867d..8190f72482 100644 --- a/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F722ZE/stm32f7xx_hal_conf.h @@ -4,8 +4,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -15,4 +13,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h index e241921ddd..14b2c9228d 100644 --- a/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F746ZG/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h index e241921ddd..14b2c9228d 100644 --- a/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h index e241921ddd..14b2c9228d 100644 --- a/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_F767ZI/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h index 5e82fb4874..5aded589e7 100644 --- a/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H -#include "boards/stm32g4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (24000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32g4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h index 45400cdcd7..311c1ff801 100644 --- a/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_H723ZG/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h index 45400cdcd7..311c1ff801 100644 --- a/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h index c88a706510..a2293de902 100644 --- a/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_L073RZ/stm32l0xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H -#include "boards/stm32l0xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -15,4 +13,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l0xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L0XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100755 --- a/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_L432KC/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_L452RE/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100755 --- a/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_L476RG/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/NUCLEO_L4A6ZG/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h b/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/OLIMEX_E407/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h b/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h index 621b05c719..548f5b3f85 100644 --- a/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/PYBD_SF2/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/PYBLITEV10/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/PYBV10/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/PYBV11/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/PYBV3/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h b/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/PYBV4/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h index 9719157e55..21285f2e33 100644 --- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (12000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/STM32F411DISC/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/STM32F429DISC/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/STM32F439/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h b/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h index de19251e08..ddbeca1316 100644 --- a/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/STM32F4DISC/stm32f4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h b/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h index 621b05c719..548f5b3f85 100644 --- a/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/STM32F769DISC/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h b/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h index 621b05c719..548f5b3f85 100644 --- a/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h +++ b/ports/stm32/boards/STM32F7DISC/stm32f7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H -#include "boards/stm32f7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h index 6b32ffb185..a77b3a1c70 100644 --- a/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h +++ b/ports/stm32/boards/STM32H573I_DK/stm32h5xx_hal_conf.h @@ -10,10 +10,10 @@ #define LSE_VALUE (32768) #define EXTERNAL_CLOCK_VALUE (12288000) -#include "boards/stm32h5xx_hal_conf_base.h" - // Oscillator timeouts in ms #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32h5xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H5XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h index 70c3246a89..cad1a85762 100644 --- a/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (24000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h b/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/STM32L476DISC/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h b/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h index fd380ab735..98ef4b3714 100644 --- a/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h +++ b/ports/stm32/boards/STM32L496GDISC/stm32l4xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H -#include "boards/stm32l4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (8000000) #define LSE_VALUE (32768) @@ -17,4 +15,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32l4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32L4XX_HAL_CONF_H diff --git a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h index fe2069fe14..c22fb6177f 100644 --- a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h @@ -1,8 +1,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -12,4 +10,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h index fe2069fe14..c22fb6177f 100644 --- a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h +++ b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h @@ -1,8 +1,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H -#include "boards/stm32f4xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -12,4 +10,6 @@ #define HSE_STARTUP_TIMEOUT (100) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32f4xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H diff --git a/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h index c4d148b0bb..c8f60c5605 100644 --- a/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h +++ b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h @@ -5,8 +5,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H -#include "boards/stm32h7xx_hal_conf_base.h" - // Oscillator values in Hz #define HSE_VALUE (25000000) #define LSE_VALUE (32768) @@ -16,4 +14,6 @@ #define HSE_STARTUP_TIMEOUT (5000) #define LSE_STARTUP_TIMEOUT (5000) +#include "boards/stm32h7xx_hal_conf_base.h" + #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H diff --git a/ports/stm32/boards/stm32f0xx_hal_conf_base.h b/ports/stm32/boards/stm32f0xx_hal_conf_base.h index 70e6ccf758..d60fb9eaf7 100644 --- a/ports/stm32/boards/stm32f0xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32f0xx_hal_conf_base.h @@ -26,31 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32F0XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32F0XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32f0xx_hal_dma.h" -#include "stm32f0xx_hal_adc.h" -#include "stm32f0xx_hal_can.h" -#include "stm32f0xx_hal_cortex.h" -#include "stm32f0xx_hal_crc.h" -#include "stm32f0xx_hal_dac.h" -#include "stm32f0xx_hal_flash.h" -#include "stm32f0xx_hal_gpio.h" -#include "stm32f0xx_hal_i2c.h" -#include "stm32f0xx_hal_i2s.h" -#include "stm32f0xx_hal_iwdg.h" -#include "stm32f0xx_hal_pcd.h" -#include "stm32f0xx_hal_pwr.h" -#include "stm32f0xx_hal_rcc.h" -#include "stm32f0xx_hal_rtc.h" -#include "stm32f0xx_hal_spi.h" -#include "stm32f0xx_hal_tim.h" -#include "stm32f0xx_hal_uart.h" -#include "stm32f0xx_hal_usart.h" -#include "stm32f0xx_hal_wwdg.h" -#include "stm32f0xx_ll_adc.h" -#include "stm32f0xx_ll_rtc.h" -#include "stm32f0xx_ll_usart.h" - // Enable various HAL modules #define HAL_MODULE_ENABLED #define HAL_ADC_MODULE_ENABLED @@ -87,6 +62,31 @@ #define USE_RTOS 0 #define USE_SPI_CRC 1 +// Include various HAL modules for convenience +#include "stm32f0xx_hal_dma.h" +#include "stm32f0xx_hal_adc.h" +#include "stm32f0xx_hal_can.h" +#include "stm32f0xx_hal_cortex.h" +#include "stm32f0xx_hal_crc.h" +#include "stm32f0xx_hal_dac.h" +#include "stm32f0xx_hal_flash.h" +#include "stm32f0xx_hal_gpio.h" +#include "stm32f0xx_hal_i2c.h" +#include "stm32f0xx_hal_i2s.h" +#include "stm32f0xx_hal_iwdg.h" +#include "stm32f0xx_hal_pcd.h" +#include "stm32f0xx_hal_pwr.h" +#include "stm32f0xx_hal_rcc.h" +#include "stm32f0xx_hal_rtc.h" +#include "stm32f0xx_hal_spi.h" +#include "stm32f0xx_hal_tim.h" +#include "stm32f0xx_hal_uart.h" +#include "stm32f0xx_hal_usart.h" +#include "stm32f0xx_hal_wwdg.h" +#include "stm32f0xx_ll_adc.h" +#include "stm32f0xx_ll_rtc.h" +#include "stm32f0xx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h index d42f3ba19f..59d73a3028 100644 --- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h @@ -26,39 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32f4xx_hal_dma.h" -#include "stm32f4xx_hal_adc.h" -#include "stm32f4xx_hal_can.h" -#include "stm32f4xx_hal_cortex.h" -#include "stm32f4xx_hal_crc.h" -#include "stm32f4xx_hal_dac.h" -#include "stm32f4xx_hal_dcmi.h" -#include "stm32f4xx_hal_eth.h" -#include "stm32f4xx_hal_flash.h" -#include "stm32f4xx_hal_gpio.h" -#include "stm32f4xx_hal_hash.h" -#include "stm32f4xx_hal_hcd.h" -#include "stm32f4xx_hal_i2c.h" -#include "stm32f4xx_hal_i2s.h" -#include "stm32f4xx_hal_iwdg.h" -#include "stm32f4xx_hal_mmc.h" -#include "stm32f4xx_hal_pcd.h" -#include "stm32f4xx_hal_pwr.h" -#include "stm32f4xx_hal_rcc.h" -#include "stm32f4xx_hal_rtc.h" -#include "stm32f4xx_hal_sd.h" -#include "stm32f4xx_hal_sdram.h" -#include "stm32f4xx_hal_spi.h" -#include "stm32f4xx_hal_tim.h" -#include "stm32f4xx_hal_uart.h" -#include "stm32f4xx_hal_usart.h" -#include "stm32f4xx_hal_wwdg.h" -#include "stm32f4xx_ll_adc.h" -#include "stm32f4xx_ll_pwr.h" -#include "stm32f4xx_ll_rtc.h" -#include "stm32f4xx_ll_usart.h" - // Enable various HAL modules #define HAL_ADC_MODULE_ENABLED #define HAL_CAN_MODULE_ENABLED @@ -101,6 +68,39 @@ #define PREFETCH_ENABLE 1 #define USE_RTOS 0 +// Include various HAL modules for convenience +#include "stm32f4xx_hal_dma.h" +#include "stm32f4xx_hal_adc.h" +#include "stm32f4xx_hal_can.h" +#include "stm32f4xx_hal_cortex.h" +#include "stm32f4xx_hal_crc.h" +#include "stm32f4xx_hal_dac.h" +#include "stm32f4xx_hal_dcmi.h" +#include "stm32f4xx_hal_eth.h" +#include "stm32f4xx_hal_flash.h" +#include "stm32f4xx_hal_gpio.h" +#include "stm32f4xx_hal_hash.h" +#include "stm32f4xx_hal_hcd.h" +#include "stm32f4xx_hal_i2c.h" +#include "stm32f4xx_hal_i2s.h" +#include "stm32f4xx_hal_iwdg.h" +#include "stm32f4xx_hal_mmc.h" +#include "stm32f4xx_hal_pcd.h" +#include "stm32f4xx_hal_pwr.h" +#include "stm32f4xx_hal_rcc.h" +#include "stm32f4xx_hal_rtc.h" +#include "stm32f4xx_hal_sd.h" +#include "stm32f4xx_hal_sdram.h" +#include "stm32f4xx_hal_spi.h" +#include "stm32f4xx_hal_tim.h" +#include "stm32f4xx_hal_uart.h" +#include "stm32f4xx_hal_usart.h" +#include "stm32f4xx_hal_wwdg.h" +#include "stm32f4xx_ll_adc.h" +#include "stm32f4xx_ll_pwr.h" +#include "stm32f4xx_ll_rtc.h" +#include "stm32f4xx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h index efb15d471d..26908f2ebb 100644 --- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h @@ -26,38 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32f7xx_hal_dma.h" -#include "stm32f7xx_hal_adc.h" -#include "stm32f7xx_hal_can.h" -#include "stm32f7xx_hal_cortex.h" -#include "stm32f7xx_hal_crc.h" -#include "stm32f7xx_hal_dac.h" -#include "stm32f7xx_hal_dcmi.h" -#include "stm32f7xx_hal_flash.h" -#include "stm32f7xx_hal_gpio.h" -#include "stm32f7xx_hal_hash.h" -#include "stm32f7xx_hal_hcd.h" -#include "stm32f7xx_hal_i2c.h" -#include "stm32f7xx_hal_i2s.h" -#include "stm32f7xx_hal_iwdg.h" -#include "stm32f7xx_hal_mmc.h" -#include "stm32f7xx_hal_pcd.h" -#include "stm32f7xx_hal_pwr.h" -#include "stm32f7xx_hal_rcc.h" -#include "stm32f7xx_hal_rtc.h" -#include "stm32f7xx_hal_sd.h" -#include "stm32f7xx_hal_sdram.h" -#include "stm32f7xx_hal_spi.h" -#include "stm32f7xx_hal_tim.h" -#include "stm32f7xx_hal_uart.h" -#include "stm32f7xx_hal_usart.h" -#include "stm32f7xx_hal_wwdg.h" -#include "stm32f7xx_ll_adc.h" -#include "stm32f7xx_ll_pwr.h" -#include "stm32f7xx_ll_rtc.h" -#include "stm32f7xx_ll_usart.h" - // Enable various HAL modules #define HAL_ADC_MODULE_ENABLED #define HAL_CAN_MODULE_ENABLED @@ -97,6 +65,38 @@ #define ART_ACCLERATOR_ENABLE 1 #define USE_RTOS 0 +// Include various HAL modules for convenience +#include "stm32f7xx_hal_dma.h" +#include "stm32f7xx_hal_adc.h" +#include "stm32f7xx_hal_can.h" +#include "stm32f7xx_hal_cortex.h" +#include "stm32f7xx_hal_crc.h" +#include "stm32f7xx_hal_dac.h" +#include "stm32f7xx_hal_dcmi.h" +#include "stm32f7xx_hal_flash.h" +#include "stm32f7xx_hal_gpio.h" +#include "stm32f7xx_hal_hash.h" +#include "stm32f7xx_hal_hcd.h" +#include "stm32f7xx_hal_i2c.h" +#include "stm32f7xx_hal_i2s.h" +#include "stm32f7xx_hal_iwdg.h" +#include "stm32f7xx_hal_mmc.h" +#include "stm32f7xx_hal_pcd.h" +#include "stm32f7xx_hal_pwr.h" +#include "stm32f7xx_hal_rcc.h" +#include "stm32f7xx_hal_rtc.h" +#include "stm32f7xx_hal_sd.h" +#include "stm32f7xx_hal_sdram.h" +#include "stm32f7xx_hal_spi.h" +#include "stm32f7xx_hal_tim.h" +#include "stm32f7xx_hal_uart.h" +#include "stm32f7xx_hal_usart.h" +#include "stm32f7xx_hal_wwdg.h" +#include "stm32f7xx_ll_adc.h" +#include "stm32f7xx_ll_pwr.h" +#include "stm32f7xx_ll_rtc.h" +#include "stm32f7xx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32g4xx_hal_conf_base.h b/ports/stm32/boards/stm32g4xx_hal_conf_base.h index 034d396539..e6f24c21a4 100644 --- a/ports/stm32/boards/stm32g4xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32g4xx_hal_conf_base.h @@ -26,51 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32G4XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32G4XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience - -#include "stm32g4xx_hal_rcc.h" -#include "stm32g4xx_hal_gpio.h" -#include "stm32g4xx_hal_dma.h" -#include "stm32g4xx_hal_cortex.h" -#include "stm32g4xx_hal_adc.h" -#include "stm32g4xx_hal_comp.h" -#include "stm32g4xx_hal_cordic.h" -#include "stm32g4xx_hal_crc.h" -#include "stm32g4xx_hal_cryp.h" -#include "stm32g4xx_hal_dac.h" -#include "stm32g4xx_hal_exti.h" -#include "stm32g4xx_hal_fdcan.h" -#include "stm32g4xx_hal_flash.h" -#include "stm32g4xx_hal_fmac.h" -#include "stm32g4xx_hal_hrtim.h" -#include "stm32g4xx_hal_irda.h" -#include "stm32g4xx_hal_iwdg.h" -#include "stm32g4xx_hal_i2c.h" -#include "stm32g4xx_hal_i2s.h" -#include "stm32g4xx_hal_lptim.h" -#include "stm32g4xx_hal_nand.h" -#include "stm32g4xx_hal_nor.h" -#include "stm32g4xx_hal_opamp.h" -#include "stm32g4xx_hal_pcd.h" -#include "stm32g4xx_hal_pwr.h" -#include "stm32g4xx_hal_qspi.h" -#include "stm32g4xx_hal_rng.h" -#include "stm32g4xx_hal_rtc.h" -#include "stm32g4xx_hal_sai.h" -#include "stm32g4xx_hal_smartcard.h" -#include "stm32g4xx_hal_smbus.h" -#include "stm32g4xx_hal_spi.h" -#include "stm32g4xx_hal_sram.h" -#include "stm32g4xx_hal_tim.h" -#include "stm32g4xx_hal_uart.h" -#include "stm32g4xx_hal_usart.h" -#include "stm32g4xx_hal_wwdg.h" - -#include "stm32g4xx_ll_adc.h" -#include "stm32g4xx_ll_rtc.h" -#include "stm32g4xx_ll_usart.h" -#include "stm32g4xx_ll_lpuart.h" - #define HAL_MODULE_ENABLED #define HAL_ADC_MODULE_ENABLED #define HAL_COMP_MODULE_ENABLED @@ -125,6 +80,49 @@ #define DATA_CACHE_ENABLE 1 #define USE_SPI_CRC 1 +// Include various HAL modules for convenience +#include "stm32g4xx_hal_rcc.h" +#include "stm32g4xx_hal_gpio.h" +#include "stm32g4xx_hal_dma.h" +#include "stm32g4xx_hal_cortex.h" +#include "stm32g4xx_hal_adc.h" +#include "stm32g4xx_hal_comp.h" +#include "stm32g4xx_hal_cordic.h" +#include "stm32g4xx_hal_crc.h" +#include "stm32g4xx_hal_cryp.h" +#include "stm32g4xx_hal_dac.h" +#include "stm32g4xx_hal_exti.h" +#include "stm32g4xx_hal_fdcan.h" +#include "stm32g4xx_hal_flash.h" +#include "stm32g4xx_hal_fmac.h" +#include "stm32g4xx_hal_hrtim.h" +#include "stm32g4xx_hal_irda.h" +#include "stm32g4xx_hal_iwdg.h" +#include "stm32g4xx_hal_i2c.h" +#include "stm32g4xx_hal_i2s.h" +#include "stm32g4xx_hal_lptim.h" +#include "stm32g4xx_hal_nand.h" +#include "stm32g4xx_hal_nor.h" +#include "stm32g4xx_hal_opamp.h" +#include "stm32g4xx_hal_pcd.h" +#include "stm32g4xx_hal_pwr.h" +#include "stm32g4xx_hal_qspi.h" +#include "stm32g4xx_hal_rng.h" +#include "stm32g4xx_hal_rtc.h" +#include "stm32g4xx_hal_sai.h" +#include "stm32g4xx_hal_smartcard.h" +#include "stm32g4xx_hal_smbus.h" +#include "stm32g4xx_hal_spi.h" +#include "stm32g4xx_hal_sram.h" +#include "stm32g4xx_hal_tim.h" +#include "stm32g4xx_hal_uart.h" +#include "stm32g4xx_hal_usart.h" +#include "stm32g4xx_hal_wwdg.h" +#include "stm32g4xx_ll_adc.h" +#include "stm32g4xx_ll_rtc.h" +#include "stm32g4xx_ll_usart.h" +#include "stm32g4xx_ll_lpuart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h index 9c5ec8cb2c..7882adf151 100644 --- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h @@ -26,39 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32h7xx_hal_dma.h" -#include "stm32h7xx_hal_mdma.h" -#include "stm32h7xx_hal_adc.h" -#include "stm32h7xx_hal_cortex.h" -#include "stm32h7xx_hal_crc.h" -#include "stm32h7xx_hal_dac.h" -#include "stm32h7xx_hal_dcmi.h" -#include "stm32h7xx_hal_fdcan.h" -#include "stm32h7xx_hal_flash.h" -#include "stm32h7xx_hal_gpio.h" -#include "stm32h7xx_hal_hash.h" -#include "stm32h7xx_hal_hcd.h" -#include "stm32h7xx_hal_i2c.h" -#include "stm32h7xx_hal_i2s.h" -#include "stm32h7xx_hal_iwdg.h" -#include "stm32h7xx_hal_pcd.h" -#include "stm32h7xx_hal_pwr.h" -#include "stm32h7xx_hal_rcc.h" -#include "stm32h7xx_hal_rtc.h" -#include "stm32h7xx_hal_sd.h" -#include "stm32h7xx_hal_sdram.h" -#include "stm32h7xx_hal_spi.h" -#include "stm32h7xx_hal_tim.h" -#include "stm32h7xx_hal_uart.h" -#include "stm32h7xx_hal_usart.h" -#include "stm32h7xx_hal_wwdg.h" -#include "stm32h7xx_ll_adc.h" -#include "stm32h7xx_ll_lpuart.h" -#include "stm32h7xx_ll_pwr.h" -#include "stm32h7xx_ll_rtc.h" -#include "stm32h7xx_ll_usart.h" - // Enable various HAL modules #define HAL_ADC_MODULE_ENABLED #define HAL_CORTEX_MODULE_ENABLED @@ -98,6 +65,39 @@ #define USE_SD_TRANSCEIVER 0 #define USE_SPI_CRC 1 +// Include various HAL modules for convenience +#include "stm32h7xx_hal_dma.h" +#include "stm32h7xx_hal_mdma.h" +#include "stm32h7xx_hal_adc.h" +#include "stm32h7xx_hal_cortex.h" +#include "stm32h7xx_hal_crc.h" +#include "stm32h7xx_hal_dac.h" +#include "stm32h7xx_hal_dcmi.h" +#include "stm32h7xx_hal_fdcan.h" +#include "stm32h7xx_hal_flash.h" +#include "stm32h7xx_hal_gpio.h" +#include "stm32h7xx_hal_hash.h" +#include "stm32h7xx_hal_hcd.h" +#include "stm32h7xx_hal_i2c.h" +#include "stm32h7xx_hal_i2s.h" +#include "stm32h7xx_hal_iwdg.h" +#include "stm32h7xx_hal_pcd.h" +#include "stm32h7xx_hal_pwr.h" +#include "stm32h7xx_hal_rcc.h" +#include "stm32h7xx_hal_rtc.h" +#include "stm32h7xx_hal_sd.h" +#include "stm32h7xx_hal_sdram.h" +#include "stm32h7xx_hal_spi.h" +#include "stm32h7xx_hal_tim.h" +#include "stm32h7xx_hal_uart.h" +#include "stm32h7xx_hal_usart.h" +#include "stm32h7xx_hal_wwdg.h" +#include "stm32h7xx_ll_adc.h" +#include "stm32h7xx_ll_lpuart.h" +#include "stm32h7xx_ll_pwr.h" +#include "stm32h7xx_ll_rtc.h" +#include "stm32h7xx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h index 7b569907e8..e33c0b2a1b 100644 --- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h @@ -26,31 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32L0XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32L0XX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32l0xx_hal_dma.h" -#include "stm32l0xx_hal_adc.h" -#include "stm32l0xx_hal_cortex.h" -#include "stm32l0xx_hal_crc.h" -#include "stm32l0xx_hal_dac.h" -#include "stm32l0xx_hal_flash.h" -#include "stm32l0xx_hal_gpio.h" -#include "stm32l0xx_hal_i2c.h" -#include "stm32l0xx_hal_i2s.h" -#include "stm32l0xx_hal_iwdg.h" -#include "stm32l0xx_hal_pcd.h" -#include "stm32l0xx_hal_pwr.h" -#include "stm32l0xx_hal_rcc.h" -#include "stm32l0xx_hal_rtc.h" -#include "stm32l0xx_hal_spi.h" -#include "stm32l0xx_hal_tim.h" -#include "stm32l0xx_hal_uart.h" -#include "stm32l0xx_hal_usart.h" -#include "stm32l0xx_hal_wwdg.h" -#include "stm32l0xx_ll_adc.h" -#include "stm32l0xx_ll_lpuart.h" -#include "stm32l0xx_ll_rtc.h" -#include "stm32l0xx_ll_usart.h" - // Enable various HAL modules #define HAL_MODULE_ENABLED #define HAL_ADC_MODULE_ENABLED @@ -89,6 +64,31 @@ #define USE_RTOS 0 #define USE_SPI_CRC 0 +// Include various HAL modules for convenience +#include "stm32l0xx_hal_dma.h" +#include "stm32l0xx_hal_adc.h" +#include "stm32l0xx_hal_cortex.h" +#include "stm32l0xx_hal_crc.h" +#include "stm32l0xx_hal_dac.h" +#include "stm32l0xx_hal_flash.h" +#include "stm32l0xx_hal_gpio.h" +#include "stm32l0xx_hal_i2c.h" +#include "stm32l0xx_hal_i2s.h" +#include "stm32l0xx_hal_iwdg.h" +#include "stm32l0xx_hal_pcd.h" +#include "stm32l0xx_hal_pwr.h" +#include "stm32l0xx_hal_rcc.h" +#include "stm32l0xx_hal_rtc.h" +#include "stm32l0xx_hal_spi.h" +#include "stm32l0xx_hal_tim.h" +#include "stm32l0xx_hal_uart.h" +#include "stm32l0xx_hal_usart.h" +#include "stm32l0xx_hal_wwdg.h" +#include "stm32l0xx_ll_adc.h" +#include "stm32l0xx_ll_lpuart.h" +#include "stm32l0xx_ll_rtc.h" +#include "stm32l0xx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32l1xx_hal_conf_base.h b/ports/stm32/boards/stm32l1xx_hal_conf_base.h index 5871e8a45a..d23453b27a 100644 --- a/ports/stm32/boards/stm32l1xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32l1xx_hal_conf_base.h @@ -26,36 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H -// Needs to be defined before ll_usb.h is included -#define HAL_PCD_MODULE_ENABLED - -// Include various HAL modules for convenience -#include "stm32l1xx_hal_rcc.h" -#include "stm32l1xx_hal_gpio.h" -#include "stm32l1xx_hal_dma.h" -#include "stm32l1xx_hal_cortex.h" -#include "stm32l1xx_hal_adc.h" -#include "stm32l1xx_hal_comp.h" -#include "stm32l1xx_hal_crc.h" -#include "stm32l1xx_hal_dac.h" -#include "stm32l1xx_hal_flash.h" -#include "stm32l1xx_hal_i2c.h" -#include "stm32l1xx_hal_iwdg.h" -#include "stm32l1xx_hal_pcd.h" -#include "stm32l1xx_hal_pwr.h" -#include "stm32l1xx_hal_rtc.h" -#include "stm32l1xx_hal_spi.h" -#include "stm32l1xx_hal_tim.h" -#include "stm32l1xx_hal_uart.h" -#include "stm32l1xx_hal_usart.h" -#include "stm32l1xx_hal_wwdg.h" -#include "stm32l1xx_hal_exti.h" -#include "stm32l1xx_ll_adc.h" -#include "stm32l1xx_ll_pwr.h" -#include "stm32l1xx_ll_rtc.h" -#include "stm32l1xx_ll_usart.h" -#include "stm32l1xx_ll_usb.h" - // Enable various HAL modules #define HAL_MODULE_ENABLED #define HAL_ADC_MODULE_ENABLED @@ -67,6 +37,7 @@ #define HAL_FLASH_MODULE_ENABLED #define HAL_GPIO_MODULE_ENABLED #define HAL_I2C_MODULE_ENABLED +#define HAL_PCD_MODULE_ENABLED #define HAL_PWR_MODULE_ENABLED #define HAL_RCC_MODULE_ENABLED #define HAL_RTC_MODULE_ENABLED @@ -98,6 +69,33 @@ #define USE_SPI_CRC 0 #define USE_RTOS 0 +// Include various HAL modules for convenience +#include "stm32l1xx_hal_rcc.h" +#include "stm32l1xx_hal_gpio.h" +#include "stm32l1xx_hal_dma.h" +#include "stm32l1xx_hal_cortex.h" +#include "stm32l1xx_hal_adc.h" +#include "stm32l1xx_hal_comp.h" +#include "stm32l1xx_hal_crc.h" +#include "stm32l1xx_hal_dac.h" +#include "stm32l1xx_hal_flash.h" +#include "stm32l1xx_hal_i2c.h" +#include "stm32l1xx_hal_iwdg.h" +#include "stm32l1xx_hal_pcd.h" +#include "stm32l1xx_hal_pwr.h" +#include "stm32l1xx_hal_rtc.h" +#include "stm32l1xx_hal_spi.h" +#include "stm32l1xx_hal_tim.h" +#include "stm32l1xx_hal_uart.h" +#include "stm32l1xx_hal_usart.h" +#include "stm32l1xx_hal_wwdg.h" +#include "stm32l1xx_hal_exti.h" +#include "stm32l1xx_ll_adc.h" +#include "stm32l1xx_ll_pwr.h" +#include "stm32l1xx_ll_rtc.h" +#include "stm32l1xx_ll_usart.h" +#include "stm32l1xx_ll_usb.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h index ce35dee28c..9ee895229f 100644 --- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h +++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h @@ -26,8 +26,47 @@ #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_BASE_H -// Needs to be defined before ll_usb.h is included +// Enable various HAL modules +#define HAL_MODULE_ENABLED +#define HAL_ADC_MODULE_ENABLED +#define HAL_CAN_LEGACY_MODULE_ENABLED +#define HAL_CORTEX_MODULE_ENABLED +#define HAL_CRC_MODULE_ENABLED +#define HAL_DAC_MODULE_ENABLED +#define HAL_DCMI_MODULE_ENABLED +#define HAL_DMA_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_HASH_MODULE_ENABLED +#define HAL_HCD_MODULE_ENABLED +#define HAL_I2C_MODULE_ENABLED +#define HAL_IWDG_MODULE_ENABLED #define HAL_PCD_MODULE_ENABLED +#define HAL_PWR_MODULE_ENABLED +#define HAL_RCC_MODULE_ENABLED +#define HAL_RTC_MODULE_ENABLED +#define HAL_SD_MODULE_ENABLED +#define HAL_SPI_MODULE_ENABLED +#define HAL_TIM_MODULE_ENABLED +#define HAL_UART_MODULE_ENABLED +#define HAL_USART_MODULE_ENABLED +#define HAL_WWDG_MODULE_ENABLED + +// Oscillator values in Hz +#define HSI_VALUE (16000000) +#define HSI48_VALUE (48000000) +#define LSI_VALUE (32000) +#define MSI_VALUE (4000000) + +// SysTick has the highest priority +#define TICK_INT_PRIORITY (0x00) + +// Miscellaneous HAL settings +#define DATA_CACHE_ENABLE 1 +#define INSTRUCTION_CACHE_ENABLE 1 +#define PREFETCH_ENABLE 1 +#define USE_SPI_CRC 0 +#define USE_RTOS 0 // Include various HAL modules for convenience #include "stm32l4xx_hal_dma.h" @@ -59,47 +98,6 @@ #include "stm32l4xx_ll_usart.h" #include "stm32l4xx_ll_usb.h" -// Enable various HAL modules -#define HAL_MODULE_ENABLED -#define HAL_ADC_MODULE_ENABLED -#define HAL_CAN_LEGACY_MODULE_ENABLED -#define HAL_CORTEX_MODULE_ENABLED -#define HAL_CRC_MODULE_ENABLED -#define HAL_DAC_MODULE_ENABLED -#define HAL_DCMI_MODULE_ENABLED -#define HAL_DMA_MODULE_ENABLED -#define HAL_FLASH_MODULE_ENABLED -#define HAL_GPIO_MODULE_ENABLED -#define HAL_HASH_MODULE_ENABLED -#define HAL_HCD_MODULE_ENABLED -#define HAL_I2C_MODULE_ENABLED -#define HAL_IWDG_MODULE_ENABLED -#define HAL_PWR_MODULE_ENABLED -#define HAL_RCC_MODULE_ENABLED -#define HAL_RTC_MODULE_ENABLED -#define HAL_SD_MODULE_ENABLED -#define HAL_SPI_MODULE_ENABLED -#define HAL_TIM_MODULE_ENABLED -#define HAL_UART_MODULE_ENABLED -#define HAL_USART_MODULE_ENABLED -#define HAL_WWDG_MODULE_ENABLED - -// Oscillator values in Hz -#define HSI_VALUE (16000000) -#define HSI48_VALUE (48000000) -#define LSI_VALUE (32000) -#define MSI_VALUE (4000000) - -// SysTick has the highest priority -#define TICK_INT_PRIORITY (0x00) - -// Miscellaneous HAL settings -#define DATA_CACHE_ENABLE 1 -#define INSTRUCTION_CACHE_ENABLE 1 -#define PREFETCH_ENABLE 1 -#define USE_SPI_CRC 0 -#define USE_RTOS 0 - // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h index 25eb4b93ec..79417d768f 100644 --- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h +++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h @@ -26,27 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32WBXX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32WBXX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32wbxx_hal_dma.h" -#include "stm32wbxx_hal_adc.h" -#include "stm32wbxx_hal_cortex.h" -#include "stm32wbxx_hal_flash.h" -#include "stm32wbxx_hal_gpio.h" -#include "stm32wbxx_hal_i2c.h" -#include "stm32wbxx_hal_pcd.h" -#include "stm32wbxx_hal_pwr.h" -#include "stm32wbxx_hal_rcc.h" -#include "stm32wbxx_hal_rtc.h" -#include "stm32wbxx_hal_spi.h" -#include "stm32wbxx_hal_tim.h" -#include "stm32wbxx_hal_uart.h" -#include "stm32wbxx_hal_usart.h" -#include "stm32wbxx_ll_adc.h" -#include "stm32wbxx_ll_hsem.h" -#include "stm32wbxx_ll_lpuart.h" -#include "stm32wbxx_ll_rtc.h" -#include "stm32wbxx_ll_usart.h" - // Enable various HAL modules #define HAL_MODULE_ENABLED #define HAL_ADC_MODULE_ENABLED @@ -77,6 +56,27 @@ #define USE_SPI_CRC 0 #define USE_RTOS 0 +// Include various HAL modules for convenience +#include "stm32wbxx_hal_dma.h" +#include "stm32wbxx_hal_adc.h" +#include "stm32wbxx_hal_cortex.h" +#include "stm32wbxx_hal_flash.h" +#include "stm32wbxx_hal_gpio.h" +#include "stm32wbxx_hal_i2c.h" +#include "stm32wbxx_hal_pcd.h" +#include "stm32wbxx_hal_pwr.h" +#include "stm32wbxx_hal_rcc.h" +#include "stm32wbxx_hal_rtc.h" +#include "stm32wbxx_hal_spi.h" +#include "stm32wbxx_hal_tim.h" +#include "stm32wbxx_hal_uart.h" +#include "stm32wbxx_hal_usart.h" +#include "stm32wbxx_ll_adc.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_lpuart.h" +#include "stm32wbxx_ll_rtc.h" +#include "stm32wbxx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0) diff --git a/ports/stm32/boards/stm32wlxx_hal_conf_base.h b/ports/stm32/boards/stm32wlxx_hal_conf_base.h index e98b0525bd..179f504656 100644 --- a/ports/stm32/boards/stm32wlxx_hal_conf_base.h +++ b/ports/stm32/boards/stm32wlxx_hal_conf_base.h @@ -26,25 +26,6 @@ #ifndef MICROPY_INCLUDED_STM32WLXX_HAL_CONF_BASE_H #define MICROPY_INCLUDED_STM32WLXX_HAL_CONF_BASE_H -// Include various HAL modules for convenience -#include "stm32wlxx_hal_dma.h" -#include "stm32wlxx_hal_adc.h" -#include "stm32wlxx_hal_cortex.h" -#include "stm32wlxx_hal_flash.h" -#include "stm32wlxx_hal_gpio.h" -#include "stm32wlxx_hal_i2c.h" -#include "stm32wlxx_hal_pwr.h" -#include "stm32wlxx_hal_rcc.h" -#include "stm32wlxx_hal_rtc.h" -#include "stm32wlxx_hal_spi.h" -#include "stm32wlxx_hal_tim.h" -#include "stm32wlxx_hal_uart.h" -#include "stm32wlxx_hal_usart.h" -#include "stm32wlxx_ll_adc.h" -#include "stm32wlxx_ll_lpuart.h" -#include "stm32wlxx_ll_rtc.h" -#include "stm32wlxx_ll_usart.h" - // Enable various HAL modules #define HAL_MODULE_ENABLED #define HAL_CORTEX_MODULE_ENABLED @@ -72,6 +53,25 @@ #define USE_SPI_CRC 0 #define USE_RTOS 0 +// Include various HAL modules for convenience +#include "stm32wlxx_hal_dma.h" +#include "stm32wlxx_hal_adc.h" +#include "stm32wlxx_hal_cortex.h" +#include "stm32wlxx_hal_flash.h" +#include "stm32wlxx_hal_gpio.h" +#include "stm32wlxx_hal_i2c.h" +#include "stm32wlxx_hal_pwr.h" +#include "stm32wlxx_hal_rcc.h" +#include "stm32wlxx_hal_rtc.h" +#include "stm32wlxx_hal_spi.h" +#include "stm32wlxx_hal_tim.h" +#include "stm32wlxx_hal_uart.h" +#include "stm32wlxx_hal_usart.h" +#include "stm32wlxx_ll_adc.h" +#include "stm32wlxx_ll_lpuart.h" +#include "stm32wlxx_ll_rtc.h" +#include "stm32wlxx_ll_usart.h" + // HAL parameter assertions are disabled #define assert_param(expr) ((void)0)