From b81d4c3075104d255db5d134deade1186bdbd123 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Feb 2023 21:41:44 -0600 Subject: [PATCH] keep xfer --- Marlin/src/inc/SanityCheck.h | 2 +- Marlin/src/pins/pins.h | 34 +++++++++++++++++----------------- ini/renamed.ini | 14 +------------- ini/stm32f1.ini | 14 +++++++------- ini/stm32g0.ini | 10 +++++----- 5 files changed, 31 insertions(+), 43 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 000bd8d41eeb..85bdba8a8e06 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -4396,7 +4396,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive."); #endif // Check requirements for upload.py -#if ENABLED(BFT_BUILD) && !BOTH(BINARY_FILE_TRANSFER, CUSTOM_FIRMWARE_UPLOAD) +#if ENABLED(XFER_BUILD) && !BOTH(BINARY_FILE_TRANSFER, CUSTOM_FIRMWARE_UPLOAD) #error "BINARY_FILE_TRANSFER and CUSTOM_FIRMWARE_UPLOAD are required for custom upload." #endif diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index b92aa63e924f..18bb7dba5827 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -544,17 +544,17 @@ #elif MB(BTT_SKR_MINI_E3_V2_0) #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple #elif MB(BTT_SKR_MINI_E3_V3_0) - #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_bft + #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer #elif MB(BTT_MANTA_M4P_V1_0) - #include "stm32g0/pins_BTT_MANTA_M4P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_bft + #include "stm32g0/pins_BTT_MANTA_M4P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer #elif MB(BTT_MANTA_M5P_V1_0) - #include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_bft + #include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer #elif MB(BTT_MANTA_E3_EZ_V1_0) - #include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_bft + #include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer #elif MB(BTT_MANTA_M8P_V1_0) - #include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_bft + #include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer #elif MB(BTT_MANTA_M8P_V1_1) - #include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_bft + #include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer #elif MB(BTT_SKR_MINI_E3_V3_0_1) #include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"// STM32F4 env:STM32F401RC_btt #elif MB(BTT_SKR_MINI_MZ_V1_0) @@ -582,27 +582,27 @@ #elif MB(CHITU3D_V9) #include "stm32f1/pins_CHITU3D_V9.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple #elif MB(CREALITY_V4) - #include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V4210) - #include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V425) - #include "stm32f1/pins_CREALITY_V425.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V425.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V422) - #include "stm32f1/pins_CREALITY_V422.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V422.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V423) - #include "stm32f1/pins_CREALITY_V423.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft + #include "stm32f1/pins_CREALITY_V423.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer #elif MB(CREALITY_V427) - #include "stm32f1/pins_CREALITY_V427.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V427.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D) - #include "stm32f1/pins_CREALITY_V431.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V431.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V452) - #include "stm32f1/pins_CREALITY_V452.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V452.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V453) - #include "stm32f1/pins_CREALITY_V453.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V453.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V24S1) - #include "stm32f1/pins_CREALITY_V24S1.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V24S1.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V24S1_301) - #include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_bft env:STM32F103RC_creality env:STM32F103RC_creality_bft env:STM32F103RE_creality_maple + #include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #elif MB(CREALITY_V25S1) #include "stm32f1/pins_CREALITY_V25S1.h" // STM32F1 env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple #elif MB(CREALITY_V521) diff --git a/ini/renamed.ini b/ini/renamed.ini index 1169ccebb2eb..cd890b593cb5 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -27,19 +27,7 @@ extends = renamed [env:STM32F103RET6_creality] ;=> STM32F103RE_creality extends = renamed -[env:STM32F103RET6_creality_xfer] ;=> STM32F103RE_creality_bft -extends = renamed - -[env:STM32F103RE_creality_xfer] ;=> STM32F103RE_creality_bft -extends = renamed - -[env:STM32F103RC_creality_xfer] ;=> STM32F103RC_creality_bft -extends = renamed - -[env:STM32G0B1RE_btt_xfer] ;=> STM32G0B1RE_btt_bft -extends = renamed - -[env:STM32G0B1VE_btt_xfer] ;=> STM32G0B1VE_btt_bft +[env:STM32F103RET6_creality_xfer] ;=> STM32F103RE_creality_xfer extends = renamed [env:STM32F103RC_btt_512K] ;=> STM32F103RE_btt diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index 4fe01b995622..1adc83a8f999 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -139,11 +139,11 @@ upload_protocol = jlink # With custom upload to SD via Marlin with binary protocol. # Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board. # If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware. -# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'bft' build envs. +# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'xfer' build envs. # -[STM32F103Rx_creality_bft] +[STM32F103Rx_creality_xfer] extends = STM32F103Rx_creality -build_flags = ${STM32F103Rx_creality.build_flags} -DBFT_BUILD +build_flags = ${STM32F103Rx_creality.build_flags} -DXFER_BUILD extra_scripts = ${STM32F103Rx_creality.extra_scripts} pre:buildroot/share/scripts/upload.py upload_protocol = custom @@ -158,8 +158,8 @@ board = genericSTM32F103RE # # Creality 512K (STM32F103RE) with custom binary upload to SD (see above). # -[env:STM32F103RE_creality_bft] -extends = STM32F103Rx_creality_bft +[env:STM32F103RE_creality_xfer] +extends = STM32F103Rx_creality_xfer board = genericSTM32F103RE # @@ -180,8 +180,8 @@ board = genericSTM32F103RC # # Creality 256K (STM32F103RC) with custom binary upload to SD (see above). # -[env:STM32F103RC_creality_bft] -extends = STM32F103Rx_creality_bft +[env:STM32F103RC_creality_xfer] +extends = STM32F103Rx_creality_xfer board = genericSTM32F103RC # diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini index 03e1cf3796f1..5891395642dc 100644 --- a/ini/stm32g0.ini +++ b/ini/stm32g0.ini @@ -63,11 +63,11 @@ debug_tool = stlink # Custom upload to SD via Marlin with Binary Protocol # Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board. # If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware. -# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'bft' build envs. +# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'xfer' build envs. # -[env:STM32G0B1RE_btt_bft] +[env:STM32G0B1RE_btt_xfer] extends = env:STM32G0B1RE_btt -build_flags = ${env:STM32G0B1RE_btt.build_flags} -DBFT_BUILD +build_flags = ${env:STM32G0B1RE_btt.build_flags} -DXFER_BUILD extra_scripts = ${env:STM32G0B1RE_btt.extra_scripts} pre:buildroot/share/scripts/upload.py upload_protocol = custom @@ -95,9 +95,9 @@ debug_tool = stlink # BigTreeTech Manta M8P V1.x (STM32G0B1VET6 ARM Cortex-M0+) # Custom upload to SD via Marlin with Binary Protocol # -[env:STM32G0B1VE_btt_bft] +[env:STM32G0B1VE_btt_xfer] extends = env:STM32G0B1VE_btt -build_flags = ${env:STM32G0B1VE_btt.build_flags} -DBFT_BUILD +build_flags = ${env:STM32G0B1VE_btt.build_flags} -DXFER_BUILD extra_scripts = ${env:STM32G0B1VE_btt.extra_scripts} pre:buildroot/share/scripts/upload.py upload_protocol = custom