3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

More comprehensive NO_LCD_MENUS (#12367)

Browse source
This commit is contained in:
Scott Lahteine 2018-11-09 00:07:16 -06:00 • committed by GitHub
parent 9c8f083d6c
commit 4ed6397e5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 187 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -296,10 +296,6 @@
#define ULTIPANEL
#endif
#if ENABLED(NO_LCD_MENUS)
#undef ULTIPANEL
#endif
#define HAS_GRAPHICAL_LCD ENABLED(DOGLCD)
#if HAS_GRAPHICAL_LCD
@ -336,9 +332,7 @@
// Aliases for LCD features
#define HAS_SPI_LCD ENABLED(ULTRA_LCD)
#define HAS_CHARACTER_LCD (ENABLED(ULTRA_LCD) && DISABLED(DOGLCD))
#define HAS_DIGITAL_ENCODER (HAS_SPI_LCD && ENABLED(NEWPANEL))
#define HAS_LCD_MENU ENABLED(ULTIPANEL)
#define HAS_DEBUG_MENU (HAS_LCD_MENU && ENABLED(LCD_PROGRESS_BAR_TEST))
#define HAS_LCD_MENU (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
#if HAS_GRAPHICAL_LCD
/* Custom characters defined in font Marlin_symbols.fon which was merged to ISO10646-0-3.bdf */