Rename LCD conditionals (#19533)

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

View File

@@ -313,7 +313,7 @@
#elif ENABLED(MAKRPANEL)
#define _LCD_CONTRAST_INIT 17
#elif ENABLED(MINIPANEL)
#define _LCD_CONTRAST_INIT 150
#define _LCD_CONTRAST_INIT 150
#elif ENABLED(ZONESTAR_12864OLED)
#define _LCD_CONTRAST_MIN 64
#define _LCD_CONTRAST_INIT 128
@@ -2455,7 +2455,7 @@
*/
#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
#define HAS_BUZZER 1
#if NONE(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
#if PIN_EXISTS(BEEPER)
#define USE_BEEPER 1
#endif
#endif
@@ -2483,7 +2483,7 @@
/**
* Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
*/
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef DOGLCD_SCK
#define DOGLCD_SCK SCK_PIN
#endif
@@ -2604,17 +2604,17 @@
#define HAS_FOLDER_SORTING 1
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// Get LCD character width/height, which may be overridden by pins, configs, etc.
#ifndef LCD_WIDTH
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#define LCD_WIDTH 21
#else
#define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
#endif
#endif
#ifndef LCD_HEIGHT
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#define LCD_HEIGHT 5
#else
#define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)