🔨 Rename "BTT" things, MCU-based SKR 2 (#27319)

Co-authored-by: Keith Bennett <[email protected]>

.github/workflows/ci-build-tests.yml

@@ -106,9 +106,9 @@ jobs:
 
         # STM32F4
         - ARMED
-        - BIGTREE_BTT002
-        - BIGTREE_GTR_V1_0
-        - BIGTREE_SKR_PRO
+        - BTT_BTT002
+        - BTT_GTR_V1_0
+        - BTT_SKR_PRO
         - FLYF407ZG
         - FYSETC_S6
         - LERDGEK

Marlin/src/pins/pins.h

@@ -745,21 +745,21 @@
 #elif MB(BLACK_STM32F407VE)
   #include "stm32f4/pins_BLACK_STM32F407VE.h"       // STM32F4                              env:STM32F407VE_black
 #elif MB(BTT_SKR_PRO_V1_1)
-  #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h"        // STM32F4                              env:BIGTREE_SKR_PRO env:BIGTREE_SKR_PRO_usb_flash_drive
+  #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h"        // STM32F4                              env:BTT_SKR_PRO env:BTT_SKR_PRO_usb_flash_drive
 #elif MB(BTT_SKR_PRO_V1_2)
-  #include "stm32f4/pins_BTT_SKR_PRO_V1_2.h"        // STM32F4                              env:BIGTREE_SKR_PRO env:BIGTREE_SKR_PRO_usb_flash_drive
+  #include "stm32f4/pins_BTT_SKR_PRO_V1_2.h"        // STM32F4                              env:BTT_SKR_PRO env:BTT_SKR_PRO_usb_flash_drive
 #elif MB(BTT_GTR_V1_0)
-  #include "stm32f4/pins_BTT_GTR_V1_0.h"            // STM32F4                              env:BIGTREE_GTR_V1_0 env:BIGTREE_GTR_V1_0_usb_flash_drive
+  #include "stm32f4/pins_BTT_GTR_V1_0.h"            // STM32F4                              env:BTT_GTR_V1_0 env:BTT_GTR_V1_0_usb_flash_drive
 #elif MB(BTT_BTT002_V1_0)
-  #include "stm32f4/pins_BTT_BTT002_V1_0.h"         // STM32F4                              env:BIGTREE_BTT002 env:BIGTREE_BTT002_VET6
+  #include "stm32f4/pins_BTT_BTT002_V1_0.h"         // STM32F4                              env:BTT_BTT002 env:BTT_BTT002_VET6
 #elif MB(BTT_E3_RRF)
-  #include "stm32f4/pins_BTT_E3_RRF.h"              // STM32F4                              env:BIGTREE_E3_RRF
+  #include "stm32f4/pins_BTT_E3_RRF.h"              // STM32F4                              env:BTT_E3_RRF
 #elif MB(BTT_SKR_MINI_E3_V3_0_1)
   #include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"  // STM32F4                              env:STM32F401RC_btt env:STM32F401RC_btt_xfer
 #elif MB(BTT_SKR_V2_0_REV_A)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"      // STM32F4                              env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"      // STM32F4                              env:STM32F407VG_btt env:STM32F407VG_btt_USB env:STM32F407VG_btt_USB_debug
 #elif MB(BTT_SKR_V2_0_REV_B)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"      // STM32F4                              env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug env:BIGTREE_SKR_2_F429 env:BIGTREE_SKR_2_F429_USB env:BIGTREE_SKR_2_F429_USB_debug
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"      // STM32F4                              env:STM32F407VG_btt env:STM32F407VG_btt_USB env:STM32F407VG_btt_USB_debug env:STM32F429VG_btt env:STM32F429VG_btt_USB env:STM32F429VG_btt_USB_debug
 #elif MB(BTT_OCTOPUS_V1_0)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"        // STM32F4                              env:STM32F446ZE_btt env:STM32F446ZE_btt_usb_flash_drive
 #elif MB(BTT_OCTOPUS_V1_1)

Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h

@@ -308,7 +308,7 @@
     #define FORCE_SOFT_SPI
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1 and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1 and MKS_LCD12864A/B are currently supported on the SKR E3 DIP."
   #endif
 
 #endif // HAS_WIRED_LCD

Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h

@@ -348,7 +348,7 @@
     #define FORCE_SOFT_SPI
 
   #else
-    #error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
+    #error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864 are currently supported on the SKR Mini E3."
   #endif
 
 #endif // HAS_WIRED_LCD

Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h

@@ -282,7 +282,7 @@
     #endif
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the SKR Mini E3."
   #endif
 
 #endif // HAS_WIRED_LCD

Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h

@@ -247,7 +247,7 @@
       #define LCD_BACKLIGHT_PIN             -1
       #define NEOPIXEL_PIN           EXP1_02_PIN
     #else
-      #error "Only FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 / BEEZ_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3 with SKR_MINI_SCREEN_ADAPTER."
+      #error "Only FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864 / BEEZ_MINI_12864 are currently supported on the SKR Mini E3 with SKR_MINI_SCREEN_ADAPTER."
     #endif
 
   #else
@@ -374,7 +374,7 @@
       #define LCD_BACKLIGHT_PIN             -1
 
     #else
-      #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+      #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the SKR Mini E3."
     #endif
 
   #endif // SKR_MINI_SCREEN_ADAPTER

Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h

@@ -442,7 +442,7 @@
   #define NEOPIXEL_PIN               EXP1_06_PIN
 
 #elif HAS_WIRED_LCD
-  #error "Only BTT_MINI_12864 (BTT Mini 12864 V2.0 with FPC cable) is currently supported on the BIGTREE_OCTOPUS_MAX_EZ."
+  #error "Only BTT_MINI_12864 (BTT Mini 12864 V2.0 with FPC cable) is currently supported on the Octopus Max EZ."
 #endif
 
 //

buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002.json → buildroot/share/PlatformIO/boards/marlin_BTT_BTT002.json

@@ -15,7 +15,7 @@
       ]
     ],
     "mcu": "stm32f407vgt6",
