Skip to content

Commit

Permalink
🔧 HAS_LCDPRINT conditional
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Feb 13, 2022
1 parent cda4682 commit cf013a7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Marlin/src/inc/Conditionals_LCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,10 @@
#define HAS_DISPLAY 1
#endif

#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
#define HAS_LCDPRINT 1
#endif

#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
#define HAS_STATUS_MESSAGE 1
#endif
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/lcdprint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "../inc/MarlinConfigPre.h"

#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
#if HAS_LCDPRINT

#include "marlinui.h"
#include "lcdprint.h"
Expand Down Expand Up @@ -103,4 +103,4 @@ int calculateWidth(PGM_P const pstr) {
return n * MENU_FONT_WIDTH;
}

#endif // HAS_WIRED_LCD
#endif // HAS_LCDPRINT
2 changes: 1 addition & 1 deletion ini/features.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ I2C_AMMETER = peterus/INA226Lib@1.1.2
USES_LIQUIDCRYSTAL = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp>
HAS_LCDPRINT = src_filter=+<src/lcd/lcdprint.cpp>
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.0
src_filter=+<src/lcd/dogm>
Expand Down

0 comments on commit cf013a7

Please sign in to comment.