Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable contrast via LCD_CONTRAST_INIT #15006

Merged
merged 4 commits into from
Aug 21, 2019
Merged

Enable contrast via LCD_CONTRAST_INIT #15006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2e7907
Restore contrast setting on fysetc mini
tpruvot Aug 20, 2019
b53acd2
DEFAULT_LCD_CONTRAST indicates contrast
thinkyhead Aug 21, 2019
d0e0cec
Allow DEFAULT_LCD_CONTRAST override
thinkyhead Aug 21, 2019
a20583b
Reset contrast to default
thinkyhead Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 16 additions & 39 deletions Marlin/src/inc/Conditionals_LCD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#define DOGLCD
#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_INIT 90

#elif ENABLED(ZONESTAR_LCD)

Expand Down Expand Up @@ -65,23 +65,23 @@
#if ENABLED(miniVIKI)
#define LCD_CONTRAST_MIN 75
#define LCD_CONTRAST_MAX 115
#define DEFAULT_LCD_CONTRAST 95
#define LCD_CONTRAST_INIT 95
#define U8GLIB_ST7565_64128N
#elif ENABLED(VIKI2)
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 140
#define LCD_CONTRAST_INIT 140
#define U8GLIB_ST7565_64128N
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define LCD_CONTRAST_MIN 90
#define LCD_CONTRAST_MAX 130
#define DEFAULT_LCD_CONTRAST 110
#define LCD_CONTRAST_INIT 110
#define U8GLIB_LM6059_AF
#define SD_DETECT_INVERTED
#elif ENABLED(AZSMZ_12864)
#define LCD_CONTRAST_MIN 120
#define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 190
#define LCD_CONTRAST_INIT 190
#define U8GLIB_ST7565_64128N
#endif

Expand Down Expand Up @@ -128,17 +128,17 @@
#elif ENABLED(MKS_MINI_12864)

#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)

#define FYSETC_MINI_12864
#define DOGLCD
#define IS_ULTIPANEL
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 220
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255
#define LCD_CONTRAST_INIT 220
#define LED_COLORS_REDUCE_GREEN
#if HAS_POWER_SWITCH && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
#define LED_BACKLIGHT_TIMEOUT 10000
Expand Down Expand Up @@ -166,9 +166,9 @@
#define IS_ULTIPANEL
#define U8GLIB_SSD1309
#define LCD_RESET_PIN LCD_PINS_D6 // This controller need a reset pin
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 254
#define DEFAULT_LCD_CONTRAST 127
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 254
#define LCD_CONTRAST_INIT 127
#define ENCODER_PULSES_PER_STEP 2
#define ENCODER_STEPS_PER_MENU_ITEM 2

Expand All @@ -190,8 +190,8 @@
#if ENABLED(MAKRPANEL)
#define U8GLIB_ST7565_64128N
#endif
#ifndef DEFAULT_LCD_CONTRAST
#define DEFAULT_LCD_CONTRAST 17
#ifndef LCD_CONTRAST_INIT
#define LCD_CONTRAST_INIT 17
#endif
#endif

Expand Down Expand Up @@ -381,29 +381,6 @@
#define HAS_LCD_MENU (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
#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
* so we separate these concepts into the defines:
Expand Down
16 changes: 16 additions & 0 deletions Marlin/src/inc/Conditionals_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,22 @@
#define MAX_AUTORETRACT 99
#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
*/
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/module/configuration_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,10 @@ void MarlinSettings::postprocess() {
const int16_t lcd_contrast =
#if HAS_LCD_CONTRAST
ui.contrast
#elif defined(DEFAULT_LCD_CONTRAST)
DEFAULT_LCD_CONTRAST
#else
32
127
#endif
;
EEPROM_WRITE(lcd_contrast);
Expand Down
4 changes: 1 addition & 3 deletions Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@
#define BTN_ENC 5

// This display has adjustable contrast
#undef HAS_LCD_CONTRAST
#define HAS_LCD_CONTRAST 1
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 255
#define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
#endif
4 changes: 2 additions & 2 deletions Marlin/src/pins/ramps/pins_TT_OSCAR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@
#define DOGLCD_CS 25

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

// GLCD features
//#define LCD_CONTRAST 190
//#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
#define DOGLCD_CS PB7
#endif

//#define LCD_CONTRAST 190
//#define LCD_CONTRAST_INIT 190
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
#define RGB_LED_B_PIN PB6
#endif

//#define LCD_CONTRAST 190
//#define LCD_CONTRAST_INIT 190

#if ENABLED(NEWPANEL)
#define BTN_EN1 PC11
Expand Down