Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD` - `MINIPANEL` conditionals are identical to `MAKRPANEL`
This commit is contained in:
parent
7ba8f2dbc3
commit
d3efc96289
@ -48,11 +48,11 @@
|
|||||||
|
|
||||||
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
|
||||||
|
|
||||||
#if ENABLED(MAKRPANEL)
|
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
|
||||||
#define DOGLCD
|
#define DOGLCD
|
||||||
#define DEFAULT_LCD_CONTRAST 17
|
|
||||||
#define ULTIPANEL
|
#define ULTIPANEL
|
||||||
#define NEWPANEL
|
#define NEWPANEL
|
||||||
|
#define DEFAULT_LCD_CONTRAST 17
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
@ -123,13 +123,6 @@
|
|||||||
#define NEWPANEL
|
#define NEWPANEL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(MINIPANEL)
|
|
||||||
#define DOGLCD
|
|
||||||
#define ULTIPANEL
|
|
||||||
#define NEWPANEL
|
|
||||||
#define DEFAULT_LCD_CONTRAST 17
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* I2C PANELS
|
* I2C PANELS
|
||||||
*/
|
*/
|
||||||
@ -251,11 +244,10 @@
|
|||||||
/**
|
/**
|
||||||
* Default LCD contrast for dogm-like LCD displays
|
* Default LCD contrast for dogm-like LCD displays
|
||||||
*/
|
*/
|
||||||
#if ENABLED(DOGLCD) && DISABLED(DEFAULT_LCD_CONTRAST)
|
#if ENABLED(DOGLCD)
|
||||||
|
#if !defined(DEFAULT_LCD_CONTRAST)
|
||||||
#define DEFAULT_LCD_CONTRAST 32
|
#define DEFAULT_LCD_CONTRAST 32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(DOGLCD)
|
|
||||||
#define HAS_LCD_CONTRAST
|
#define HAS_LCD_CONTRAST
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#undef HAS_LCD_CONTRAST
|
#undef HAS_LCD_CONTRAST
|
||||||
|
Loading…
Reference in New Issue
Block a user