From a66b22c4f16867c345a1256a808437d508485e72 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 7 Oct 2024 21:08:18 -0500 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20BTT=5FSKR=5F3=20=3D>=20BTT?= =?UTF-8?q?=5FSKR=5FV3=5F0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverting 3a6bd6920e --- Marlin/src/core/boards.h | 4 ++-- Marlin/src/inc/Conditionals-4-adv.h | 3 ++- Marlin/src/pins/pins.h | 16 ++++------------ .../{pins_BTT_SKR_3.h => pins_BTT_SKR_V3_0.h} | 4 ++-- ...ins_BTT_SKR_3_EZ.h => pins_BTT_SKR_V3_0_EZ.h} | 4 ++-- ...SKR_3_common.h => pins_BTT_SKR_V3_0_common.h} | 4 +++- buildroot/tests/STM32H743VI_btt | 6 +++--- 7 files changed, 18 insertions(+), 23 deletions(-) rename Marlin/src/pins/stm32h7/{pins_BTT_SKR_3.h => pins_BTT_SKR_V3_0.h} (92%) rename Marlin/src/pins/stm32h7/{pins_BTT_SKR_3_EZ.h => pins_BTT_SKR_V3_0_EZ.h} (92%) rename Marlin/src/pins/stm32h7/{pins_BTT_SKR_3_common.h => pins_BTT_SKR_V3_0_common.h} (98%) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index ef2ab73733..fb17669161 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -486,8 +486,8 @@ #define BOARD_NUCLEO_F767ZI 6001 // ST NUCLEO-F767ZI Dev Board #define BOARD_BTT_SKR_SE_BX_V2 6002 // BigTreeTech SKR SE BX V2.0 (STM32H743II) #define BOARD_BTT_SKR_SE_BX_V3 6003 // BigTreeTech SKR SE BX V3.0 (STM32H743II) -#define BOARD_BTT_SKR_3 6004 // BigTreeTech SKR 3 (STM32H743VI / STM32H723VG) -#define BOARD_BTT_SKR_3_EZ 6005 // BigTreeTech SKR 3 EZ (STM32H743VI / STM32H723VG) +#define BOARD_BTT_SKR_V3_0 6004 // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG) +#define BOARD_BTT_SKR_V3_0_EZ 6005 // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG) #define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6006 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE) #define BOARD_BTT_OCTOPUS_PRO_V1_0_1 6007 // BigTreeTech Octopus Pro v1.0.1 (STM32H723ZE) #define BOARD_BTT_OCTOPUS_PRO_V1_1 6008 // BigTreeTech Octopus Pro v1.1 (STM32H723ZE) diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h index f6d5b0ac73..291c140bfc 100644 --- a/Marlin/src/inc/Conditionals-4-adv.h +++ b/Marlin/src/inc/Conditionals-4-adv.h @@ -1368,7 +1368,8 @@ * currently HAL.h must be included ahead of pins.h. */ #if LCD_IS_SERIAL_HOST && !defined(LCD_SERIAL_PORT) - #if MB(MKS_MONSTER8_V1, BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, BTT_SKR_3, BTT_SKR_3_EZ, AQUILA_V101) + #if MB(MKS_MONSTER8_V1, BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, BTT_SKR_V3_0, BTT_SKR_V3_0_EZ, AQUILA_V101) + #define LCD_SERIAL_PORT 1 #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, CREALITY_CR4NTXXC10, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO) #define LCD_SERIAL_PORT 2 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index c69c1edb2a..a8d97ecd23 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -863,10 +863,10 @@ #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:BTT_SKR_SE_BX -#elif MB(BTT_SKR_3) - #include "stm32h7/pins_BTT_SKR_3.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt -#elif MB(BTT_SKR_3_EZ) - #include "stm32h7/pins_BTT_SKR_3_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt +#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) + #include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt #elif MB(BTT_OCTOPUS_MAX_EZ_V1_0) #include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt #elif MB(BTT_OCTOPUS_PRO_V1_0_1) @@ -989,8 +989,6 @@ #define BOARD_BTT_MANTA_M4P_V1_0 99927 #define BOARD_VAKE403D 99928 #define BOARD_TRONXY_V10 99929 - #define BOARD_BTT_SKR_V3_0 99930 - #define BOARD_BTT_SKR_V3_0_EZ 99931 #if MB(MKS_13) #error "BOARD_MKS_13 is now BOARD_MKS_GEN_13. Please update your configuration." @@ -1052,10 +1050,6 @@ #error "BOARD_TRONXY_V10 is now BOARD_TRONXY_CXY_446_V10. Please update your configuration." #elif MB(VAKE403D) #error "BOARD_VAKE403D is no longer supported in Marlin." - #elif MB(BOARD_BTT_SKR_V3_0) - #error "BOARD_BTT_SKR_V3_0 is now BOARD_BTT_SKR_3." - #elif MB(BOARD_BTT_SKR_V3_0_EZ) - #error "BOARD_BTT_SKR_V3_0_EZ is now BOARD_BTT_SKR_3_EZ." #elif defined(MOTHERBOARD) #error "Unknown MOTHERBOARD value set in Configuration.h." #else @@ -1093,8 +1087,6 @@ #undef BOARD_BTT_MANTA_M4P_V1_0 #undef BOARD_VAKE403D #undef BOARD_TRONXY_V10 - #undef BOARD_BTT_SKR_V3_0 - #undef BOARD_BTT_SKR_V3_0_EZ #endif diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h similarity index 92% rename from Marlin/src/pins/stm32h7/pins_BTT_SKR_3.h rename to Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h index c8317b2498..47c2d1cf37 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h @@ -25,6 +25,6 @@ * BigTreeTech SKR 3 (STM32H743VI / STM32H723VG) */ -#define BOARD_INFO_NAME "BTT SKR 3" +#define BOARD_INFO_NAME "BTT SKR V3" -#include "pins_BTT_SKR_3_common.h" +#include "pins_BTT_SKR_V3_0_common.h" diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h similarity index 92% rename from Marlin/src/pins/stm32h7/pins_BTT_SKR_3_EZ.h rename to Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h index 9746cec29e..933ecf2dec 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3_EZ.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h @@ -25,6 +25,6 @@ * BigTreeTech SKR 3 EZ (STM32H743VI / STM32H723VG) */ -#define BOARD_INFO_NAME "BTT SKR 3 EZ" +#define BOARD_INFO_NAME "BTT SKR V3 EZ" -#include "pins_BTT_SKR_3_common.h" +#include "pins_BTT_SKR_V3_0_common.h" diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h similarity index 98% rename from Marlin/src/pins/stm32h7/pins_BTT_SKR_3_common.h rename to Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index 8c1692903a..b679921863 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_3_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -454,7 +454,9 @@ * DWIN pins are labeled as printed on DWIN PCB. GND, VCC, A, B, ENT & BEEP can be connected in the same * orientation as the existing plug/DWIN to EXP1. TX/RX need to be connected to the TFT port, with TX->RX, RX->TX. */ - CONTROLLER_WARNING("BTT_SKR_3_common", "Ender-3 V2 display", "Requires TX/RX to be connected to the TFT port with TX->RX, RX->TX") + #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING + #error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_SKR_V3_0_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" + #endif #define BEEPER_PIN EXP1_06_PIN #define BTN_EN1 EXP1_08_PIN diff --git a/buildroot/tests/STM32H743VI_btt b/buildroot/tests/STM32H743VI_btt index f6b60c8d9d..e73a786ff4 100755 --- a/buildroot/tests/STM32H743VI_btt +++ b/buildroot/tests/STM32H743VI_btt @@ -19,14 +19,14 @@ exec_test $1 $2 "Creality Ender-5 Plus with BigTreeTech SKR 3" "$3" # SKR 3 EZ default # restore_configs -opt_set MOTHERBOARD BOARD_BTT_SKR_3_EZ SERIAL_PORT -1 +opt_set MOTHERBOARD BOARD_BTT_SKR_V3_0_EZ SERIAL_PORT -1 exec_test $1 $2 "BigTreeTech SKR 3 EZ | Default Configuration" "$3" # # SKR 3 EZ with MMU2 # restore_configs -opt_set MOTHERBOARD BOARD_BTT_SKR_3_EZ SERIAL_PORT -1 \ +opt_set MOTHERBOARD BOARD_BTT_SKR_V3_0_EZ SERIAL_PORT -1 \ BAUDRATE 115200 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 \ Z_DRIVER_TYPE TMC2209 Z2_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 \ EXTRUDERS 5 MMU_MODEL PRUSA_MMU2 HEATER_0_MAXTEMP 305 \ @@ -60,7 +60,7 @@ exec_test $1 $2 "BigTreeTech SKR 3 EZ | MMU2" "$3" # SKR 3 EZ with MMU3 # restore_configs -opt_set MOTHERBOARD BOARD_BTT_SKR_3_EZ SERIAL_PORT -1 \ +opt_set MOTHERBOARD BOARD_BTT_SKR_V3_0_EZ SERIAL_PORT -1 \ BAUDRATE 115200 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 \ Z_DRIVER_TYPE TMC2209 Z2_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 \ EXTRUDERS 5 MMU_MODEL PRUSA_MMU3 HEATER_0_MAXTEMP 305 \