Merge upstream changes from Marlin 2.1.2

ini/stm32f4.ini

@@ -47,7 +47,6 @@ board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_FLY_F407ZG
 board_build.offset  = 0x8000
 upload_protocol     = dfu
-
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
@@ -71,6 +70,16 @@ board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
+#
+#  FYSETC SPIDER KING407 (STM32F407ZGT6 ARM Cortex-M4)
+#
+[env:FYSETC_SPIDER_KING407]
+extends             = stm32_variant
+board               = marlin_STM32F407ZGT6
+board_build.variant = MARLIN_FYSETC_SPIDER_KING407
+board_build.offset  = 0x8000
+upload_protocol     = dfu
+
 #
 # STM32F407VET6 with RAMPS-like shield
 # 'Black' STM32F407VET6 board - https://wiki.stm32duino.com/index.php?title=STM32F407
@@ -93,6 +102,17 @@ build_flags       = ${stm32_variant.build_flags}
   -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 extra_scripts     = ${stm32_variant.extra_scripts}
 
+#
+# STM32F407VET6 Opulo Lumen REV4
+#
+[env:Opulo_Lumen_REV4]
+extends           = stm32_variant
+board             = marlin_opulo_lumen_rev4
+build_flags       = ${stm32_variant.build_flags}
+  -DARDUINO_BLACK_F407VE
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+extra_scripts     = ${stm32_variant.extra_scripts}
+
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
 #
@@ -297,6 +317,28 @@ build_flags       = ${stm_flash_drive.build_flags}
                     -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
                     -DUSBD_USE_CDC_MSC
 
+#
+# BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4)
+#
+[env:BIGTREE_OCTOPUS_V1_F407]
+extends            = stm32_variant
+board              = marlin_STM32F407ZE
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags}
+                     -DUSE_USB_HS_IN_FS
+
+#
+# BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4) with USB Flash Drive Support
+#
+[env:BIGTREE_OCTOPUS_V1_F407_USB]
+extends           = env:BIGTREE_OCTOPUS_V1_F407
+platform_packages = ${stm_flash_drive.platform_packages}
+build_unflags     = -DUSBD_USE_CDC
+build_flags       = ${stm_flash_drive.build_flags}
+                    -DUSE_USB_HS_IN_FS -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
+                    -DUSBD_USE_CDC_MSC
+
 #
 # Lerdge base
 #
@@ -570,42 +612,54 @@ board_upload.offset_address = 0x0800C000
 extra_scripts               = ${stm32_variant.extra_scripts}
                               buildroot/share/PlatformIO/scripts/openblt.py
 
-#
-# BOARD_MKS_ROBIN_NANO_V1_3_F4
-#  - MKS Robin Nano   V1.3 (STM32F407VET6) 5 Pololu Plug
-#  - MKS Robin Nano-S V1.3 (STM32F407VET6) 4 TMC2225 + 1 Pololu Plug
-#
-[env:mks_robin_nano_v1_3_f4]
+[mks_robin_nano_v1_3_f4_common]
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 board_build.rename          = Robin_nano35.bin
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F407VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
-                              -DSTM32_FLASH_SIZE=512
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-                              -DHAL_SD_MODULE_ENABLED
-                              -DHAL_SRAM_MODULE_ENABLED
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
 debug_tool                  = jlink
 upload_protocol             = jlink
 
+#
+# BOARD_MKS_ROBIN_NANO_V1_3_F4
+#  - MKS Robin Nano   V1.3 (STM32F407VET6, 5 Pololu Plug)
+#  - MKS Robin Nano-S V1.3 (STM32F407VET6, 4 TMC2225, 1 Pololu Plug)
+#  - ZNP Robin Nano   V1.3 (STM32F407VET6, 2 TMC2208, 2 A4988, 1x Polulu plug)
+#
+[env:mks_robin_nano_v1_3_f4]
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DENABLE_HWSERIAL3 -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+build_unflags = ${stm32_variant.build_unflags}
+                -DUSBCON -DUSBD_USE_CDC
+
+#
+#  MKS/ZNP Robin Nano V1.3 with native USB mod
+#
+[env:mks_robin_nano_v1_3_f4_usbmod]
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+
 #
 # Artillery Ruby
 #
 [env:Artillery_Ruby]
-extends           = common_stm32
-board             = marlin_Artillery_Ruby
-build_flags       = ${common_stm32.build_flags}
-                    -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
-                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-                    -DUSB_PRODUCT=\"Artillery_3D_Printer\"
-                    -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
-extra_scripts     = ${common_stm32.extra_scripts}
-                    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extends       = common_stm32
+board         = marlin_Artillery_Ruby
+build_flags   = ${common_stm32.build_flags}
+                -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
+                -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+                -DUSB_PRODUCT=\"Artillery_3D_Printer\"
+                -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
+extra_scripts = ${common_stm32.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 
 #
 # Ender-3 S1 STM32F401RC_creality
@@ -633,3 +687,52 @@ upload_protocol             = jlink
 extends                     = env:STM32F401RC_creality
 debug_tool                  = stlink
 upload_protocol             = stlink
+
+#
+# BigTree SKR mini E3 V3.0.1 (STM32F401RCT6 ARM Cortex-M4)
+#
+[env:STM32F401RC_btt]
+extends                     = stm32_variant
+platform                    = ststm32@~14.1.0
+platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+board                       = marlin_STM32F401RC
+board_build.offset          = 0x4000
+board_upload.offset_address = 0x08004000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DPIN_SERIAL6_RX=PC_7 -DPIN_SERIAL6_TX=PC_6
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                              -DSTEP_TIMER_IRQ_PRIO=0
+upload_protocol             = stlink
+debug_tool                  = stlink
+
+#
+# MKS SKIPR v1.0 all-in-one board (STM32F407VE)
+#
+[env:mks_skipr_v1]
+extends                     = stm32_variant
+board                       = marlin_MKS_SKIPR_V1
+board_build.rename          = mks_skipr.bin
+
+[env:mks_skipr_v1_nobootloader]
+extends                     = env:mks_skipr_v1
+board_build.rename          = firmware.bin
+board_build.offset          = 0x0000
+board_upload.offset_address = 0x08000000
+upload_protocol             = dfu
+upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
+
+#
+# STM32F446ZET6 ARM Cortex-M4
+#
+[env:STM32F446_tronxy]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F446ZET_tronxy
+board_build.offset          = 0x10000
+board_build.rename          = fmw_tronxy.bin
+build_src_filter            = ${common_stm32.build_src_filter}
+build_flags                 = ${stm32_variant.build_flags}
+                              -DSTM32F4xx
+build_unflags               = ${stm32_variant.build_unflags} -fno-rtti
+                              -DUSBCON -DUSBD_USE_CDC