bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View File

@ -109,7 +109,7 @@
//
// Display
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -185,7 +185,7 @@
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

4
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View File

@ -193,7 +193,7 @@
#define EXPA1_09_PIN P0_16
#define EXPA1_10_PIN P2_08
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -238,7 +238,7 @@
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

4
Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
View File

@ -141,7 +141,7 @@
// connector are shared with the onboard SD card, and Marlin does not support reading
// G-code files from the onboard SD card.
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P0_27 // EXP2-7 - open drain
@ -160,7 +160,7 @@
#error "SDSUPPORT is not currently supported by the Cohesion3D boards"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Ethernet pins

4
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
View File

@ -206,7 +206,7 @@
#define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
#endif
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
//#define SD_DETECT_PIN P0_27 // EXP2-7
@ -222,7 +222,7 @@
#define KILL_PIN P2_11 // EXP2-10
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

5
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
View File

@ -241,11 +241,12 @@
* ----- -----
* EXP1 EXP2
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS P1_00
#define BTN_EN1 P0_18
@ -327,7 +328,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD

2
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
View File

@ -109,7 +109,7 @@
#define STAT_LED_RED_PIN P1_19
#define STAT_LED_BLUE_PIN P1_20
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
/*
The Smoothieboard supports the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with either

2
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
View File

@ -178,6 +178,6 @@
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
#define KILL_PIN P2_11
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
#error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
#endif