|
@@ -1716,23 +1716,18 @@ static void lcd_control_volumetric_menu() {
|
1716
|
1716
|
static void lcd_set_contrast() {
|
1717
|
1717
|
ENCODER_DIRECTION_NORMAL();
|
1718
|
1718
|
if (encoderPosition) {
|
1719
|
|
- #if ENABLED(U8GLIB_LM6059_AF)
|
1720
|
|
- lcd_contrast += encoderPosition;
|
1721
|
|
- lcd_contrast &= 0xFF;
|
1722
|
|
- #else
|
1723
|
|
- lcd_contrast -= encoderPosition;
|
1724
|
|
- lcd_contrast &= 0x3F;
|
1725
|
|
- #endif
|
|
1719
|
+ set_lcd_contrast(lcd_contrast + encoderPosition);
|
1726
|
1720
|
encoderPosition = 0;
|
1727
|
1721
|
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
|
1728
|
|
- u8g.setContrast(lcd_contrast);
|
1729
|
1722
|
}
|
1730
|
1723
|
if (lcdDrawUpdate) {
|
1731
|
|
- #if ENABLED(U8GLIB_LM6059_AF)
|
1732
|
|
- lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast));
|
1733
|
|
- #else
|
1734
|
|
- lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));
|
1735
|
|
- #endif
|
|
1724
|
+ lcd_implementation_drawedit(PSTR(MSG_CONTRAST),
|
|
1725
|
+ #if LCD_CONTRAST_MAX >= 100
|
|
1726
|
+ itostr3(lcd_contrast)
|
|
1727
|
+ #else
|
|
1728
|
+ itostr2(lcd_contrast)
|
|
1729
|
+ #endif
|
|
1730
|
+ );
|
1736
|
1731
|
}
|
1737
|
1732
|
if (LCD_CLICKED) lcd_goto_previous_menu(true);
|
1738
|
1733
|
}
|
|
@@ -2384,8 +2379,8 @@ void lcd_setalertstatuspgm(const char* message) {
|
2384
|
2379
|
void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
2385
|
2380
|
|
2386
|
2381
|
#if HAS_LCD_CONTRAST
|
2387
|
|
- void lcd_setcontrast(uint8_t value) {
|
2388
|
|
- lcd_contrast = value & 0x3F;
|
|
2382
|
+ void set_lcd_contrast(int value) {
|
|
2383
|
+ lcd_contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
|
2389
|
2384
|
u8g.setContrast(lcd_contrast);
|
2390
|
2385
|
}
|
2391
|
2386
|
#endif
|