From 45ba9a01e6d0b99addbdffc9f6b1e6a53026f560 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 29 Jul 2024 11:44:05 -0500 Subject: [PATCH] Use MCU naming --- Marlin/src/pins/pins.h | 4 +- .../share/PlatformIO/debugging/launch.json | 2 +- ini/renamed.ini | 12 +++--- ini/stm32f4.ini | 38 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index eef3165bdde4f..443e5fbd23898 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:BTT_SKR_2 env:BTT_SKR_2_USB env:BTT_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:BTT_SKR_2 env:BTT_SKR_2_USB env:BTT_SKR_2_USB_debug env:BTT_SKR_2_F429 env:BTT_SKR_2_F429_USB env:BTT_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/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json index 7370895dd9919..e69663ca9d320 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/BTT_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/ini/renamed.ini b/ini/renamed.ini index 3971a4795bcb7..fb5fce6297113 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -126,20 +126,20 @@ extends = renamed [env:BIGTREE_BTT002_VET6] ;=> BTT_BTT002_VET6 extends = renamed -[env:BIGTREE_SKR_2] ;=> BTT_SKR_2 +[env:BIGTREE_SKR_2] ;=> STM32F407VG_btt extends = renamed -[env:BIGTREE_SKR_2_USB] ;=> BTT_SKR_2_USB +[env:BIGTREE_SKR_2_USB] ;=> STM32F407VG_btt_USB extends = renamed -[env:BIGTREE_SKR_2_USB_debug] ;=> BTT_SKR_2_USB_debug +[env:BIGTREE_SKR_2_USB_debug] ;=> STM32F407VG_btt_USB_debug extends = renamed -[env:BIGTREE_SKR_2_F429] ;=> BTT_SKR_2_F429 +[env:BIGTREE_SKR_2_F429] ;=> STM32F429VG_btt extends = renamed -[env:BIGTREE_SKR_2_F429_USB] ;=> BTT_SKR_2_F429_USB +[env:BIGTREE_SKR_2_F429_USB] ;=> STM32F429VG_btt_USB extends = renamed -[env:BIGTREE_SKR_2_F429_USB_debug] ;=> BTT_SKR_2_F429_USB_debug +[env:BIGTREE_SKR_2_F429_USB_debug] ;=> STM32F429VG_btt_USB_debug extends = renamed diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 45528dbb149cc..69ace2f7ff590 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -231,7 +231,7 @@ board = marlin_BTT_BTT002_VET6 # # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support # -[env:BTT_SKR_2] +[env:STM32F407VG_btt] 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:BTT_SKR_2_USB] -extends = env:BTT_SKR_2 -build_flags = ${env:BTT_SKR_2.build_flags} -DUSBD_USE_CDC_MSC -build_unflags = ${env:BTT_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:BTT_SKR_2_USB_debug] -extends = env:BTT_SKR_2_USB -build_flags = ${env:BTT_SKR_2_USB.build_flags} -O0 -build_unflags = ${env:BTT_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 # -[env:BTT_SKR_2_F429] -extends = env:BTT_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 # -[env:BTT_SKR_2_F429_USB] -extends = env:BTT_SKR_2_F429 -build_flags = ${env:BTT_SKR_2_F429.build_flags} -DUSBD_USE_CDC_MSC -build_unflags = ${env:BTT_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:BTT_SKR_2_F429_USB_debug] -extends = env:BTT_SKR_2_F429_USB -build_flags = ${env:BTT_SKR_2_F429_USB.build_flags} -O0 -build_unflags = ${env:BTT_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)