-    "variant": "MARLIN_BIGTREE_BTT002"
+    "variant": "MARLIN_BTT_BTT002"
   },
   "debug": {
     "jlink_device": "STM32F407VG",

buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json → buildroot/share/PlatformIO/boards/marlin_BTT_BTT002_VET6.json

@@ -15,7 +15,7 @@
       ]
     ],
     "mcu": "stm32f407vet6",
-    "variant": "MARLIN_BIGTREE_BTT002"
+    "variant": "MARLIN_BTT_BTT002"
   },
   "debug": {
     "jlink_device": "STM32F407VE",

buildroot/share/PlatformIO/boards/marlin_BigTree_GTR_v1.json → buildroot/share/PlatformIO/boards/marlin_BTT_GTR_v1.json

@@ -15,7 +15,7 @@
       ]
     ],
     "mcu": "stm32f407zgt6",
-    "variant": "MARLIN_BIGTREE_GTR_V1"
+    "variant": "MARLIN_BTT_GTR_V1"
   },
   "debug": {
     "jlink_device": "STM32F407ZG",

buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json → buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_Pro_v1_F429.json

@@ -5,7 +5,7 @@
     "f_cpu": "168000000L",
     "mcu": "stm32f429zgt6",
     "product_line": "STM32F429xx",
-    "variant": "MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429"
+    "variant": "MARLIN_BTT_OCTOPUS_PRO_V1_F429"
   },
   "connectivity": [
     "can"

buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json → buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_v1.json

@@ -4,7 +4,7 @@
     "extra_flags": "-DSTM32F446xx",
     "f_cpu": "180000000L",
     "mcu": "stm32f446zet6",
-    "variant": "MARLIN_BIGTREE_OCTOPUS_V1"
+    "variant": "MARLIN_BTT_OCTOPUS_V1"
   },
   "connectivity": [
     "can"

buildroot/share/PlatformIO/boards/marlin_BigTree_SKR_Pro.json → buildroot/share/PlatformIO/boards/marlin_BTT_SKR_Pro.json

@@ -15,7 +15,7 @@
       ]
     ],
     "mcu": "stm32f407zgt6",
-    "variant": "MARLIN_BIGTREE_SKR_PRO_11"
+    "variant": "MARLIN_BTT_SKR_PRO_11"
   },
   "debug": {
     "jlink_device": "STM32F407ZG",

buildroot/share/PlatformIO/debugging/launch.json

@@ -20,7 +20,7 @@
             "showDevDebugOutput": false,
             "configFiles": [ "interface/stlink.cfg", "target/stm32f4x.cfg" ],
             "device": "stlink",
-            "executable": "${workspaceRoot}/.pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
+            "executable": "${workspaceRoot}/.pio/build/STM32F407VG_btt_USB_debug/firmware.elf",
             "openOCDLaunchCommands": [ "init", "reset init" ],
             "svdFile": "${env:HOME}/.platformio/platforms/[email protected]/misc/svd/STM32F40x.svd",
         },

