From ce92eb46ec8c2f70cebc4bfd3060527bd870fa94 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:07:06 +1200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Prevent=20LCD=5FPINS=5FEN=20fals?= =?UTF-8?q?e=20pin=20conflict=20(#27284)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/pins/native/pins_RAMPS_NATIVE.h | 1 + Marlin/src/pins/ramps/pins_RAMPS.h | 1 + Marlin/src/pins/ramps/pins_TT_OSCAR.h | 1 + Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 1 + Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h | 1 + Marlin/src/pins/samd/pins_MINITRONICS20.h | 1 + Marlin/src/pins/samd/pins_RAMPS_144.h | 1 + Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h | 1 + Marlin/src/pins/stm32f1/pins_CHITU3D.h | 1 + Marlin/src/pins/teensy2/pins_PRINTRBOARD.h | 1 + 10 files changed, 10 insertions(+) diff --git a/Marlin/src/pins/native/pins_RAMPS_NATIVE.h b/Marlin/src/pins/native/pins_RAMPS_NATIVE.h index f08dc3c3ed49..42b33a094487 100644 --- a/Marlin/src/pins/native/pins_RAMPS_NATIVE.h +++ b/Marlin/src/pins/native/pins_RAMPS_NATIVE.h @@ -604,6 +604,7 @@ #define BTN_ENC 32 #define LCD_SDSS SDSS #define KILL_PIN 41 + #undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index 7c641c992dd5..1fc1dac6ad10 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -742,6 +742,7 @@ #define BTN_ENC AUX4_03 #define LCD_SDSS SDSS #define KILL_PIN EXP2_08_PIN + #undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index ed4f373c541d..0c573f25fc39 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -430,6 +430,7 @@ #define BTN_ENC 32 #define LCD_SDSS EXP2_04_PIN //#define KILL_PIN 41 + #undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h index e2cd6f6b55a4..7f4344a3645f 100644 --- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h +++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h @@ -361,6 +361,7 @@ //#define BTN_ENC 32 //#define LCD_SDSS SDSS //#define KILL_PIN EXP1_01_PIN + //#undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h index 31997f7fdc47..fd475ab2220f 100644 --- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h +++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h @@ -413,6 +413,7 @@ //#define BTN_ENC 32 //#define LCD_SDSS SDSS //#define KILL_PIN EXP1_01_PIN + //#undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/samd/pins_MINITRONICS20.h b/Marlin/src/pins/samd/pins_MINITRONICS20.h index dfbc24487d55..2111eb134eeb 100644 --- a/Marlin/src/pins/samd/pins_MINITRONICS20.h +++ b/Marlin/src/pins/samd/pins_MINITRONICS20.h @@ -308,6 +308,7 @@ //#define BTN_ENC 32 //#define LCD_SDSS SDSS //#define KILL_PIN EXP1_01_PIN + //#undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h index 2eaf27d37ae1..6897540f05e8 100644 --- a/Marlin/src/pins/samd/pins_RAMPS_144.h +++ b/Marlin/src/pins/samd/pins_RAMPS_144.h @@ -564,6 +564,7 @@ #define BTN_ENC AUX4_03 #define LCD_SDSS SDSS #define KILL_PIN AUX4_07 + #undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h index 838208d8e5d8..d9b36591ee7d 100644 --- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h +++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h @@ -263,6 +263,7 @@ #else #define BTN_ENC AUX1_07 #endif + #undef LCD_PINS_EN // not used, causes false pin conflict report #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2 diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h index 2074bbeccec1..bdc609c7b580 100644 --- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h +++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h @@ -161,6 +161,7 @@ #define LCD_SDSS PD5 // 53 #define SD_DETECT_PIN -1 #define KILL_PIN PC9 // 41 + #undef LCD_PINS_EN // not used, causes false pin conflict report #elif ENABLED(LCD_I2C_VIKI) diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h index f36ea66cf7a3..6dc4ab8392b0 100644 --- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h +++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h @@ -160,6 +160,7 @@ #define BTN_ENC 41 // F3 JP2-4 #define SDSS 38 // F0 B-THERM connector - use SD card on Panelolu2 + #undef LCD_PINS_EN // not used, causes false pin conflict report #else