♻️ Refactor STM32 ini files (#22377)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
MarlinFirmware · Jul 21, 2021 · 7773504 · 7773504
1 parent 6b73b6c
commit 7773504
Show file tree

Hide file tree

Showing 9 changed files with 411 additions and 423 deletions.
diff --git a/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json b/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F401xx",
+    "extra_flags": "-DSTM32F401xx -DARDUINO_STEVAL",
     "f_cpu": "84000000L",
     "hwids": [
       [

diff --git a/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json b/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F407xx",
+    "extra_flags": "-DSTM32F407xx -DARDUINO_BLACK_F407VE",
     "f_cpu": "168000000L",
     "hwids": [
       [

diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
@@ -0,0 +1,41 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+####################################
+#
+# HAL/STM32 Common Environments
+#
+####################################
+
+[common_stm32]
+platform         = ststm32@~12.1
+board_build.core = stm32
+build_flags      = ${common.build_flags}
+                   -std=gnu++14
+                   -DUSBCON -DUSBD_USE_CDC
+                   -DTIM_IRQ_PRIO=13
+                   -DADC_RESOLUTION=12
+build_unflags    = -std=gnu++11
+src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
+extra_scripts    = ${common.extra_scripts}
+                   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+
+#
+# STM32 board based on a variant.
+#
+[stm32_variant]
+extends       = common_stm32
+extra_scripts = ${common_stm32.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+                buildroot/share/PlatformIO/scripts/offset_and_rename.py
+
+#
+# USB Flash Drive mix-ins for STM32
+#
+[stm_flash_drive]
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
+build_flags       = ${common_stm32.build_flags}
+                    -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
+                    -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
@@ -27,8 +27,8 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = marlin_malyanM200v2
 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
-  -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
-  -DCUSTOM_STARTUP_FILE
+              -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants
+              -fno-strict-aliasing -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M200 v2 (STM32F070CB)
@@ -38,7 +38,8 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f070cb
 build_flags = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE
+              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+              -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M300 (STM32F070CB)
@@ -48,5 +49,6 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm300_f070cb
 build_flags = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
+              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+              -DHAL_UART_MODULE_ENABLED
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>