ini/renamed.ini

@@ -104,3 +104,42 @@ extends = renamed
 
 [env:STM32G0B1VE_btt_xfer]            ;=> STM32G0B1VE_btt
 extends = renamed
+
+[env:BIGTREE_SKR_PRO]                 ;=> BTT_SKR_PRO
+extends = renamed
+
+[env:BIGTREE_SKR_PRO_usb_flash_drive] ;=> BTT_SKR_PRO_usb_flash_drive
+extends = renamed
+
+[env:BIGTREE_E3_RRF]                  ;=> BTT_E3_RRF
+extends = renamed
+
+[env:BIGTREE_GTR_V1_0]                ;=> BTT_GTR_V1_0
+extends = renamed
+
+[env:BIGTREE_GTR_V1_0_usb_flash_drive] ;=> BTT_GTR_V1_0_usb_flash_drive
+extends = renamed
+
+[env:BIGTREE_BTT002]                  ;=> BTT_BTT002
+extends = renamed
+
+[env:BIGTREE_BTT002_VET6]             ;=> BTT_BTT002_VET6
+extends = renamed
+
+[env:BIGTREE_SKR_2]                   ;=> STM32F407VG_btt
+extends = renamed
+
+[env:BIGTREE_SKR_2_USB]               ;=> STM32F407VG_btt_USB
+extends = renamed
+
+[env:BIGTREE_SKR_2_USB_debug]         ;=> STM32F407VG_btt_USB_debug
+extends = renamed
+
+[env:BIGTREE_SKR_2_F429]              ;=> STM32F429VG_btt
+extends = renamed
+
+[env:BIGTREE_SKR_2_F429_USB]          ;=> STM32F429VG_btt_USB
+extends = renamed
+
+[env:BIGTREE_SKR_2_F429_USB_debug]    ;=> STM32F429VG_btt_USB_debug
+extends = renamed

ini/stm32f4.ini

@@ -159,9 +159,9 @@ extra_scripts               = ${stm32_variant.extra_scripts}
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
-[env:BIGTREE_SKR_PRO]
+[env:BTT_SKR_PRO]
 extends            = stm32_variant
-board              = marlin_BigTree_SKR_Pro
+board              = marlin_BTT_SKR_Pro
 board_build.offset = 0x8000
 build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX
 debug_tool         = stlink
@@ -170,19 +170,19 @@ upload_protocol    = stlink
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:BIGTREE_SKR_PRO_usb_flash_drive]
-extends           = env:BIGTREE_SKR_PRO
+[env:BTT_SKR_PRO_usb_flash_drive]
+extends           = env:BTT_SKR_PRO
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407_5ZX
-build_unflags     = ${env:BIGTREE_SKR_PRO.build_unflags} -DUSBCON -DUSBD_USE_CDC
+build_unflags     = ${env:BTT_SKR_PRO.build_unflags} -DUSBCON -DUSBD_USE_CDC
 
 #
 # BigTreeTech E3 RRF (STM32F407VGT6 ARM Cortex-M4)
 #
-[env:BIGTREE_E3_RRF]
+[env:BTT_E3_RRF]
 extends             = stm32_variant
 board               = marlin_STM32F407VGT6_CCM
-board_build.variant = MARLIN_BIGTREE_E3_RRF
+board_build.variant = MARLIN_BTT_E3_RRF
 board_build.offset  = 0x8000
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F407_5VX
@@ -192,27 +192,27 @@ build_flags         = ${stm32_variant.build_flags}
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #
-[env:BIGTREE_GTR_V1_0]
+[env:BTT_GTR_V1_0]
 extends            = stm32_variant
-board              = marlin_BigTree_GTR_v1
+board              = marlin_BTT_GTR_v1
 board_build.offset = 0x8000
 build_flags        = ${stm32_variant.build_flags} -DSTM32F407IX
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:BIGTREE_GTR_V1_0_usb_flash_drive]
-extends           = env:BIGTREE_GTR_V1_0
+[env:BTT_GTR_V1_0_usb_flash_drive]
+extends           = env:BTT_GTR_V1_0
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407IX
-build_unflags     = ${env:BIGTREE_GTR_V1_0.build_unflags} -DUSBCON -DUSBD_USE_CDC
+build_unflags     = ${env:BTT_GTR_V1_0.build_unflags} -DUSBCON -DUSBD_USE_CDC
 
 #
 # BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4)
 #
