From a2a72a82c68e6f1cccd06f7a58e573263b90e0e8 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue, 26 Oct 2021 12:41:55 +1300 Subject: [PATCH 1/5] update BTT_MOTOR_EXPANSION test --- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index dc82a2857f20..7854304297ea 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -281,7 +281,7 @@ #define BEEPER_PIN EXP1_05_PIN #endif -#elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION +#elif HAS_WIRED_LCD && DISABLED(BTT_MOTOR_EXPANSION) #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue." From 66a121a1f6b376de3404350dcc9c4e686613e934 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue, 26 Oct 2021 13:27:34 +1300 Subject: [PATCH 2/5] remove test, its not needed --- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 7854304297ea..a072242adc74 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -281,7 +281,7 @@ #define BEEPER_PIN EXP1_05_PIN #endif -#elif HAS_WIRED_LCD && DISABLED(BTT_MOTOR_EXPANSION) +#elif HAS_WIRED_LCD #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue." From c9d04b3c2403824b775bf0ecc7231c6e04dbdaa8 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue, 26 Oct 2021 13:50:36 +1300 Subject: [PATCH 3/5] update error message --- Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h index 52f34ed0f0d5..f88f9f5fe4e7 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." + #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." #endif #endif From 2e3ad78fa9f29bfd923c741a0dcb58dea7e75949 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue, 26 Oct 2021 13:52:20 +1300 Subject: [PATCH 4/5] update other occurances of same message --- Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h | 2 +- Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index 3314d0154da1..a1e281a1107f 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." + #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index 95cfb1234d88..affbc4ec791f 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." + #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." #endif #endif From 6288d41a7f0293a69af509677594084cf9c07765 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 27 Oct 2021 15:03:06 -0500 Subject: [PATCH 5/5] old verbiage is fine --- Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 2 +- Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h | 2 +- Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h index f88f9f5fe4e7..52f34ed0f0d5 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." + #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index a1e281a1107f..3314d0154da1 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." + #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index affbc4ec791f..95cfb1234d88 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -31,7 +31,7 @@ #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #define EXP_MOT_USE_EXP2_ONLY 1 #else - #error "You can't use a LCD that requires EXP1 and EXP2 and a Motor Expansion Module simultaneously." + #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time." #endif #endif