Skip to content

Commit e48dd40

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 Misc. LCD pins corrections
1 parent 4ddf626 commit e48dd40

37 files changed

+413
-319
lines changed

‎Marlin/src/inc/Conditionals-2-LCD.h‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@
9999
*
100100
* DOGLCD : Run a Graphical LCD through U8GLib (with MarlinUI)
101101
* IS_ULTIPANEL : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
102+
* IS_NEWPANEL : A panel with encoder pins: ENC EN1 EN2 BEEPER.
102103
* HAS_WIRED_LCD : Ultra LCD, not necessarily Ultipanel.
103-
* IS_RRD_SC : Common RRD Smart Controller digital interface pins
104+
* IS_RRD_SC : Common RRD Smart Controller digital interface pins: RS EN D4 D5 D6 D7.
104105
* IS_RRD_FG_SC : Common RRD Full Graphical Smart Controller digital interface pins
105106
* IS_U8GLIB_ST7920 : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
106107
* U8GLIB_SH1106 : SH1106 OLED with I2C interface via U8GLib
@@ -890,3 +891,78 @@
890891
#if LED_POWEROFF_TIMEOUT > 0
891892
#define HAS_LED_POWEROFF_TIMEOUT 1
892893
#endif
894+
895+
#define LCD_ENABLED_COUNT 0 \
896+
+ ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
897+
+ ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
898+
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
899+
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
900+
+ (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
901+
+ (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)) \
902+
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864) \
903+
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
904+
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
905+
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
906+
+ COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35, ANYCUBIC_LCD_VYPER) \
907+
+ DGUS_UI_IS(ORIGIN) + DGUS_UI_IS(FYSETC) + DGUS_UI_IS(HIPRECY) + DGUS_UI_IS(MKS) + DGUS_UI_IS(RELOADED) + DGUS_UI_IS(IA_CREALITY) \
908+
+ COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
909+
+ COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \
910+
+ COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
911+
+ COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
912+
+ COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
913+
+ COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, \
914+
MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \
915+
+ COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
916+
+ COUNT_ENABLED(VIKI2, miniVIKI) \
917+
+ ENABLED(WYH_L12864) \
918+
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
919+
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \
920+
+ ENABLED(AZSMZ_12864) \
921+
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
922+
+ ENABLED(CARTESIO_UI) \
923+
+ ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
924+
+ ENABLED(FF_INTERFACEBOARD) \
925+
+ ENABLED(FYSETC_242_OLED_12864) \
926+
+ ENABLED(G3D_PANEL) \
927+
+ ENABLED(LCD_FOR_MELZI) \
928+
+ ENABLED(LCD_I2C_PANELOLU2) \
929+
+ ENABLED(LCD_I2C_VIKI) \
930+
+ ENABLED(LCM1602) \
931+
+ ENABLED(LONGER_LK_TFT28) \
932+
+ ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
933+
+ ENABLED(MAKRPANEL) \
934+
+ ENABLED(MALYAN_LCD) \
935+
+ ENABLED(NEXTION_TFT) \
936+
+ ENABLED(MKS_LCD12864A) \
937+
+ ENABLED(MKS_LCD12864B) \
938+
+ ENABLED(OLED_PANEL_TINYBOY2) \
939+
+ ENABLED(OVERLORD_OLED) \
940+
+ ENABLED(PANEL_ONE) \
941+
+ ENABLED(RA_CONTROL_PANEL) \
942+
+ ENABLED(RADDS_DISPLAY) \
943+
+ ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \
944+
+ ENABLED(RIGIDBOT_PANEL) \
945+
+ ENABLED(SAV_3DGLCD) \
946+
+ ENABLED(SAV_3DLCD) \
947+
+ ENABLED(SILVER_GATE_GLCD_CONTROLLER) \
948+
+ ENABLED(TFT_TRONXY_X5SA) \
949+
+ ENABLED(TOUCH_UI_FTDI_EVE) \
950+
+ ENABLED(U8GLIB_SH1106_EINSTART) \
951+
+ ENABLED(ULTI_CONTROLLER) \
952+
+ ENABLED(ULTIMAKERCONTROLLER) \
953+
+ ENABLED(ULTIPANEL) \
954+
+ ENABLED(ULTRA_LCD) \
955+
+ ENABLED(YHCB2004) \
956+
+ ENABLED(ZONESTAR_LCD) \
957+
+ ENABLED(K3D_FULL_GRAPHIC_SMART_CONTROLLER) \
958+
+ ENABLED(K3D_242_OLED_CONTROLLER)
959+
960+
#if LCD_ENABLED_COUNT > 0
961+
#define HAS_LCD_SELECTED 1
962+
#if LCD_ENABLED_COUNT > 1
963+
#error "Please select only one LCD controller option."
964+
#endif
965+
#endif
966+
#undef LCD_ENABLED_COUNT
967+
#undef IS_U8GLIB_SSD1306
968+
#undef IS_EXTUI