-[env:BIGTREE_BTT002]
+[env:BTT_BTT002]
 extends            = stm32_variant
-board              = marlin_BigTree_BTT002
+board              = marlin_BTT_BTT002
 board_build.offset = 0x8000
 build_flags        = ${stm32_variant.build_flags}
                      -DSTM32F407_5VX
@@ -224,14 +224,14 @@ build_flags        = ${stm32_variant.build_flags}
 #
 # BigTreeTech BTT002 V1.x with 512k of flash (STM32F407VET6 ARM Cortex-M4)
 #
-[env:BIGTREE_BTT002_VET6]
-extends           = env:BIGTREE_BTT002
-board             = marlin_BigTree_BTT002_VET6
+[env:BTT_BTT002_VET6]
+extends           = env:BTT_BTT002
+board             = marlin_BTT_BTT002_VET6
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:BIGTREE_SKR_2]
+[env:STM32F407VG_btt]
 extends                     = stm32_variant
 platform_packages           = ${stm_flash_drive.platform_packages}
 board                       = marlin_STM32F407VGT6_CCM
@@ -248,42 +248,42 @@ upload_protocol             = stlink
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support
 #
-[env:BIGTREE_SKR_2_USB]
-extends           = env:BIGTREE_SKR_2
-build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
-build_unflags     = ${env:BIGTREE_SKR_2.build_unflags} -DUSBD_USE_CDC
+[env:STM32F407VG_btt_USB]
+extends           = env:STM32F407VG_btt
+build_flags       = ${env:STM32F407VG_btt.build_flags} -DUSBD_USE_CDC_MSC
+build_unflags     = ${env:STM32F407VG_btt.build_unflags} -DUSBD_USE_CDC
 
-[env:BIGTREE_SKR_2_USB_debug]
-extends           = env:BIGTREE_SKR_2_USB
-build_flags       = ${env:BIGTREE_SKR_2_USB.build_flags} -O0
-build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
+[env:STM32F407VG_btt_USB_debug]
+extends           = env:STM32F407VG_btt_USB
+build_flags       = ${env:STM32F407VG_btt_USB.build_flags} -O0
+build_unflags     = ${env:STM32F407VG_btt_USB.build_unflags} -Os -NDEBUG
 
 #
-# Bigtreetech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support
+# Bigtreetech SKR V2.0 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:BIGTREE_SKR_2_F429]
-extends                     = env:BIGTREE_SKR_2
+[env:STM32F429VG_btt]
+extends                     = env:STM32F407VG_btt
 board                       = marlin_STM32F429VGT6
 
 #
-# BigTreeTech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support
+# BigTreeTech SKR V2.0 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support
 #
-[env:BIGTREE_SKR_2_F429_USB]
-extends           = env:BIGTREE_SKR_2_F429
-build_flags       = ${env:BIGTREE_SKR_2_F429.build_flags} -DUSBD_USE_CDC_MSC
-build_unflags     = ${env:BIGTREE_SKR_2_F429.build_unflags} -DUSBD_USE_CDC
+[env:STM32F429VG_btt_USB]
+extends           = env:STM32F429VG_btt
+build_flags       = ${env:STM32F429VG_btt.build_flags} -DUSBD_USE_CDC_MSC
+build_unflags     = ${env:STM32F429VG_btt.build_unflags} -DUSBD_USE_CDC
 
-[env:BIGTREE_SKR_2_F429_USB_debug]
-extends           = env:BIGTREE_SKR_2_F429_USB
-build_flags       = ${env:BIGTREE_SKR_2_F429_USB.build_flags} -O0
-build_unflags     = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
+[env:STM32F429VG_btt_USB_debug]
+extends           = env:STM32F429VG_btt_USB
+build_flags       = ${env:STM32F429VG_btt_USB.build_flags} -O0
+build_unflags     = ${env:STM32F429VG_btt_USB.build_unflags} -Os -NDEBUG
 
 #
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #
 [env:STM32F446ZE_btt]
 extends                     = stm32_variant
-board                       = marlin_BigTree_Octopus_v1
+board                       = marlin_BTT_Octopus_v1
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 debug_tool                  = stlink
@@ -309,7 +309,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 #
 [env:STM32F429ZG_btt]
 extends                     = stm32_variant
-board                       = marlin_BigTree_Octopus_Pro_v1_F429
+board                       = marlin_BTT_Octopus_Pro_v1_F429
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 debug_tool                  = stlink