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
parent ac900b17e0
commit 58deab1915
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
View File

@@ -126,7 +126,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@@ -139,7 +139,7 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
#endif
@@ -147,7 +147,7 @@
#error "SDSUPPORT is not supported by the BIQU B300 v1.0 when an LCD controller is used"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
/**
* SD Card Reader

6
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
View File

@@ -97,7 +97,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@@ -110,7 +110,7 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
#endif
@@ -118,7 +118,7 @@
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
/**
* SD Card Reader

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View File

@@ -65,7 +65,7 @@
* by redrawing the screen after SD card accesses.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BTN_EN1 P3_26
#define BTN_EN2 P3_25
#define BTN_ENC P2_11

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@@ -214,7 +214,7 @@
#define EXPA2_09_PIN P0_15
#define EXPA2_10_PIN P0_17
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
@@ -350,7 +350,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@@ -232,7 +232,7 @@
* ----- -----
* EXP2 EXP1
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
#define LCD_PINS_RS P1_23
@@ -371,9 +371,9 @@
#endif // !FYSETC_MINI_12864
#endif // HAS_GRAPHICAL_LCD
#endif // HAS_MARLINUI_U8GLIB
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if HAS_ADC_BUTTONS
#error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View File

@@ -92,7 +92,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#endif

2
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View File

@@ -217,7 +217,7 @@
* that the garbage/lines are erased immediately after the SD card accesses are completed.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1.1
#define BTN_ENC P1_30 // EXP1.2
#define BTN_EN1 P3_26 // EXP2.5

5
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@@ -235,7 +235,8 @@
* ----- -----
* EXP1 EXP2
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
@@ -321,7 +322,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD

9
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@@ -326,7 +326,7 @@
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
//#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
@@ -370,8 +370,9 @@
#define DOGLCD_SCK SCK_PIN
#define DOGLCD_MOSI MOSI_PIN
#define STAT_LED_BLUE_PIN P0_26 //(63) may change if cable changes
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
#else
#if ENABLED(FYSETC_MINI_12864)
@@ -420,9 +421,9 @@
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Ethernet pins