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

Enable contrast via LCD_CONTRAST_INIT (#15006)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-08-22 01:56:39 +02:00 committed by Scott Lahteine
parent 012f577bb0
commit e604f76703
7 changed files with 40 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,9 +30,9 @@
#define DOGLCD #define DOGLCD
#define IS_ULTIPANEL #define IS_ULTIPANEL
#define DEFAULT_LCD_CONTRAST 90 #define LCD_CONTRAST_MIN 60
#define LCD_CONTRAST_MIN 60
#define LCD_CONTRAST_MAX 140 #define LCD_CONTRAST_MAX 140
#define LCD_CONTRAST_INIT 90
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
@ -65,23 +65,23 @@
#if ENABLED(miniVIKI) #if ENABLED(miniVIKI)
#define LCD_CONTRAST_MIN 75 #define LCD_CONTRAST_MIN 75
#define LCD_CONTRAST_MAX 115 #define LCD_CONTRAST_MAX 115
#define DEFAULT_LCD_CONTRAST 95 #define LCD_CONTRAST_INIT 95
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#elif ENABLED(VIKI2) #elif ENABLED(VIKI2)
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 140 #define LCD_CONTRAST_INIT 140
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define LCD_CONTRAST_MIN 90 #define LCD_CONTRAST_MIN 90
#define LCD_CONTRAST_MAX 130 #define LCD_CONTRAST_MAX 130
#define DEFAULT_LCD_CONTRAST 110 #define LCD_CONTRAST_INIT 110
#define U8GLIB_LM6059_AF #define U8GLIB_LM6059_AF
#define SD_DETECT_INVERTED #define SD_DETECT_INVERTED
#elif ENABLED(AZSMZ_12864) #elif ENABLED(AZSMZ_12864)
#define LCD_CONTRAST_MIN 120 #define LCD_CONTRAST_MIN 120
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 190 #define LCD_CONTRAST_INIT 190
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#endif #endif
@ -128,17 +128,17 @@
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#define MINIPANEL #define MINIPANEL
#define DEFAULT_LCD_CONTRAST 150 #define LCD_CONTRAST_MAX 255
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_INIT 150
#elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) #elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
#define FYSETC_MINI_12864 #define FYSETC_MINI_12864
#define DOGLCD #define DOGLCD
#define IS_ULTIPANEL #define IS_ULTIPANEL
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 220 #define LCD_CONTRAST_INIT 220
#define LED_COLORS_REDUCE_GREEN #define LED_COLORS_REDUCE_GREEN
#if HAS_POWER_SWITCH && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) #if HAS_POWER_SWITCH && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
#define LED_BACKLIGHT_TIMEOUT 10000 #define LED_BACKLIGHT_TIMEOUT 10000
@ -166,9 +166,9 @@
#define IS_ULTIPANEL #define IS_ULTIPANEL
#define U8GLIB_SSD1309 #define U8GLIB_SSD1309
#define LCD_RESET_PIN LCD_PINS_D6 // This controller need a reset pin #define LCD_RESET_PIN LCD_PINS_D6 // This controller need a reset pin
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 254 #define LCD_CONTRAST_MAX 254
#define DEFAULT_LCD_CONTRAST 127 #define LCD_CONTRAST_INIT 127
#define ENCODER_PULSES_PER_STEP 2 #define ENCODER_PULSES_PER_STEP 2
#define ENCODER_STEPS_PER_MENU_ITEM 2 #define ENCODER_STEPS_PER_MENU_ITEM 2
@ -190,8 +190,8 @@
#if ENABLED(MAKRPANEL) #if ENABLED(MAKRPANEL)
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#endif #endif
#ifndef DEFAULT_LCD_CONTRAST #ifndef LCD_CONTRAST_INIT
#define DEFAULT_LCD_CONTRAST 17 #define LCD_CONTRAST_INIT 17
#endif #endif
#endif #endif
@ -381,29 +381,6 @@
#define HAS_LCD_MENU (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS)) #define HAS_LCD_MENU (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
#define HAS_ADC_BUTTONS ENABLED(ADC_KEYPAD) #define HAS_ADC_BUTTONS ENABLED(ADC_KEYPAD)
/**
* Default LCD contrast for Graphical LCD displays
*/
#define HAS_LCD_CONTRAST ( \
ENABLED(MAKRPANEL) \
|| ENABLED(CARTESIO_UI) \
|| ENABLED(VIKI2) \
|| ENABLED(AZSMZ_12864) \
|| ENABLED(miniVIKI) \
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
)
#if HAS_LCD_CONTRAST
#ifndef LCD_CONTRAST_MIN
#define LCD_CONTRAST_MIN 0
#endif
#ifndef LCD_CONTRAST_MAX
#define LCD_CONTRAST_MAX 63
#endif
#ifndef DEFAULT_LCD_CONTRAST
#define DEFAULT_LCD_CONTRAST 32
#endif
#endif
/** /**
* Extruders have some combination of stepper motors and hotends * Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines: * so we separate these concepts into the defines:

16
Marlin/src/inc/Conditionals_post.h
View file

@ -246,6 +246,22 @@
#define MAX_AUTORETRACT 99 #define MAX_AUTORETRACT 99
#endif #endif
/**
* Default LCD contrast for Graphical LCD displays
*/
#define HAS_LCD_CONTRAST defined(LCD_CONTRAST_INIT)
#if HAS_LCD_CONTRAST
#ifndef DEFAULT_LCD_CONTRAST
#define DEFAULT_LCD_CONTRAST LCD_CONTRAST_INIT
#endif
#ifndef LCD_CONTRAST_MIN
#define LCD_CONTRAST_MIN 0
#endif
#ifndef LCD_CONTRAST_MAX
#define LCD_CONTRAST_MAX MAX(63, LCD_CONTRAST_INIT)
#endif
#endif
/** /**
* Override here because this is set in Configuration_adv.h * Override here because this is set in Configuration_adv.h
*/ */