‎Marlin/src/inc/SanityCheck.h‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2803,79 +2803,6 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
28032803
#endif
28042804
#endif
28052805

2806-
/**
2807-
* Make sure only one display is enabled
2808-
*/
2809-
#if 1 < 0 \
2810-
+ ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
2811-
+ ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
2812-
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
2813-
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
2814-
+ (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
2815-
+ (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)) \
2816-
+ COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864) \
2817-
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
2818-
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
2819-
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
2820-
+ COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35, ANYCUBIC_LCD_VYPER) \
2821-
+ DGUS_UI_IS(ORIGIN) + DGUS_UI_IS(FYSETC) + DGUS_UI_IS(HIPRECY) + DGUS_UI_IS(MKS) + DGUS_UI_IS(RELOADED) + DGUS_UI_IS(IA_CREALITY) \
2822-
+ COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
2823-
+ COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \
2824-
+ COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
2825-
+ COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
2826-
+ COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
2827-
+ COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, \
2828-
MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \
2829-
+ COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
2830-
+ COUNT_ENABLED(VIKI2, miniVIKI) \
2831-
+ ENABLED(WYH_L12864) \
2832-
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
2833-
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \
2834-
+ ENABLED(AZSMZ_12864) \
2835-
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
2836-
+ ENABLED(CARTESIO_UI) \
2837-
+ ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
2838-
+ ENABLED(FF_INTERFACEBOARD) \
2839-
+ ENABLED(FYSETC_242_OLED_12864) \
2840-
+ ENABLED(G3D_PANEL) \
2841-
+ ENABLED(LCD_FOR_MELZI) \
2842-
+ ENABLED(LCD_I2C_PANELOLU2) \
2843-
+ ENABLED(LCD_I2C_VIKI) \
2844-
+ ENABLED(LCM1602) \
2845-
+ ENABLED(LONGER_LK_TFT28) \
2846-
+ ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
2847-
+ ENABLED(MAKRPANEL) \
2848-
+ ENABLED(MALYAN_LCD) \
2849-
+ ENABLED(NEXTION_TFT) \
2850-
+ ENABLED(MKS_LCD12864A) \
2851-
+ ENABLED(MKS_LCD12864B) \
2852-
+ ENABLED(OLED_PANEL_TINYBOY2) \
2853-
+ ENABLED(OVERLORD_OLED) \
2854-
+ ENABLED(PANEL_ONE) \
2855-
+ ENABLED(RA_CONTROL_PANEL) \
2856-
+ ENABLED(RADDS_DISPLAY) \
2857-
+ ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \
2858-
+ ENABLED(RIGIDBOT_PANEL) \
2859-
+ ENABLED(SAV_3DGLCD) \
2860-
+ ENABLED(SAV_3DLCD) \
2861-
+ ENABLED(SILVER_GATE_GLCD_CONTROLLER) \
2862-
+ ENABLED(TFT_TRONXY_X5SA) \
2863-
+ ENABLED(TOUCH_UI_FTDI_EVE) \
2864-
+ ENABLED(U8GLIB_SH1106_EINSTART) \
2865-
+ ENABLED(ULTI_CONTROLLER) \
2866-
+ ENABLED(ULTIMAKERCONTROLLER) \
2867-
+ ENABLED(ULTIPANEL) \
2868-
+ ENABLED(ULTRA_LCD) \
2869-
+ ENABLED(YHCB2004) \
2870-
+ ENABLED(ZONESTAR_LCD) \
2871-
+ ENABLED(K3D_FULL_GRAPHIC_SMART_CONTROLLER) \
2872-
+ ENABLED(K3D_242_OLED_CONTROLLER)
2873-
#error "Please select only one LCD controller option."
2874-
#endif
2875-
2876-
#undef IS_U8GLIB_SSD1306
2877-
#undef IS_EXTUI
2878-
28792806
/**
28802807
* Make sure LCD language settings are distinct
28812808
*/

‎Marlin/src/pins/esp32/pins_MKS_TINYBEE.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@
163163
#define EXP2_07_PIN 34
164164
#define EXP2_08_PIN -1 // RESET
165165

166+
#define EXP_REVERSE_KEYED
167+
166168
//
167169
// MicroSD card
168170
//

‎Marlin/src/pins/esp32/pins_MM_JOKER.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@
222222

223223
#if HAS_WIRED_LCD
224224

