diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 7cc9760e49..6fb8c5ac66 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -431,67 +431,68 @@
// STM32 ARM Cortex-M4F
//
-#define BOARD_ARMED 5200 // Arm'ed STM32F4-based controller
-#define BOARD_RUMBA32_V1_0 5201 // RUMBA32 STM32F446VE based controller from Aus3D
-#define BOARD_RUMBA32_V1_1 5202 // RUMBA32 STM32F446VE based controller from Aus3D
-#define BOARD_RUMBA32_MKS 5203 // RUMBA32 STM32F446VE based controller from Makerbase
-#define BOARD_RUMBA32_BTT 5204 // RUMBA32 STM32F446VE based controller from BIGTREETECH
-#define BOARD_BLACK_STM32F407VE 5205 // Black STM32F407VE development board
-#define BOARD_BLACK_STM32F407ZE 5206 // Black STM32F407ZE development board
-#define BOARD_BTT_SKR_MINI_E3_V3_0_1 5207 // BigTreeTech SKR Mini E3 V3.0.1 (STM32F401RC)
-#define BOARD_BTT_SKR_PRO_V1_1 5208 // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
-#define BOARD_BTT_SKR_PRO_V1_2 5209 // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
-#define BOARD_BTT_BTT002_V1_0 5210 // BigTreeTech BTT002 v1.0 (STM32F407VG)
-#define BOARD_BTT_E3_RRF 5211 // BigTreeTech E3 RRF (STM32F407VG)
-#define BOARD_BTT_SKR_V2_0_REV_A 5212 // BigTreeTech SKR v2.0 Rev A (STM32F407VG)
-#define BOARD_BTT_SKR_V2_0_REV_B 5213 // BigTreeTech SKR v2.0 Rev B (STM32F407VG/STM32F429VG)
-#define BOARD_BTT_GTR_V1_0 5214 // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_BTT_OCTOPUS_V1_0 5215 // BigTreeTech Octopus v1.0 (STM32F446ZE)
-#define BOARD_BTT_OCTOPUS_V1_1 5216 // BigTreeTech Octopus v1.1 (STM32F446ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0 5217 // BigTreeTech Octopus Pro v1.0 (STM32F446ZE / STM32F429ZG)
-#define BOARD_LERDGE_K 5218 // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S 5219 // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X 5220 // Lerdge X (STM32F407VE)
-#define BOARD_FYSETC_S6 5221 // FYSETC S6 (STM32F446VE)
-#define BOARD_FYSETC_S6_V2_0 5222 // FYSETC S6 v2.0 (STM32F446VE)
-#define BOARD_FYSETC_SPIDER 5223 // FYSETC Spider (STM32F446VE)
-#define BOARD_FYSETC_SPIDER_V2_2 5224 // FYSETC Spider V2.2 (STM32F446VE)
-#define BOARD_FLYF407ZG 5225 // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2 5226 // MKS Robin2 V1.0 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2 5227 // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3 5228 // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V3_1 5229 // MKS Robin Nano V3.1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V1 5230 // MKS Monster8 V1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V2 5231 // MKS Monster8 V2 (STM32F407VE)
-#define BOARD_ANET_ET4 5232 // ANET ET4 V1.x (STM32F407VG)
-#define BOARD_ANET_ET4P 5233 // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20 5234 // FYSETC Cheetah V2.0 (STM32F401RC)
-#define BOARD_FYSETC_CHEETAH_V30 5235 // FYSETC Cheetah V3.0 (STM32F446RC)
-#define BOARD_TH3D_EZBOARD_V2 5236 // TH3D EZBoard v2.0 (STM32F405RG)
-#define BOARD_OPULO_LUMEN_REV3 5237 // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
-#define BOARD_OPULO_LUMEN_REV4 5238 // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4 5239 // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
-#define BOARD_MKS_EAGLE 5240 // MKS Eagle (STM32F407VE)
-#define BOARD_ARTILLERY_RUBY 5241 // Artillery Ruby (STM32F401RC)
-#define BOARD_CREALITY_V24S1_301F4 5242 // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
-#define BOARD_CREALITY_CR4NTXXC10 5243 // Creality E3 Free-runs Silent Motherboard (STM32F401RET6)
-#define BOARD_FYSETC_SPIDER_KING407 5244 // FYSETC Spider King407 (STM32F407ZG)
-#define BOARD_MKS_SKIPR_V1 5245 // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
-#define BOARD_TRONXY_CXY_446_V10 5246 // TRONXY CXY-446-V10-220413/CXY-V6-191121 (STM32F446ZE)
-#define BOARD_CREALITY_F401RE 5247 // Creality CR4NS200141C13 (STM32F401RE) as found in the Ender-5 S1
-#define BOARD_BLACKPILL_CUSTOM 5248 // Custom board based on STM32F401CDU6.
-#define BOARD_I3DBEEZ9_V1 5249 // I3DBEEZ9 V1 (STM32F407ZG)
-#define BOARD_MELLOW_FLY_E3_V2 5250 // Mellow Fly E3 V2 (STM32F407VG)
-#define BOARD_BLACKBEEZMINI_V1 5251 // BlackBeezMini V1 (STM32F401CCU6)
-#define BOARD_XTLW_CLIMBER_8TH 5252 // XTLW Climber-8th (STM32F407VGT6)
-#define BOARD_FLY_RRF_E3_V1 5253 // Fly RRF E3 V1.0 (STM32F407VG)
-#define BOARD_FLY_SUPER8 5254 // Fly SUPER8 (STM32F407ZGT6)
-#define BOARD_FLY_D8 5255 // FLY D8 (STM32F407VG)
-#define BOARD_FLY_CDY_V3 5256 // FLY CDY V3 (STM32F407VGT6)
-#define BOARD_ZNP_ROBIN_NANO 5257 // Elegoo Neptune 2 v1.2 board
-#define BOARD_ZNP_ROBIN_NANO_V1_3 5258 // Elegoo Neptune 2 v1.3 board
-#define BOARD_MKS_NEPTUNE_X 5259 // Elegoo Neptune X
-#define BOARD_MKS_NEPTUNE_3 5260 // Elegoo Neptune 3
+#define BOARD_ARMED 5200 // Arm'ed STM32F4-based controller
+#define BOARD_RUMBA32_V1_0 5201 // RUMBA32 STM32F446VE based controller from Aus3D
+#define BOARD_RUMBA32_V1_1 5202 // RUMBA32 STM32F446VE based controller from Aus3D
+#define BOARD_RUMBA32_MKS 5203 // RUMBA32 STM32F446VE based controller from Makerbase
+#define BOARD_RUMBA32_BTT 5204 // RUMBA32 STM32F446VE based controller from BIGTREETECH
+#define BOARD_BLACK_STM32F407VE 5205 // Black STM32F407VE development board
+#define BOARD_BLACK_STM32F407ZE 5206 // Black STM32F407ZE development board
+#define BOARD_BTT_SKR_MINI_E3_V3_0_1 5207 // BigTreeTech SKR Mini E3 V3.0.1 (STM32F401RC)
+#define BOARD_BTT_SKR_PRO_V1_1 5208 // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_SKR_PRO_V1_2 5209 // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0 5210 // BigTreeTech BTT002 v1.0 (STM32F407VG)
+#define BOARD_BTT_E3_RRF 5211 // BigTreeTech E3 RRF (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_A 5212 // BigTreeTech SKR v2.0 Rev A (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_B 5213 // BigTreeTech SKR v2.0 Rev B (STM32F407VG/STM32F429VG)
+#define BOARD_BTT_GTR_V1_0 5214 // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_BTT_OCTOPUS_V1_0 5215 // BigTreeTech Octopus v1.0 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_V1_1 5216 // BigTreeTech Octopus v1.1 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0 5217 // BigTreeTech Octopus Pro v1.0 (STM32F446ZE / STM32F429ZG)
+#define BOARD_LERDGE_K 5218 // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S 5219 // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X 5220 // Lerdge X (STM32F407VE)
+#define BOARD_FYSETC_S6 5221 // FYSETC S6 (STM32F446VE)
+#define BOARD_FYSETC_S6_V2_0 5222 // FYSETC S6 v2.0 (STM32F446VE)
+#define BOARD_FYSETC_SPIDER 5223 // FYSETC Spider (STM32F446VE)
+#define BOARD_FYSETC_SPIDER_V2_2 5224 // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_FLYF407ZG 5225 // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2 5226 // MKS Robin2 V1.0 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2 5227 // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3 5228 // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V3_1 5229 // MKS Robin Nano V3.1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V1 5230 // MKS Monster8 V1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V2 5231 // MKS Monster8 V2 (STM32F407VE)
+#define BOARD_ANET_ET4 5232 // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P 5233 // ANET ET4P V1.x (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V20 5234 // FYSETC Cheetah V2.0 (STM32F401RC)
+#define BOARD_FYSETC_CHEETAH_V30 5235 // FYSETC Cheetah V3.0 (STM32F446RC)
+#define BOARD_TH3D_EZBOARD_V2 5236 // TH3D EZBoard v2.0 (STM32F405RG)
+#define BOARD_OPULO_LUMEN_REV3 5237 // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
+#define BOARD_OPULO_LUMEN_REV4 5238 // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4 5239 // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE 5240 // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY 5241 // Artillery Ruby (STM32F401RC)
+#define BOARD_CREALITY_V24S1_301F4 5242 // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
+#define BOARD_CREALITY_CR4NTXXC10 5243 // Creality E3 Free-runs Silent Motherboard (STM32F401RET6)
+#define BOARD_FYSETC_SPIDER_KING_V1_F407 5244 // FYSETC Spider King v1 (STM32F407ZG)
+#define BOARD_FYSETC_SPIDER_KING_V1_1_F407 5245 // FYSETC Spider King v1.1 (STM32F407ZG)
+#define BOARD_MKS_SKIPR_V1 5246 // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
+#define BOARD_TRONXY_CXY_446_V10 5247 // TRONXY CXY-446-V10-220413/CXY-V6-191121 (STM32F446ZE)
+#define BOARD_CREALITY_F401RE 5248 // Creality CR4NS200141C13 (STM32F401RE) as found in the Ender-5 S1
+#define BOARD_BLACKPILL_CUSTOM 5249 // Custom board based on STM32F401CDU6.
+#define BOARD_I3DBEEZ9_V1 5250 // I3DBEEZ9 V1 (STM32F407ZG)
+#define BOARD_MELLOW_FLY_E3_V2 5251 // Mellow Fly E3 V2 (STM32F407VG)
+#define BOARD_BLACKBEEZMINI_V1 5252 // BlackBeezMini V1 (STM32F401CCU6)
+#define BOARD_XTLW_CLIMBER_8TH 5253 // XTLW Climber-8th (STM32F407VGT6)
+#define BOARD_FLY_RRF_E3_V1 5254 // Fly RRF E3 V1.0 (STM32F407VG)
+#define BOARD_FLY_SUPER8 5255 // Fly SUPER8 (STM32F407ZGT6)
+#define BOARD_FLY_D8 5256 // FLY D8 (STM32F407VG)
+#define BOARD_FLY_CDY_V3 5257 // FLY CDY V3 (STM32F407VGT6)
+#define BOARD_ZNP_ROBIN_NANO 5258 // Elegoo Neptune 2 v1.2 board
+#define BOARD_ZNP_ROBIN_NANO_V1_3 5259 // Elegoo Neptune 2 v1.3 board
+#define BOARD_MKS_NEPTUNE_X 5260 // Elegoo Neptune X
+#define BOARD_MKS_NEPTUNE_3 5261 // Elegoo Neptune 3
//
// Other ARM Cortex-M4
@@ -502,22 +503,24 @@
// ARM Cortex-M7
//
-#define BOARD_REMRAM_V1 6000 // RemRam v1
-#define BOARD_NUCLEO_F767ZI 6001 // ST NUCLEO-F767ZI Dev Board
-#define BOARD_BTT_SKR_SE_BX_V2 6002 // BigTreeTech SKR SE BX V2.0 (STM32H743II)
-#define BOARD_BTT_SKR_SE_BX_V3 6003 // BigTreeTech SKR SE BX V3.0 (STM32H743II)
-#define BOARD_BTT_SKR_V3_0 6004 // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
-#define BOARD_BTT_SKR_V3_0_EZ 6005 // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
-#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6006 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0_1 6007 // BigTreeTech Octopus Pro v1.0.1 (STM32H723ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_1 6008 // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)
-#define BOARD_BTT_MANTA_M8P_V2_0 6009 // BigTreeTech Manta M8P V2.0 (STM32H723ZE)
-#define BOARD_BTT_KRAKEN_V1_0 6010 // BigTreeTech Kraken v1.0 (STM32H723ZG)
-#define BOARD_TEENSY40 6011 // Teensy 4.0
-#define BOARD_TEENSY41 6012 // Teensy 4.1
-#define BOARD_T41U5XBB 6013 // T41U5XBB Teensy 4.1 breakout board
-#define BOARD_FLY_D8_PRO 6014 // FLY_D8_PRO (STM32H723VG)
-#define BOARD_FLY_SUPER8_PRO 6015 // FLY SUPER8 PRO (STM32H723ZG)
+#define BOARD_REMRAM_V1 6000 // RemRam v1
+#define BOARD_NUCLEO_F767ZI 6001 // ST NUCLEO-F767ZI Dev Board
+#define BOARD_BTT_SKR_SE_BX_V2 6002 // BigTreeTech SKR SE BX V2.0 (STM32H743II)
+#define BOARD_BTT_SKR_SE_BX_V3 6003 // BigTreeTech SKR SE BX V3.0 (STM32H743II)
+#define BOARD_BTT_SKR_V3_0 6004 // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
+#define BOARD_BTT_SKR_V3_0_EZ 6005 // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
+#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6006 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0_1 6007 // BigTreeTech Octopus Pro v1.0.1 (STM32H723ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_1 6008 // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)
+#define BOARD_BTT_MANTA_M8P_V2_0 6009 // BigTreeTech Manta M8P V2.0 (STM32H723ZE)
+#define BOARD_BTT_KRAKEN_V1_0 6010 // BigTreeTech Kraken v1.0 (STM32H723ZG)
+#define BOARD_TEENSY40 6011 // Teensy 4.0
+#define BOARD_TEENSY41 6012 // Teensy 4.1
+#define BOARD_T41U5XBB 6013 // T41U5XBB Teensy 4.1 breakout board
+#define BOARD_FLY_D8_PRO 6014 // FLY_D8_PRO (STM32H723VG)
+#define BOARD_FLY_SUPER8_PRO 6015 // FLY SUPER8 PRO (STM32H723ZG)
+#define BOARD_FYSETC_SPIDER_KING_V1_H723 6016 // FYSETC Spider King v1 (STM32H723ZG)
+#define BOARD_FYSETC_SPIDER_KING_V1_1_H723 6017 // FYSETC Spider King v1.1 (STM32H723ZG)
//
// Espressif ESP32 WiFi
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index abe4673407..6f14e8b67a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -786,8 +786,10 @@
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_nobootloader env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
#elif MB(CREALITY_CR4NTXXC10)
#include "stm32f4/pins_CREALITY_CR4NTXXC10.h" // STM32F4 env:STM32F401RE_freeruns env:STM32F401RE_freeruns_jlink env:STM32F401RE_freeruns_stlink
-#elif MB(FYSETC_SPIDER_KING407)
- #include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4 env:FYSETC_SPIDER_KING407
+#elif MB(FYSETC_SPIDER_KING_V1_F407)
+ #include "stm32f4/pins_FYSETC_SPIDER_KING_V1.h" // STM32F4 env:STM32F407ZG_fysetc
+#elif MB(FYSETC_SPIDER_KING_V1_1_F407)
+ #include "stm32f4/pins_FYSETC_SPIDER_KING_V1_1.h" // STM32F4 env:STM32F407ZG_fysetc
#elif MB(MKS_SKIPR_V1)
#include "stm32f4/pins_MKS_SKIPR_V1_0.h" // STM32F4 env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
#elif MB(TRONXY_CXY_446_V10)
@@ -833,37 +835,41 @@
//
#elif MB(REMRAM_V1)
- #include "stm32f7/pins_REMRAM_V1.h" // STM32F7 env:REMRAM_V1
+ #include "stm32f7/pins_REMRAM_V1.h" // STM32F7 env:REMRAM_V1
#elif MB(NUCLEO_F767ZI)
- #include "stm32f7/pins_NUCLEO_F767ZI.h" // STM32F7 env:NUCLEO_F767ZI
+ #include "stm32f7/pins_NUCLEO_F767ZI.h" // STM32F7 env:NUCLEO_F767ZI
#elif MB(BTT_SKR_SE_BX_V2)
- #include "stm32h7/pins_BTT_SKR_SE_BX_V2.h" // STM32H7 env:BTT_SKR_SE_BX
+ #include "stm32h7/pins_BTT_SKR_SE_BX_V2.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_SE_BX_V3)
- #include "stm32h7/pins_BTT_SKR_SE_BX_V3.h" // STM32H7 env:BTT_SKR_SE_BX
+ #include "stm32h7/pins_BTT_SKR_SE_BX_V3.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_V3_0)
- #include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
+ #include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
#elif MB(BTT_SKR_V3_0_EZ)
- #include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
+ #include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
#elif MB(BTT_OCTOPUS_MAX_EZ_V1_0)
- #include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt
+ #include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(BTT_OCTOPUS_PRO_V1_0_1)
- #include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_0_1.h" // STM32H7 env:STM32H723ZE_btt
+ #include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_0_1.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(BTT_OCTOPUS_PRO_V1_1)
- #include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_1.h" // STM32H7 env:STM32H723ZE_btt
+ #include "stm32h7/pins_BTT_OCTOPUS_PRO_V1_1.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(BTT_MANTA_M8P_V2_0)
- #include "stm32h7/pins_BTT_MANTA_M8P_V2_0.h" // STM32H7 env:STM32H723ZE_btt
+ #include "stm32h7/pins_BTT_MANTA_M8P_V2_0.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(BTT_KRAKEN_V1_0)
- #include "stm32h7/pins_BTT_KRAKEN_V1_0.h" // STM32H7 env:STM32H723ZG_btt
+ #include "stm32h7/pins_BTT_KRAKEN_V1_0.h" // STM32H7 env:STM32H723ZG_btt
#elif MB(TEENSY40)
- #include "teensy4/pins_TEENSY40.h" // Teensy-4.0 env:teensy40
+ #include "teensy4/pins_TEENSY40.h" // Teensy-4.0 env:teensy40
#elif MB(TEENSY41)
- #include "teensy4/pins_TEENSY41.h" // Teensy-4.1 env:teensy41
+ #include "teensy4/pins_TEENSY41.h" // Teensy-4.1 env:teensy41
#elif MB(T41U5XBB)
- #include "teensy4/pins_T41U5XBB.h" // Teensy-4.x env:teensy41
+ #include "teensy4/pins_T41U5XBB.h" // Teensy-4.x env:teensy41
#elif MB(FLY_D8_PRO)
- #include "stm32h7/pins_FLY_D8_PRO.h" // STM32H7 env:FLY_D8_PRO
+ #include "stm32h7/pins_FLY_D8_PRO.h" // STM32H7 env:FLY_D8_PRO
#elif MB(FLY_SUPER8_PRO)
- #include "stm32h7/pins_FLY_SUPER8_PRO.h" // STM32H7 env:FLY_SUPER8_PRO
+ #include "stm32h7/pins_FLY_SUPER8_PRO.h" // STM32H7 env:FLY_SUPER8_PRO
+#elif MB(FYSETC_SPIDER_KING_V1_H723)
+ #include "stm32h7/pins_FYSETC_SPIDER_KING_V1_H723.h" // STM32H7 env:STM32H723ZG_fysetc
+#elif MB(FYSETC_SPIDER_KING_V1_1_H723)
+ #include "stm32h7/pins_FYSETC_SPIDER_KING_V1_1_H723.h" // STM32H7 env:STM32H723ZG_fysetc
//
// Espressif ESP32
@@ -997,6 +1003,7 @@
#define BOARD_BTT_MANTA_M4P_V1_0 99927
#define BOARD_VAKE403D 99928
#define BOARD_TRONXY_V10 99929
+ #define BOARD_FYSETC_SPIDER_KING407 99930
#if MB(MKS_13)
#error "BOARD_MKS_13 is now BOARD_MKS_GEN_13. Please update your configuration."
@@ -1058,6 +1065,8 @@
#error "BOARD_TRONXY_V10 is now BOARD_TRONXY_CXY_446_V10. Please update your configuration."
#elif MB(VAKE403D)
#error "BOARD_VAKE403D is no longer supported in Marlin."
+ #elif MB(FYSETC_SPIDER_KING407)
+ #error "BOARD_FYSETC_SPIDER_KING407 is now BOARD_FYSETC_SPIDER_KING_V1_F407 or BOARD_FYSETC_SPIDER_KING_V1_1_F407. Please update your configuration."
#elif MB(ERROR)
#warning "Most likely missing / misplaced Configuration files."
#elif defined(MOTHERBOARD)
@@ -1097,6 +1106,7 @@
#undef BOARD_BTT_MANTA_M4P_V1_0
#undef BOARD_VAKE403D
#undef BOARD_TRONXY_V10
+ #undef BOARD_FYSETC_SPIDER_KING407
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1.h
new file mode 100644
index 0000000000..014112dfcd
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1.h
@@ -0,0 +1,28 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "Spider King V1.0"
+#endif
+
+#include "pins_FYSETC_SPIDER_KING_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1_1.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1_1.h
new file mode 100644
index 0000000000..ac9ff0da1b
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_V1_1.h
@@ -0,0 +1,28 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "Spider King V1.1"
+#endif
+
+#include "pins_FYSETC_SPIDER_KING_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_common.h
similarity index 83%
rename from Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h
rename to Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_common.h
index e243f6cfcd..d6c2f8b2fc 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING_common.h
@@ -21,34 +21,51 @@
*/
#pragma once
-#include "env_validate.h"
+// The FYSETC Spider King has shipped with both STM32F4 and STM32H7 MCUs.
+// Ensure the correct env_validate.h file is included based on the build environment used.
+#if NOT_TARGET(STM32H7)
+ #include "env_validate.h"
+#else
+ #include "../stm32h7/env_validate.h"
+#endif
#if HOTENDS > 5 || E_STEPPERS > 5
#error "FYSETC SPIDER KING supports up to 5 hotends / E-steppers."
#endif
-#ifndef BOARD_INFO_NAME
- #define BOARD_INFO_NAME "FYSETC SPIDER KING"
-#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#endif
//
-// EEPROM Emulation
+// EEPROM
//
-#if NO_EEPROM_SELECTED
- #undef NO_EEPROM_SELECTED
- //#define FLASH_EEPROM_EMULATION
- //#define SRAM_EEPROM_EMULATION
- #define I2C_EEPROM
-#endif
+#if NOT_TARGET(STM32H7)
+ // I2C EEPROM for STM32F4. Does not work on Spider King with STM32H7 MCU.
+ #if NO_EEPROM_SELECTED
+ #undef NO_EEPROM_SELECTED
+ //#define FLASH_EEPROM_EMULATION
+ //#define SRAM_EEPROM_EMULATION
+ #define I2C_EEPROM
+ #endif
-#if ENABLED(I2C_EEPROM)
- #define I2C_EEPROM
- #define I2C_SCL_PIN PF1
- #define I2C_SDA_PIN PF0
- #define MARLIN_EEPROM_SIZE 0x1000U // 4KB
+ #if ENABLED(I2C_EEPROM)
+ #define I2C_EEPROM
+ #define I2C_SCL_PIN PF1
+ #define I2C_SDA_PIN PF0
+ #define MARLIN_EEPROM_SIZE 0x1000 // 4KB
+ #endif
+#else
+ // Emulated EEPROM for STM32H7
+ #if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+ #undef NO_EEPROM_SELECTED
+ #ifndef FLASH_EEPROM_EMULATION
+ #define FLASH_EEPROM_EMULATION
+ #endif
+ #define EEPROM_PAGE_SIZE (0x800UL) // 2K
+ #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
+ #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
+ #endif
#endif
//
@@ -57,7 +74,14 @@
#define SERVO0_PIN PA1
//
-// Software SPI pins for TMC2130 stepper drivers
+// Probe enable
+//
+#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
+ #define PROBE_ENABLE_PIN SERVO0_PIN
+#endif
+
+//
+// Software SPI pins for TMC stepper drivers
//
#define TMC_USE_SW_SPI
#if ENABLED(TMC_USE_SW_SPI)
@@ -337,9 +361,19 @@
#define BOARD_ST7920_DELAY_3 640
#endif
-//
-// Wifi module
-//
+/**
+ * -------
+ * GND | 9 8 | 3.3V
+ * (ESP-CS) PB12 | 10 7 | PB15 (ESP-MOSI)
+ * 3.3V | 11 6 | PB14 (ESP-MISO)
+ * (ESP-IO0) PD7 | 12 5 | PB13 (ESP-CLK)
+ * (ESP-IO4) PD10 | 13 4 | --
+ * -- | 14 3 | PE15 (ESP-EN)
+ * (ESP-RX) PD8 | 15 2 | --
+ * (ESP-TX) PD9 | 16 1 | PE14 (ESP-RST)
+ * -------
+ * WIFI
+ */
#define ESP_WIFI_MODULE_COM 1 // Set either SERIAL_PORT or SERIAL_PORT_2 to this
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Use the same BAUDRATE as SERIAL_PORT or SERIAL_PORT_2
#define ESP_WIFI_MODULE_RESET_PIN PB3
@@ -349,7 +383,15 @@
//
// NeoPixel LED
+// FYSETC_242_OLED_12864 & FYSETC_MINI_12864_2_1 uses one of the EXP pins for NeoPixels
//
-#ifndef NEOPIXEL_PIN
- #define NEOPIXEL_PIN PD3
+#if ANY(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
+ // Allow dedicated RGB (NeoPixel) pin to be used for a NeoPixel strip
+ #ifndef NEOPIXEL2_PIN
+ #define NEOPIXEL2_PIN PD3 // Neo-pixel
+ #endif
+#else
+ #ifndef NEOPIXEL_PIN
+ #define NEOPIXEL_PIN PD3 // Neo-pixel
+ #endif
#endif
diff --git a/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_1_H723.h b/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_1_H723.h
new file mode 100644
index 0000000000..44f54bb122
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_1_H723.h
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#pragma once
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "Spider King V1.1"
+#endif
+
+#include "../stm32f4/pins_FYSETC_SPIDER_KING_common.h"
diff --git a/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_H723.h b/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_H723.h
new file mode 100644
index 0000000000..551d367e28
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_FYSETC_SPIDER_KING_V1_H723.h
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#pragma once
+
+#ifndef BOARD_INFO_NAME
+ #define BOARD_INFO_NAME "Spider King V1.0"
+#endif
+
+#include "../stm32f4/pins_FYSETC_SPIDER_KING_common.h"
diff --git a/ini/renamed.ini b/ini/renamed.ini
index 4f9ce0793d..93f8afa43f 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -146,3 +146,6 @@ extends = renamed
[env:FYSETC_S6_8000] ;=> STM32F446VE_fysetc_32k_bootloader
extends = renamed
+
+[env:FYSETC_SPIDER_KING407] ;=> STM32F407ZG_fysetc
+extends = renamed
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index b736cbd0f4..722e73b396 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -126,9 +126,9 @@ board_upload.offset_address = 0x08008000
upload_command = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
#
-# FYSETC SPIDER KING407 (STM32F407ZGT6 ARM Cortex-M4)
+# FYSETC Spider King v1.x (STM32F407ZGT6 ARM Cortex-M4)
#
-[env:FYSETC_SPIDER_KING407]
+[env:STM32F407ZG_fysetc]
extends = stm32_variant
platform_packages = platformio/tool-dfuutil@~1.11.0
board = marlin_STM32F407ZGT6
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index 0bc35352cf..8ddb37590e 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -100,9 +100,9 @@ extends = STM32H723Vx_btt
board = marlin_STM32H723VG
#
-# BigTreeTech STM32H723Zx ARM Cortex-M7 Common
+# STM32H723Zx ARM Cortex-M7 Common
#
-[STM32H723Zx_btt]
+[STM32H723Zx_common]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
@@ -128,14 +128,14 @@ debug_tool = cmsis-dap
# BigTreeTech Octopus Pro V1.0.1/1.1 / Octopus Max EZ V1.0 / Manta M8P V2.0 (STM32H723ZET6 ARM Cortex-M7)
#
[env:STM32H723ZE_btt]
-extends = STM32H723Zx_btt
+extends = STM32H723Zx_common
board = marlin_STM32H723ZE
#
# BigTreeTech Kraken V1.0 (STM32H723ZGT6 ARM Cortex-M7)
#
[env:STM32H723ZG_btt]
-extends = STM32H723Zx_btt
+extends = STM32H723Zx_common
board = marlin_STM32H723ZG
#
@@ -172,3 +172,10 @@ build_flags = ${stm32_variant.build_flags}
-DUSE_USB_HS -DUSE_USB_HS_IN_FS
-DD_CACHE_DISABLED
upload_protocol = dfu
+
+#
+# FYSETC Spider King v1.x (STM32H723ZGT6 ARM Cortex-M7)
+#
+[env:STM32H723ZG_fysetc]
+extends = STM32H723Zx_common
+board = marlin_STM32H723ZG