4
Marlin/src/module/configuration_store.cpp
View file

@ -828,8 +828,10 @@ void MarlinSettings::postprocess() {
const int16_t lcd_contrast = const int16_t lcd_contrast =
#if HAS_LCD_CONTRAST #if HAS_LCD_CONTRAST
ui.contrast ui.contrast
#elif defined(DEFAULT_LCD_CONTRAST)
DEFAULT_LCD_CONTRAST
#else #else
32 127
#endif #endif
; ;
EEPROM_WRITE(lcd_contrast); EEPROM_WRITE(lcd_contrast);

4
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
View file

@ -105,9 +105,7 @@
#define BTN_ENC 5 #define BTN_ENC 5
// This display has adjustable contrast // This display has adjustable contrast
#undef HAS_LCD_CONTRAST
#define HAS_LCD_CONTRAST 1
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255 #define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 255 #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
#endif #endif

4
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View file

@ -436,7 +436,7 @@
#define DOGLCD_CS 25 #define DOGLCD_CS 25
// GLCD features // GLCD features
//#define LCD_CONTRAST 190 //#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation // Uncomment screen orientation
//#define LCD_SCREEN_ROT_90 //#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_180
@ -463,7 +463,7 @@
#define DOGLCD_CS 66 #define DOGLCD_CS 66
// GLCD features // GLCD features
//#define LCD_CONTRAST 190 //#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation // Uncomment screen orientation
//#define LCD_SCREEN_ROT_90 //#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_180

2
Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
View file

@ -137,7 +137,7 @@
#define DOGLCD_CS PB7 #define DOGLCD_CS PB7
#endif #endif
//#define LCD_CONTRAST 190 //#define LCD_CONTRAST_INIT 190
//#define LCD_SCREEN_ROT_90 //#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270 //#define LCD_SCREEN_ROT_270

2
Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
View file

@ -140,7 +140,7 @@
#define RGB_LED_B_PIN PB6 #define RGB_LED_B_PIN PB6
#endif #endif
//#define LCD_CONTRAST 190 //#define LCD_CONTRAST_INIT 190
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#define BTN_EN1 PC11 #define BTN_EN1 PC11