From dde89795c90d50701b5ea886e1f84a1a6194e35c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 29 Jul 2024 13:25:17 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Rename=20"BTT"=20things,=20MCU-b?= =?UTF-8?q?ased=20SKR=202=20(#27319)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> --- .github/workflows/ci-build-tests.yml | 6 +- Marlin/src/pins/pins.h | 14 ++-- Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 2 +- .../stm32f1/pins_BTT_SKR_MINI_E3_common.h | 2 +- .../stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h | 2 +- .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 4 +- .../pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h | 2 +- ...ree_BTT002.json => marlin_BTT_BTT002.json} | 2 +- ..._VET6.json => marlin_BTT_BTT002_VET6.json} | 2 +- ...ree_GTR_v1.json => marlin_BTT_GTR_v1.json} | 2 +- ...on => marlin_BTT_Octopus_Pro_v1_F429.json} | 2 +- ...pus_v1.json => marlin_BTT_Octopus_v1.json} | 2 +- ...e_SKR_Pro.json => marlin_BTT_SKR_Pro.json} | 2 +- .../share/PlatformIO/debugging/launch.json | 2 +- .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../hal_conf_extra.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../tests/{BIGTREE_BTT002 => BTT_BTT002} | 0 .../tests/{BIGTREE_GTR_V1_0 => BTT_GTR_V1_0} | 0 ...ash_drive => BTT_GTR_V1_0_usb_flash_drive} | 0 .../tests/{BIGTREE_SKR_PRO => BTT_SKR_PRO} | 0 ini/renamed.ini | 39 +++++++++ ini/stm32f4.ini | 80 +++++++++---------- 56 files changed, 102 insertions(+), 63 deletions(-) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_BTT002.json => marlin_BTT_BTT002.json} (96%) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_BTT002_VET6.json => marlin_BTT_BTT002_VET6.json} (96%) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_GTR_v1.json => marlin_BTT_GTR_v1.json} (96%) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_Octopus_Pro_v1_F429.json => marlin_BTT_Octopus_Pro_v1_F429.json} (95%) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_Octopus_v1.json => marlin_BTT_Octopus_v1.json} (94%) rename buildroot/share/PlatformIO/boards/{marlin_BigTree_SKR_Pro.json => marlin_BTT_SKR_Pro.json} (95%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_BTT002 => MARLIN_BTT_BTT002}/variant.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_E3_RRF => MARLIN_BTT_E3_RRF}/variant.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_GTR_V1 => MARLIN_BTT_GTR_V1}/variant.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429 => MARLIN_BTT_OCTOPUS_PRO_V1_F429}/variant.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1 => MARLIN_BTT_OCTOPUS_V1}/variant.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/hal_conf_extra.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_SKR_PRO_11 => MARLIN_BTT_SKR_PRO_11}/variant.h (100%) rename buildroot/tests/{BIGTREE_BTT002 => BTT_BTT002} (100%) rename buildroot/tests/{BIGTREE_GTR_V1_0 => BTT_GTR_V1_0} (100%) rename buildroot/tests/{BIGTREE_GTR_V1_0_usb_flash_drive => BTT_GTR_V1_0_usb_flash_drive} (100%) rename buildroot/tests/{BIGTREE_SKR_PRO => BTT_SKR_PRO} (100%) diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml index 1fa87a6ac5f6..6fde07da4291 100644 --- a/.github/workflows/ci-build-tests.yml +++ b/.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 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 54cdd80f4d55..443e5fbd2389 100644 --- a/Marlin/src/pins/pins.h +++ b/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) diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h index a3794bf448b7..3b42a0985283 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h +++ b/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 diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h index a01833db0362..09acba180b8b 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h +++ b/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 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h index b833a8da52cd..8b70b22e56d7 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h +++ b/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 diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h index 6c724ad1bf53..3afc829fedd4 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h +++ b/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 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h index f51dbac93b14..3ceb9561ab4d 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h +++ b/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 // diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002.json b/buildroot/share/PlatformIO/boards/marlin_BTT_BTT002.json similarity index 96% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_BTT002.json index 28a79271b89c..00e3cd855971 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002.json +++ b/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", diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json b/buildroot/share/PlatformIO/boards/marlin_BTT_BTT002_VET6.json similarity index 96% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_BTT002_VET6.json index 77d3af011283..c738600b9758 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json +++ b/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", diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_GTR_v1.json b/buildroot/share/PlatformIO/boards/marlin_BTT_GTR_v1.json similarity index 96% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_GTR_v1.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_GTR_v1.json index e311ce3b5278..b5e9d817504f 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_GTR_v1.json +++ b/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", diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json b/buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_Pro_v1_F429.json similarity index 95% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_Pro_v1_F429.json index 66ee1c842e52..3129133a3c50 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json +++ b/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" diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json b/buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_v1.json similarity index 94% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_Octopus_v1.json index ea2515407900..da06cd980095 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json +++ b/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" diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_SKR_Pro.json b/buildroot/share/PlatformIO/boards/marlin_BTT_SKR_Pro.json similarity index 95% rename from buildroot/share/PlatformIO/boards/marlin_BigTree_SKR_Pro.json rename to buildroot/share/PlatformIO/boards/marlin_BTT_SKR_Pro.json index 5e76c2c9e205..c46dbaf7ac91 100644 --- a/buildroot/share/PlatformIO/boards/marlin_BigTree_SKR_Pro.json +++ b/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", diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json index ddd9ba7483a3..e69663ca9d32 100644 --- a/buildroot/share/PlatformIO/debugging/launch.json +++ b/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/ststm32@12.1.1/misc/svd/STM32F40x.svd", }, diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_BTT002/variant.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_E3_RRF/variant.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_GTR_V1/variant.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_PRO_V1_F429/variant.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_OCTOPUS_V1/variant.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/hal_conf_extra.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/hal_conf_extra.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_PRO_11/variant.h diff --git a/buildroot/tests/BIGTREE_BTT002 b/buildroot/tests/BTT_BTT002 similarity index 100% rename from buildroot/tests/BIGTREE_BTT002 rename to buildroot/tests/BTT_BTT002 diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BTT_GTR_V1_0 similarity index 100% rename from buildroot/tests/BIGTREE_GTR_V1_0 rename to buildroot/tests/BTT_GTR_V1_0 diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive b/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive similarity index 100% rename from buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive rename to buildroot/tests/BTT_GTR_V1_0_usb_flash_drive diff --git a/buildroot/tests/BIGTREE_SKR_PRO b/buildroot/tests/BTT_SKR_PRO similarity index 100% rename from buildroot/tests/BIGTREE_SKR_PRO rename to buildroot/tests/BTT_SKR_PRO diff --git a/ini/renamed.ini b/ini/renamed.ini index 5540374c685e..fb5fce629711 100644 --- a/ini/renamed.ini +++ b/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 diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 263dd65207e1..24db0b2dbb9e 100644 --- a/ini/stm32f4.ini +++ b/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