Browse Source

🔧 HAS_LCDPRINT conditional

Scott Lahteine 2 years ago
parent
commit
cf013a7f3e
3 changed files with 7 additions and 3 deletions
  1. 4
    0
      Marlin/src/inc/Conditionals_LCD.h
  2. 2
    2
      Marlin/src/lcd/lcdprint.cpp
  3. 1
    1
      ini/features.ini

+ 4
- 0
Marlin/src/inc/Conditionals_LCD.h View File

@@ -517,6 +517,10 @@
517 517
   #define HAS_DISPLAY 1
518 518
 #endif
519 519
 
520
+#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
521
+  #define HAS_LCDPRINT 1
522
+#endif
523
+
520 524
 #if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
521 525
   #define HAS_STATUS_MESSAGE 1
522 526
 #endif

+ 2
- 2
Marlin/src/lcd/lcdprint.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include "../inc/MarlinConfigPre.h"
28 28
 
29
-#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
29
+#if HAS_LCDPRINT
30 30
 
31 31
 #include "marlinui.h"
32 32
 #include "lcdprint.h"
@@ -103,4 +103,4 @@ int calculateWidth(PGM_P const pstr) {
103 103
   return n * MENU_FONT_WIDTH;
104 104
 }
105 105
 
106
-#endif // HAS_WIRED_LCD
106
+#endif // HAS_LCDPRINT

+ 1
- 1
ini/features.ini View File

@@ -34,7 +34,7 @@ I2C_AMMETER                            = peterus/INA226Lib@1.1.2
34 34
 USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
35 35
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
36 36
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
37
-HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
37
+HAS_LCDPRINT                           = src_filter=+<src/lcd/lcdprint.cpp>
38 38
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
39 39
 HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
40 40
                                          src_filter=+<src/lcd/dogm>

Loading…
Cancel
Save