zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🔧 HAS_LCDPRINT conditional

Browse source
This commit is contained in:
Scott Lahteine 2022-02-13 12:55:00 -06:00 committed by Scott Lahteine
parent 5f0e1a15df
commit 341113bcfb
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/Conditionals_LCD.h
View file

@ -539,6 +539,10 @@
#define HAS_DISPLAY 1 #define HAS_DISPLAY 1
#endif #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) #if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
#define HAS_STATUS_MESSAGE 1 #define HAS_STATUS_MESSAGE 1
#endif #endif

4
Marlin/src/lcd/lcdprint.cpp
View file

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

2
ini/features.ini
View file

@ -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 = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4 USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7 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_HD44780 = src_filter=+<src/lcd/HD44780>
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.0 HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.0
src_filter=+<src/lcd/dogm> src_filter=+<src/lcd/dogm>