Browse Source

🐛 Fix LCD contrast/brightness init (#23567)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Mike La Spina 3 years ago
parent
commit
f6e8622360
No account linked to committer's email address

+ 1
- 0
Marlin/src/inc/Conditionals_post.h View File

377
   #define _LCD_CONTRAST_MIN  255
377
   #define _LCD_CONTRAST_MIN  255
378
   #define _LCD_CONTRAST_INIT 255
378
   #define _LCD_CONTRAST_INIT 255
379
 #elif ENABLED(FYSETC_MINI_12864)
379
 #elif ENABLED(FYSETC_MINI_12864)
380
+  #define _LCD_CONTRAST_MIN  180
380
   #define _LCD_CONTRAST_INIT 220
381
   #define _LCD_CONTRAST_INIT 220
381
 #elif ENABLED(ULTI_CONTROLLER)
382
 #elif ENABLED(ULTI_CONTROLLER)
382
   #define _LCD_CONTRAST_INIT 127
383
   #define _LCD_CONTRAST_INIT 127

+ 1
- 2
Marlin/src/lcd/marlinui.cpp View File

96
 #endif
96
 #endif
97
 
97
 
98
 #if HAS_LCD_CONTRAST
98
 #if HAS_LCD_CONTRAST
99
-  uint8_t MarlinUI::contrast; // Initialized by settings.load()
100
-
99
+  uint8_t MarlinUI::contrast = LCD_CONTRAST_DEFAULT; // Initialized by settings.load()
101
   void MarlinUI::set_contrast(const uint8_t value) {
100
   void MarlinUI::set_contrast(const uint8_t value) {
102
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
101
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
103
     _set_contrast();
102
     _set_contrast();

+ 9
- 5
Marlin/src/module/settings.cpp View File

578
     update_software_endstops((AxisEnum)i);
578
     update_software_endstops((AxisEnum)i);
579
   }
579
   }
580
 
580
 
581
+  TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
582
+  TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
583
+
581
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
584
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
582
 
585
 
583
   TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
586
   TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
1986
       // LCD Contrast
1989
       // LCD Contrast
1987
       //
1990
       //
1988
       {
1991
       {
1989
-        _FIELD_TEST(lcd_contrast);
1990
         uint8_t lcd_contrast;
1992
         uint8_t lcd_contrast;
1993
+        _FIELD_TEST(lcd_contrast);
1991
         EEPROM_READ(lcd_contrast);
1994
         EEPROM_READ(lcd_contrast);
1992
-        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
1995
+        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.contrast = lcd_contrast);
1993
       }
1996
       }
1994
 
1997
 
1995
       //
1998
       //
1997
       //
2000
       //
1998
       {
2001
       {
1999
         uint8_t lcd_brightness;
2002
         uint8_t lcd_brightness;
2003
+        _FIELD_TEST(lcd_brightness);
2000
         EEPROM_READ(lcd_brightness);
2004
         EEPROM_READ(lcd_brightness);
2001
-        TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.set_brightness(lcd_brightness));
2005
+        TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.brightness = lcd_brightness);
2002
       }
2006
       }
2003
 
2007
 
2004
       //
2008
       //
3018
   //
3022
   //
3019
   // LCD Contrast
3023
   // LCD Contrast
3020
   //
3024
   //
3021
-  TERN_(HAS_LCD_CONTRAST, ui.set_contrast(DEFAULT_LCD_CONTRAST));
3025
+  TERN_(HAS_LCD_CONTRAST, ui.contrast = LCD_CONTRAST_DEFAULT);
3022
 
3026
 
3023
   //
3027
   //
3024
   // LCD Brightness
3028
   // LCD Brightness
3025
   //
3029
   //
3026
-  TERN_(HAS_LCD_BRIGHTNESS, ui.set_brightness(DEFAULT_LCD_BRIGHTNESS));
3030
+  TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = DEFAULT_LCD_BRIGHTNESS);
3027
 
3031
 
3028
   //
3032
   //
3029
   // Controller Fan
3033
   // Controller Fan

Loading…
Cancel
Save