Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "🔨 Rename BTT SKR V2.0 PIO envs (#27301)" #27307

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Revert "🔨 Rename BTT SKR V2.0 PIO envs (#27301)" #27307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
- REMRAM_V1

# STM32H7
- BIGTREE_SKR_SE_BX
- BTT_SKR_SE_BX
- STM32H743VI_btt

# STM32F1 (Maple)
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/debugging/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down
2 changes: 1 addition & 1 deletion buildroot/tests/BIGTREE_SKR_SE_BX → buildroot/tests/BTT_SKR_SE_BX
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 0 additions & 21 deletions ini/renamed.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
42 changes: 21 additions & 21 deletions ini/stm32f4.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ini/stm32h7.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading