From 01b7d6c413e0b1d3d5ac15193f9b8b261e53edf6 Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon, 29 Jul 2024 09:25:31 -0700 Subject: [PATCH] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Hold=20BTT=20renaming=20fo?= =?UTF-8?q?r=20later=20(#27307)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts #27301 --- .github/workflows/ci-build-tests.yml | 2 +- Marlin/src/pins/pins.h | 8 ++-- .../share/PlatformIO/debugging/launch.json | 2 +- .../{BIGTREE_SKR_SE_BX => BTT_SKR_SE_BX} | 2 +- ini/renamed.ini | 21 ---------- ini/stm32f4.ini | 42 +++++++++---------- ini/stm32h7.ini | 2 +- 7 files changed, 29 insertions(+), 50 deletions(-) rename buildroot/tests/{BIGTREE_SKR_SE_BX => BTT_SKR_SE_BX} (83%) diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml index e7ab65f3d9..1fa87a6ac5 100644 --- a/.github/workflows/ci-build-tests.yml +++ b/.github/workflows/ci-build-tests.yml @@ -125,7 +125,7 @@ jobs: - REMRAM_V1 # STM32H7 - - BIGTREE_SKR_SE_BX + - BTT_SKR_SE_BX - STM32H743VI_btt # STM32F1 (Maple) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 9b9cef2dd8..54cdd80f4d 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -757,9 +757,9 @@ #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:STM32F407VG_btt env:STM32F407VG_btt_USB env:STM32F407VG_btt_USB_debug + #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 #elif MB(BTT_SKR_V2_0_REV_B) - #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 + #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 #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) @@ -846,9 +846,9 @@ #elif MB(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:BIGTREE_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:BIGTREE_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 #elif MB(BTT_SKR_V3_0_EZ) diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json index e69663ca9d..ddd9ba7483 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/STM32F407VG_btt_USB_debug/firmware.elf", + "executable": "${workspaceRoot}/.pio/build/BIGTREE_SKR_2_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/tests/BIGTREE_SKR_SE_BX b/buildroot/tests/BTT_SKR_SE_BX similarity index 83% rename from buildroot/tests/BIGTREE_SKR_SE_BX rename to buildroot/tests/BTT_SKR_SE_BX index f29a754eaf..199cff14b9 100755 --- a/buildroot/tests/BIGTREE_SKR_SE_BX +++ b/buildroot/tests/BTT_SKR_SE_BX @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Build tests for BIGTREE_SKR_SE_BX +# Build tests for BTT_SKR_SE_BX # # exit on first failure diff --git a/ini/renamed.ini b/ini/renamed.ini index 07d5decb7d..5540374c68 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -104,24 +104,3 @@ extends = renamed [env:STM32G0B1VE_btt_xfer] ;=> STM32G0B1VE_btt extends = renamed - -[env:BTT_SKR_SE_BX] ;=> BIGTREE_SKR_SE_BX -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 c489681107..263dd65207 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -231,7 +231,7 @@ board = marlin_BigTree_BTT002_VET6 # # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support # -[env:STM32F407VG_btt] +[env:BIGTREE_SKR_2] extends = stm32_variant platform_packages = ${stm_flash_drive.platform_packages} board = marlin_STM32F407VGT6_CCM @@ -248,35 +248,35 @@ upload_protocol = stlink # # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support # -[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] +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_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 +[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 # -# Bigtreetech SKR V2.0 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support +# Bigtreetech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support # -[env:STM32F429VG_btt] -extends = env:STM32F407VG_btt +[env:BIGTREE_SKR_2_F429] +extends = env:BIGTREE_SKR_2 board = marlin_STM32F429VGT6 # -# BigTreeTech SKR V2.0 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support +# BigTreeTech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support # -[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] +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_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 +[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 # # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini index 37ae64ffbd..e5392464db 100644 --- a/ini/stm32h7.ini +++ b/ini/stm32h7.ini @@ -22,7 +22,7 @@ # # BigTreeTech SKR SE BX V2.0 / V3.0 (STM32H743IIT6 ARM Cortex-M7) # -[env:BIGTREE_SKR_SE_BX] +[env:BTT_SKR_SE_BX] extends = stm32_variant # framework-arduinoststm32 uses biqu-bx-workaround branch platform_packages = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/8b3522051a.zip