From f6f31434b8c0e21f98fef460e0c8492fd4c240d5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 21 Apr 2022 07:16:52 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20IS=5FULTRA?= =?UTF-8?q?=5FLCD=20=3D>=20HAS=5FWIRED=5FLCD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/Conditionals_LCD.h | 11 +++++------ Marlin/src/pins/mega/pins_MEGATRONICS.h | 4 ++-- Marlin/src/pins/pins.h | 2 +- Marlin/src/pins/ramps/pins_3DRAG.h | 6 +++--- Marlin/src/pins/ramps/pins_FELIX2.h | 2 +- Marlin/src/pins/ramps/pins_K8600.h | 2 +- Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h | 2 +- Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h | 4 ++-- Marlin/src/pins/teensy2/pins_PRINTRBOARD.h | 4 ++-- Marlin/src/pins/teensy2/pins_TEENSYLU.h | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index e7473420cf..d063e41bcc 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -41,13 +41,13 @@ * * DOGLCD : Run a Graphical LCD through U8GLib (with MarlinUI) * IS_ULTIPANEL : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs - * IS_ULTRA_LCD : Ultra LCD, not necessarily Ultipanel. + * HAS_WIRED_LCD : Ultra LCD, not necessarily Ultipanel. * IS_RRD_SC : Common RRD Smart Controller digital interface pins * IS_RRD_FG_SC : Common RRD Full Graphical Smart Controller digital interface pins * IS_U8GLIB_ST7920 : Most common DOGM display SPI interface, supporting a "lightweight" display mode. * U8GLIB_SH1106 : SH1106 OLED with I2C interface via U8GLib * IS_U8GLIB_SSD1306 : SSD1306 OLED with I2C interface via U8GLib (U8GLIB_SSD1306) - * U8GLIB_SSD1309 : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, IS_ULTRA_LCD, DOGLCD) + * U8GLIB_SSD1309 : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, HAS_WIRED_LCD, DOGLCD) * IS_U8GLIB_ST7565_64128N : ST7565 128x64 LCD with SPI interface via U8GLib * IS_U8GLIB_LM6059_AF : LM6059 with Hardware SPI via U8GLib */ @@ -287,7 +287,7 @@ // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106 #if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106) #define HAS_U8GLIB_I2C_OLED 1 - #define IS_ULTRA_LCD 1 + #define HAS_WIRED_LCD 1 #define DOGLCD #endif @@ -443,7 +443,7 @@ #endif #if EITHER(IS_ULTIPANEL, ULTRA_LCD) - #define IS_ULTRA_LCD 1 + #define HAS_WIRED_LCD 1 #endif #if EITHER(IS_ULTIPANEL, REPRAPWORLD_KEYPAD) @@ -502,8 +502,7 @@ #endif #endif -#if IS_ULTRA_LCD - #define HAS_WIRED_LCD 1 +#if HAS_WIRED_LCD #if ENABLED(DOGLCD) #define HAS_MARLINUI_U8GLIB 1 #elif IS_TFTGLCD_PANEL diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h index 0308175b2a..ac0ba4eea6 100644 --- a/Marlin/src/pins/mega/pins_MEGATRONICS.h +++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h @@ -106,7 +106,7 @@ // #define BEEPER_PIN 33 -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #define LCD_PINS_RS 16 #define LCD_PINS_ENABLE 17 @@ -122,7 +122,7 @@ #define SD_DETECT_PIN -1 // RAMPS doesn't use this -#endif // IS_ULTRA_LCD && IS_NEWPANEL +#endif // HAS_WIRED_LCD && IS_NEWPANEL // // M3/M4/M5 - Spindle/Laser Control diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 202630ae4a..01e5ee41e3 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -61,7 +61,7 @@ #endif #endif -#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD)) +#if !(BOTH(HAS_WIRED_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD)) #define HAS_FREE_AUX2_PINS 1 #endif diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h index 48eeacd5c4..6f5b775af9 100644 --- a/Marlin/src/pins/ramps/pins_3DRAG.h +++ b/Marlin/src/pins/ramps/pins_3DRAG.h @@ -111,7 +111,7 @@ #define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM #define SPINDLE_LASER_ENA_PIN 62 // Pullup! #define SPINDLE_DIR_PIN 48 - #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // Use expansion header if no LCD in use + #elif !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // Use expansion header if no LCD in use #define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown! #define SPINDLE_DIR_PIN 17 #if !NUM_SERVOS // Use servo connector if possible @@ -135,7 +135,7 @@ // // LCD / Controller // -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #undef BEEPER_PIN // TODO: Remap EXP1/2 based on adapter @@ -164,7 +164,7 @@ #define BEEPER_PIN 33 -#endif // IS_ULTRA_LCD && IS_NEWPANEL +#endif // HAS_WIRED_LCD && IS_NEWPANEL #if IS_U8GLIB_ST7920 #define BOARD_ST7920_DELAY_1 0 diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h index e572d3f286..bdf83c44ba 100644 --- a/Marlin/src/pins/ramps/pins_FELIX2.h +++ b/Marlin/src/pins/ramps/pins_FELIX2.h @@ -49,7 +49,7 @@ // // LCD / Controller // -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #define SD_DETECT_PIN 6 diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h index 0155129927..2dabd9d59b 100644 --- a/Marlin/src/pins/ramps/pins_K8600.h +++ b/Marlin/src/pins/ramps/pins_K8600.h @@ -69,7 +69,7 @@ // // LCD / Controller // -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #undef BEEPER_PIN #undef LCD_PINS_RS diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h index 091356a11f..37060ab945 100644 --- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h +++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h @@ -172,7 +172,7 @@ #define LCD_PINS_D6 32 #define LCD_PINS_D7 30 -#elif BOTH(BOARD_REV_1_5, IS_ULTRA_LCD) +#elif BOTH(BOARD_REV_1_5, HAS_WIRED_LCD) #define BEEPER_PIN 18 diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h index 8471d1c7f5..5fe0d3842d 100644 --- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h +++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h @@ -135,7 +135,7 @@ #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED #endif -#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header +#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header #define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available #endif @@ -268,7 +268,7 @@ // M3/M4/M5 - Spindle/Laser Control // #if HAS_CUTTER - #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header + #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header #define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown! #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h index c813287866..82d9cec894 100644 --- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h +++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h @@ -121,7 +121,7 @@ // // LCD / Controller // -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #define LCD_PINS_RS 9 // E1 JP11-11 #define LCD_PINS_ENABLE 8 // E0 JP11-10 @@ -163,7 +163,7 @@ #endif -#endif // IS_ULTRA_LCD && IS_NEWPANEL +#endif // HAS_WIRED_LCD && IS_NEWPANEL #ifndef SDSS #define SDSS 26 // B6 SDCS diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h index 535ce534d4..ab722478fd 100644 --- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h +++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h @@ -145,7 +145,7 @@ // // LCD / Controller // -#if IS_ULTRA_LCD && IS_NEWPANEL +#if HAS_WIRED_LCD && IS_NEWPANEL #define BEEPER_PIN -1 @@ -158,7 +158,7 @@ #define SD_DETECT_PIN -1 -#endif // IS_ULTRA_LCD && IS_NEWPANEL +#endif // HAS_WIRED_LCD && IS_NEWPANEL // // M3/M4/M5 - Spindle/Laser Control