more specific MCUs

MarlinFirmware · Jun 8, 2023 · dc14355 · dc14355
1 parent 63543d2
commit dc14355
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 26 deletions.
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -540,32 +540,32 @@
 #elif MB(MALYAN_M200_V2)
   #include "stm32f0/pins_MALYAN_M200_V2.h"      // STM32F0                                env:STM32F070RB_malyan env:STM32F070CB_malyan
 #elif MB(MALYAN_M300)
-  #include "stm32f0/pins_MALYAN_M300.h"         // STM32F070                              env:malyan_M300
+  #include "stm32f0/pins_MALYAN_M300.h"         // STM32F0                                env:malyan_M300
 
 //
 // STM32 ARM Cortex-M3
 //
 
 #elif MB(STM32F103RE)
-  #include "stm32f1/pins_STM32F1R.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
+  #include "stm32f1/pins_STM32F1R.h"            // STM32F1                                env:STM32F103RE env:STM32F103RE_maple
 #elif MB(MALYAN_M200)
-  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan env:STM32F103CB_malyan_maple
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F1                                env:STM32F103CB_malyan env:STM32F103CB_malyan_maple
 #elif MB(STM3R_MINI)
-  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VB)
-  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_PRO_VD)
-  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
+  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F1                                env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_MINI)
-  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_MINI_A30)
-  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F1                                env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_REV_B)
-  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F1                                env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(MORPHEUS)
-  #include "stm32f1/pins_MORPHEUS.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
+  #include "stm32f1/pins_MORPHEUS.h"            // STM32F1                                env:STM32F103RE env:STM32F103RE_maple
 #elif MB(CHITU3D)
-  #include "stm32f1/pins_CHITU3D.h"             // STM32F103ZE                            env:STM32F103ZE env:STM32F103RE_maple
+  #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103ZE env:STM32F103RE_maple
 #elif MB(MKS_ROBIN)
   #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
 #elif MB(MKS_ROBIN_MINI)
@@ -663,15 +663,15 @@
 #elif MB(CREALITY_V25S1)
   #include "stm32f1/pins_CREALITY_V25S1.h"      // STM32F1                                env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
 #elif MB(CREALITY_V521)
-  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103VE                            env:STM32F103VE_creality
+  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F1                                env:STM32F103VE_creality
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
 #elif MB(FLY_MINI)
   #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI env:FLY_MINI_maple
 #elif MB(FLSUN_HISPEED)
   #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
 #elif MB(BEAST)
-  #include "stm32f1/pins_BEAST.h"               // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103VE env:STM32F103RE_maple
 #elif MB(MINGDA_MPX_ARM_MINI)
   #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
 #elif MB(ZONESTAR_ZM3E2)
@@ -681,13 +681,13 @@
 #elif MB(ZONESTAR_ZM3E4V2)
   #include "stm32f1/pins_ZM3E4_V2_0.h"          // STM32F1                                env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
 #elif MB(ERYONE_ERY32_MINI)
-  #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
+  #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F1                                env:ERYONE_ERY32_MINI_maple
 #elif MB(PANDA_PI_V29)
-  #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F103RCT6                          env:PANDA_PI_V29
+  #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F1                                env:PANDA_PI_V29
 #elif MB(SOVOL_V131)
   #include "gd32f1/pins_SOVOL_V131.h"           // GD32F1                                 env:GD32F103RET6_sovol_maple
 #elif MB(TRIGORILLA_V006)
-  #include "gd32f1/pins_TRIGORILLA_V006.h"      // GD32F103                               env:trigorilla_v006
+  #include "gd32f1/pins_TRIGORILLA_V006.h"      // GD32F1                                 env:trigorilla_v006
 #elif MB(KEDI_CONTROLLER_V1_2)
   #include "stm32f1/pins_KEDI_CONTROLLER_V1_2.h" // STM32F1                               env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 
@@ -733,7 +733,7 @@
 #elif MB(BTT_OCTOPUS_V1_1)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_1.h"    // STM32F4                                env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32F407ZE_btt env:STM32F407ZE_btt_USB
 #elif MB(BTT_OCTOPUS_PRO_V1_0)
-  #include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4                               env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723Zx_btt
+  #include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4                               env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723ZE_btt
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
@@ -810,11 +810,11 @@
 #elif MB(BTT_SKR_SE_BX_V3)
   #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"        // STM32H743Vx/STM32H723VG                env:STM32H743Vx_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"     // STM32H743Vx/STM32H723VG                env:STM32H743Vx_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"  // STM32H723ZE                            env:STM32H723Zx_btt
+  #include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h"  // STM32H7                                env:STM32H723ZE_btt
 #elif MB(TEENSY41)
   #include "teensy4/pins_TEENSY41.h"            // Teensy-4.x                             env:teensy41
 #elif MB(T41U5XBB)

diff --git a/...PlatformIO/boards/marlin_STM32H723Zx.json → ...PlatformIO/boards/marlin_STM32H723ZE.json b/...PlatformIO/boards/marlin_STM32H723Zx.json → ...PlatformIO/boards/marlin_STM32H723ZE.json
diff --git a/...PlatformIO/boards/marlin_STM32H743Vx.json → ...PlatformIO/boards/marlin_STM32H743VI.json b/...PlatformIO/boards/marlin_STM32H743Vx.json → ...PlatformIO/boards/marlin_STM32H743VI.json
diff --git a/ini/renamed.ini b/ini/renamed.ini
@@ -74,3 +74,9 @@ extends = renamed
 
 [env:STM32H723Vx_btt]                 ;=> STM32H723VG_btt
 extends = renamed
+
+[env:STM32H723Zx_btt]                 ;=> STM32H723ZE_btt
+extends = renamed
+
+[env:STM32H743Vx_btt]                 ;=> STM32H743VI_btt
+extends = renamed
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
@@ -40,13 +40,12 @@ upload_protocol    = cmsis-dap
 debug_tool         = cmsis-dap
 
 #
-# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
+# BigTreeTech STM32H743Vx ARM Cortex-M7 Common
 #
-[env:STM32H743Vx_btt]
+[STM32H743Vx_btt]
 extends                     = stm32_variant
 platform                    = ststm32@15.4.1
 platform_packages           = framework-arduinoststm32@~4.20200.220530
-board                       = marlin_STM32H743Vx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
@@ -60,6 +59,13 @@ build_flags                 = ${stm32_variant.build_flags}
 upload_protocol             = cmsis-dap
 debug_tool                  = cmsis-dap
 
+#
+# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
+#
+[env:STM32H743VI_btt]
+extends                     = STM32H743Vx_btt
+board                       = marlin_STM32H743VI
+
 #
 # BigTreeTech STM32H723Vx ARM Cortex-M7 Common
 #
@@ -93,13 +99,12 @@ extends                     = STM32H723Vx_btt
 board                       = marlin_STM32H723VG
 
 #
-# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
+# BigTreeTech STM32H723Zx ARM Cortex-M7 Common
 #
-[env:STM32H723Zx_btt]
+[STM32H723Zx_btt]
 extends                     = stm32_variant
 platform                    = ststm32@15.4.1
 platform_packages           = framework-arduinoststm32@~4.20200.220530
-board                       = marlin_STM32H723Zx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
@@ -117,3 +122,10 @@ build_flags                 = ${stm32_variant.build_flags}
                               -UI2C5_BASE
 upload_protocol             = cmsis-dap
 debug_tool                  = cmsis-dap
+
+#
+# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
+#
+[env:STM32H723ZE_btt]
+extends                     = STM32H723Zx_btt
+board                       = marlin_STM32H723ZE