0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🔨 Fix USB FD env names (#26131)

Browse source
This commit is contained in:
Keith Bennett 2023-08-07 14:00:50 -07:00 committed by GitHub
parent 4f691e622f
commit ca0209b868
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/pins/pins.h
View file

@ -739,11 +739,11 @@
#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
#elif MB(BTT_OCTOPUS_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB
#include "stm32f4/pins_BTT_OCTOPUS_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_usb_flash_drive
#elif MB(BTT_OCTOPUS_V1_1)
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32F407ZE_btt env:STM32F407ZE_btt_USB
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_usb_flash_drive env:STM32F429ZG_btt env:STM32F429ZG_btt_usb_flash_drive env:STM32F407ZE_btt env:STM32F407ZE_btt_usb_flash_drive
#elif MB(BTT_OCTOPUS_PRO_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723ZE_btt
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_usb_flash_drive env:STM32F429ZG_btt env:STM32F429ZG_btt_usb_flash_drive env:STM32H723ZE_btt
#elif MB(LERDGE_K)
#include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:LERDGEK env:LERDGEK_usb_flash_drive
#elif MB(LERDGE_S)

15
ini/renamed.ini
View file

@ -63,19 +63,19 @@ extends = renamed
[env:BIGTREE_OCTOPUS_V1] ;=> STM32F446ZE_btt
extends = renamed
[env:BIGTREE_OCTOPUS_V1_USB] ;=> STM32F446ZE_btt_USB
[env:BIGTREE_OCTOPUS_V1_USB] ;=> STM32F446ZE_btt_usb_flash_drive
extends = renamed
[env:BIGTREE_OCTOPUS_PRO_V1_F429] ;=> STM32F429ZG_btt
extends = renamed
[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB] ;=> STM32F429ZG_btt_USB
[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB] ;=> STM32F429ZG_btt_usb_flash_drive
extends = renamed
[env:BIGTREE_OCTOPUS_V1_F407] ;=> STM32F407ZE_btt
extends = renamed
[env:BIGTREE_OCTOPUS_V1_F407_USB] ;=> STM32F407ZE_btt_USB
[env:BIGTREE_OCTOPUS_V1_F407_USB] ;=> STM32F407ZE_btt_usb_flash_drive
extends = renamed
[env:STM32H723Vx_btt] ;=> STM32H723VG_btt
@ -86,3 +86,12 @@ extends = renamed
[env:STM32H743Vx_btt] ;=> STM32H743VI_btt
extends = renamed
[env:STM32F446ZE_btt_USB] ;=> STM32F446ZE_btt_usb_flash_drive
extends = renamed
[env:STM32F429ZG_btt_USB] ;=> STM32F429ZG_btt_usb_flash_drive
extends = renamed
[env:STM32F407ZE_btt_USB] ;=> STM32F407ZE_btt_usb_flash_drive
extends = renamed

4
ini/stm32f1-maple.ini
View file

@ -95,7 +95,7 @@ upload_protocol = serial
# BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
#
# STM32F103RC_btt_maple ............. RCT6 with 256K
# STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
# STM32F103RC_btt_USB_maple ......... RCT6 with 256K with USB Media Share Support
#
[env:STM32F103RC_btt_maple]
extends = env:STM32F103RC_maple
@ -146,7 +146,7 @@ board_build.ldscript = crealityPro.ld
# BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
#
# STM32F103RE_btt_maple ............. RET6
# STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
# STM32F103RE_btt_USB_maple ......... RET6 with USB Media Share Support
#
[env:STM32F103RE_btt_maple]
extends = env:STM32F103RE_maple

4
ini/stm32f1.ini
View file

@ -54,7 +54,7 @@ monitor_speed = 115200
# BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
#
# STM32F103RC_btt ............. RCT6 with 256K
# STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
# STM32F103RC_btt_USB ......... RCT6 with 256K with USB Media Share Support
#
[env:STM32F103RC_btt]
extends = common_STM32F103RC_variant
@ -206,7 +206,7 @@ build_flags = ${stm32_variant.build_flags}
# BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
#
# STM32F103RE_btt ............. RET6
# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
# STM32F103RE_btt_USB ......... RET6 with USB Media Share Support
#
[env:STM32F103RE_btt]
extends = stm32_variant

6
ini/stm32f4.ini
View file

@ -283,7 +283,7 @@ build_flags = ${stm32_variant.build_flags}
#
# BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:STM32F446ZE_btt_USB]
[env:STM32F446ZE_btt_usb_flash_drive]
extends = env:STM32F446ZE_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
@ -309,7 +309,7 @@ build_flags = ${stm32_variant.build_flags}
#
# BigTreeTech Octopus V1.1 / Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:STM32F429ZG_btt_USB]
[env:STM32F429ZG_btt_usb_flash_drive]
extends = env:STM32F429ZG_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
@ -331,7 +331,7 @@ build_flags = ${stm32_variant.build_flags}
#
# BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:STM32F407ZE_btt_USB]
[env:STM32F407ZE_btt_usb_flash_drive]
extends = env:STM32F407ZE_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC