Expand environments in platformio.ini

.travis.yml

@@ -18,7 +18,7 @@ env:
   - TEST_PLATFORM="teensy35"
 
   # Extended AVR Environments
-  - TEST_PLATFORM="fysetc_f6_13"
+  - TEST_PLATFORM="FYSETC_F6_13"
   - TEST_PLATFORM="megaatmega1280"
   - TEST_PLATFORM="rambo"
   - TEST_PLATFORM="sanguino_atmega1284p"

Marlin/src/pins/pins.h

@@ -169,7 +169,7 @@
 #elif MB(RAMPS_DAGOMA)
   #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:megaatmega2560
 #elif MB(FYSETC_F6_13)
-  #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:fysetc_f6_13
+  #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:FYSETC_F6_13
 #elif MB(DUPLICATOR_I3_PLUS)
   #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:megaatmega2560
 #elif MB(VORON)

platformio.ini

@@ -69,22 +69,37 @@ monitor_speed     = 250000
 # ATmega1280
 #
 [env:megaatmega1280]
-extends           = env:megaatmega2560
+platform          = atmelavr
 board             = megaatmega1280
+board_build.f_cpu = 16000000L
+lib_deps          = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed     = 250000
 
 #
 # RAMBo
 #
 [env:rambo]
-extends           = env:megaatmega2560
+platform          = atmelavr
 board             = reprap_rambo
+board_build.f_cpu = 16000000L
+lib_deps          = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed     = 250000
 
 #
 # FYSETC F6 V1.3
 #
-[env:fysetc_f6_13]
-extends           = env:megaatmega2560
+[env:FYSETC_F6_13]
+platform          = atmelavr
 board             = fysetc_f6_13
+board_build.f_cpu = 16000000L
+lib_deps          = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed     = 250000
 
 #
 # Sanguinololu (ATmega644p)
@@ -101,14 +116,23 @@ monitor_speed = 250000
 # Sanguinololu (ATmega1284p)
 #
 [env:sanguino_atmega1284p]
-extends       = env:sanguino_atmega644p
+platform      = atmelavr
 board         = sanguino_atmega1284p
+lib_deps      = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed = 250000
 
 #
 # Melzi and clones (ATmega1284p)
 #
 [env:melzi]
-extends       = env:sanguino_atmega1284p
+platform      = atmelavr
+board         = sanguino_atmega644p
+lib_deps      = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed = 250000
 build_flags   = ${common.build_flags}
 lib_ignore    = TMCStepper
 upload_speed  = 57600
@@ -117,7 +141,14 @@ upload_speed  = 57600
 # Melzi and clones (Optiboot bootloader)
 #
 [env:melzi_optiboot]
-extends       = env:melzi
+platform      = atmelavr
+board         = sanguino_atmega644p
+lib_deps      = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed = 250000
+build_flags   = ${common.build_flags}
+lib_ignore    = TMCStepper
 upload_speed  = 115200
 
 #
@@ -142,7 +173,12 @@ monitor_speed = 250000
 # - ? 5DPRINT ?
 #
 [env:at90usb1286_dfu]
-extends       = env:at90usb1286_cdc
+platform      = teensy
+board         = at90usb1286
+lib_deps      = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+monitor_speed = 250000
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -157,12 +193,17 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
 monitor_speed = 250000
 
 [env:DUE_USB]
-extends       = env:DUE
+platform      = atmelsam
 board         = dueUSB
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+monitor_speed = 250000
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
-extends       = env:DUE
+platform      = atmelsam
+board         = due
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+monitor_speed = 250000
 build_flags   = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
@@ -190,41 +231,56 @@ lib_deps          = Servo
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 
 [env:LPC1769]
-extends           = env:LPC1768
+platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1769
-
-#
-# STM32F1 base
-#
-[env:STM32F1_base]
-platform      = ststm32
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
-lib_ignore    = Adafruit NeoPixel, SPI
-monitor_speed = 250000
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+# debug options for backtrace
+#  -funwind-tables
+#  -mpoke-function-name
+lib_ldf_mode      = off
+lib_compat_mode   = strict
+extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+monitor_speed     = 250000
+lib_deps          = Servo
+  LiquidCrystal
+  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
+  TMCStepper@>=0.6.1,<1.0.0
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip
+  SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 
 #
 # STM32F103RC
 #
-[env:STM32F103RC_base]
-extends           = env:STM32F1_base
+[env:STM32F103RC]
+platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
+build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14
+build_unflags     = -std=gnu++11
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 #
 # STM32F103RC_fysetc
 #
 [env:STM32F103RC_fysetc]
-extends           = env:STM32F103RC_base
+platform          = ststm32
+board             = genericSTM32F103RC
 #board_build.core = maple
-extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
 lib_ldf_mode      = chain
 debug_tool        = stlink
 upload_protocol   = serial
@@ -240,61 +296,114 @@ monitor_speed     = 250000
 #
 
 [env:STM32F103RC_bigtree]
-extends           = env:STM32F103RC_base
-extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+platform          = ststm32
+board             = genericSTM32F103RC
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
+monitor_speed     = 115200
 
 [env:STM32F103RC_bigtree_USB]
-extends           = env:STM32F103RC_bigtree
+platform          = ststm32
+board             = genericSTM32F103RC
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
+monitor_speed     = 115200
 
 [env:STM32F103RC_bigtree_512K]
-extends           = env:STM32F103RC_bigtree
+platform          = ststm32
+board             = genericSTM32F103RC
 board_upload.maximum_size=524288
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
+monitor_speed     = 115200
 
 [env:STM32F103RC_bigtree_512K_USB]
-extends           = env:STM32F103RC_bigtree_512K
+platform          = ststm32
+board             = genericSTM32F103RC
 board_upload.maximum_size=524288
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
-
-#
-# STM32F103RE_base
-#
-[env:STM32F103RE_base]
-extends           = env:STM32F1_base
-board             = genericSTM32F103RE
-platform_packages = tool-stm32duino
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 #
 # STM32F103RE
 #
 [env:STM32F103RE]
-extends           = env:STM32F103RE_base
+platform          = ststm32
+board             = genericSTM32F103RE
+platform_packages = tool-stm32duino
+build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14
+build_unflags     = -std=gnu++11
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
+monitor_speed     = 115200
 
 #
 #   STM32F103RE_bigtree ............. RET6
 #   STM32F103RE_bigtree_USB ......... RET6 (USB)
 #
 [env:STM32F103RE_bigtree]
-extends           = env:STM32F103RE_base
-extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
+platform          = ststm32
+board             = genericSTM32F103RE
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
 debug_tool        = stlink
 upload_protocol   = stlink
+monitor_speed     = 115200
 
 [env:STM32F103RE_bigtree_USB]
-extends           = env:STM32F103RE_bigtree
+platform          = ststm32
+board             = genericSTM32F103RE
+platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_ignore        = Adafruit NeoPixel, SPI
+debug_tool        = stlink
+upload_protocol   = stlink
+monitor_speed     = 115200
 
 #
 # STM32F4 with STM32GENERIC
@@ -336,58 +445,86 @@ monitor_speed = 250000
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103VE
-extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
   -DSTM32F1xx -DU20 -DTS_V12
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
+monitor_speed = 250000
 
 #
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103ZE
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
+build_unflags = -std=gnu++11
+extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_ignore    = Adafruit NeoPixel, SPI
+monitor_speed = 250000
 
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103RC
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14
+build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_ignore    = Adafruit NeoPixel, SPI
+monitor_speed = 250000
 
 #
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103VE
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14
+build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_ignore    = Adafruit NeoPixel, SPI
+monitor_speed = 250000
 
 #
 # MKS Robin Nano (STM32F103VET6)
 #
 [env:mks_robin_nano]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103VE
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14
+build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_ignore    = Adafruit NeoPixel, SPI
+monitor_speed = 250000
 
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103ZE
-extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
+build_unflags = -std=gnu++11
+extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+lib_ignore    = Adafruit NeoPixel, SPI
+monitor_speed = 250000
 
 #
 # Malyan M200 (STM32F103CB)
@@ -404,39 +541,35 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103]
-extends       = env:STM32F1_base
+platform      = ststm32
 board         = genericSTM32F103ZE
-extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
 build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore    = Adafruit NeoPixel
-
-#
-# STM32 HAL environments
-#
-[env:STM32_hal]
-platform      = ststm32
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 monitor_speed = 250000
 
 #
 # FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
-extends           = env:STM32_hal
+platform          = ststm32
 board             = fysetc_s6
-extra_scripts     = buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
+platform_packages = tool-stm32duino
 build_flags       = ${common.build_flags}
   -DTARGET_STM32F4 -std=gnu++14
   -DVECT_TAB_OFFSET=0x10000
   -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 lib_ignore        = Arduino-L6470
-platform_packages = tool-stm32duino
 debug_tool        = stlink
 #upload_protocol   = stlink
 upload_protocol   = serial
+monitor_speed     = 250000
 
 #
 # STM32F407VET6 with RAMPS-like shield
@@ -444,29 +577,33 @@ upload_protocol   = serial
 # Shield - https://github.com/jmz52/Hardware
 #
 [env:STM32F407VE_black]
-extends           = env:STM32_hal
-platform_packages = framework-arduinoststm32@>=3.10700.191028
+platform          = ststm32
 board             = blackSTM32F407VET6
-extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+platform_packages = framework-arduinoststm32@>=3.10700.191028
 build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
   -IMarlin/src/HAL/HAL_STM32
+build_unflags     = -std=gnu++11
+extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+monitor_speed     = 250000
 
 #
 # Bigtreetech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_SKR_PRO]
-extends           = env:STM32_hal
-platform_packages = framework-arduinoststm32@>=3.10700.191028
+platform          = ststm32
 board             = BigTree_SKR_Pro
-extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+platform_packages = framework-arduinoststm32@>=3.10700.191028
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
   -DHAVE_HWSERIAL6
   -IMarlin/src/HAL/HAL_STM32
+build_unflags     = -std=gnu++11
+extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_deps          =
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
   LiquidCrystal
@@ -475,15 +612,15 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+monitor_speed     = 250000
 
 #
 # Bigtreetech SKR BTT002 (STM32F407VET6 ARM Cortex-M4)
 #
 [env:BIGTREE_BTT002]
-extends       = env:STM32_hal
-platform      = ststm32@5.6.0
+platform          = ststm32@5.6.0
 board         = BigTree_Btt002
-extra_scripts = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags   = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407VE\"
   -DTARGET_STM32F4 -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
@@ -491,7 +628,11 @@ build_flags   = ${common.build_flags}
   -DHAVE_HWSERIAL3
   -DPIN_SERIAL2_RX=PD_6
   -DPIN_SERIAL2_TX=PD_5
+build_unflags     = -std=gnu++11
+extra_scripts = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore    = Adafruit NeoPixel, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster
+src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+monitor_speed     = 250000
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
@@ -509,9 +650,13 @@ monitor_speed = 250000
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
 #
 [env:teensy35]
-extends       = env:teensy31
+platform      = teensy
 board         = teensy35
+lib_deps      = ${common.lib_deps}
+  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+lib_ignore    = Adafruit NeoPixel
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
+monitor_speed = 250000
 
 #
 # Espressif ESP32