225+
#define BTN_ENC 12
226+
#define BTN_EN1 2
227+
#define BTN_EN2 4
228+
225229
//#define LCD_PINS_RS 13
226230
//#define LCD_PINS_EN 17
227231
//#define LCD_PINS_D4 16
@@ -238,12 +242,11 @@
238242
//#define LCD_PINS_D6 -1
239243
//#define LCD_PINS_D7 -1
240244

241-
#endif
245+
#else
242246

243-
#define BTN_EN1 2
244-
#define BTN_EN2 4
245-
#define BTN_ENC 12
246-
#define BEEPER_PIN 139
247+
#define BEEPER_PIN 139
248+
249+
#endif
247250

248251
#endif // HAS_WIRED_LCD
249252

‎Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h‎

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,48 @@
122122
#define LED_PIN P1_31
123123
#define POWER_MONITOR_VOLTAGE_PIN P0_25_A2
124124

125+
/** ------ ------
126+
* P0_19 | 1 2 | P1_25 P0_17 | 1 2 | P0_15
127+
* P0_21 | 3 4 | P0_20 P1_23 | 3 4 | P0_16
128+
* P2_11 5 6 | P0_22 P1_24 5 6 | P0_18
129+
* P1_29 | 7 8 | P1_28 P1_22 | 7 8 | (KILL)
130+
* GND | 9 10 | 5V GND | 9 10 | 5V
131+
* ------ ------
132+
* EXP1 EXP2
133+
*/
134+
#define EXP1_01_PIN P0_19
135+
#define EXP1_02_PIN P1_25
136+
#define EXP1_03_PIN P0_21 // Y+
137+
#define EXP1_04_PIN P0_20
138+
#define EXP1_05_PIN P2_11
139+
#define EXP1_06_PIN P0_22
140+
#define EXP1_07_PIN P1_29
141+
#define EXP1_08_PIN P1_28
142+
143+
#define EXP2_01_PIN P0_17
144+
#define EXP2_02_PIN P0_15
145+
#define EXP2_03_PIN P1_23
146+
#define EXP2_04_PIN P0_16
147+
#define EXP2_05_PIN P1_24
148+
#define EXP2_06_PIN P0_18
149+
#define EXP2_07_PIN P1_22
150+
#define EXP2_08_PIN -1 // RESET
151+
125152
//
126153
// LCD
127154
//
128155
#if IS_RRD_SC
129-
#define BEEPER_PIN P0_19
130-
#define BTN_EN1 P1_23
131-
#define BTN_EN2 P1_24
132-
#define BTN_ENC P1_25
133-
#define LCD_PINS_RS P0_20
134-
#define LCD_PINS_EN P0_21
135-
#define LCD_PINS_D4 P2_11
136-
#define LCD_PINS_D5 P0_22
137-
#define LCD_PINS_D6 P1_29
138-
#define LCD_PINS_D7 P1_28
156+
157+
#define BEEPER_PIN EXP1_01_PIN
158+
#define BTN_EN1 EXP2_03_PIN
159+
#define BTN_EN2 EXP2_05_PIN
160+
#define BTN_ENC EXP1_02_PIN
161+
#define LCD_PINS_RS EXP1_04_PIN
162+
#define LCD_PINS_EN EXP1_03_PIN
163+
#define LCD_PINS_D4 EXP1_05_PIN
164+
#define LCD_PINS_D5 EXP1_06_PIN
165+
#define LCD_PINS_D6 EXP1_07_PIN
166+
#define LCD_PINS_D7 EXP1_08_PIN
139167

140168
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
141169
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -156,11 +184,11 @@
156184
#endif
157185

158186
#if SD_CONNECTION_IS(LCD)
159-
#define SD_SCK_PIN P0_15
160-
#define SD_MISO_PIN P0_17
161-
#define SD_MOSI_PIN P0_18
162-
#define SD_SS_PIN P0_16
163-
#define SD_DETECT_PIN P1_22
187+
#define SD_SCK_PIN EXP2_02_PIN
188+
#define SD_MISO_PIN EXP2_01_PIN
189+
#define SD_MOSI_PIN EXP2_06_PIN
190+
#define SD_SS_PIN EXP2_04_PIN
191+
#define SD_DETECT_PIN EXP2_07_PIN
164192
#elif SD_CONNECTION_IS(ONBOARD)
165193
#define SD_SCK_PIN P0_07
166194
#define SD_MISO_PIN P0_08

‎Marlin/src/pins/lpc1768/pins_MKS_SBASE.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@
226226
#define EXP2_06_PIN P0_09
227227
#define EXP2_07_PIN P0_27
228228

229+
#define EXP_REVERSE_KEYED
230+
229231
//
230232
// LCD / Controller
231233
//

0 commit comments

Comments
 (0)