MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LCD_CONTRAST to uint16_t for 1.1.x parity (#9148)

Browse Source
This commit is contained in:
Bob-the-Kuhn 2018-01-11 18:32:41 -06:00 committed by Scott Lahteine
parent 59d48b9b1f
commit 4393c3ef7f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/configuration_store.cpp
View File

@ -189,7 +189,7 @@ typedef struct SettingsDataStruct {
// //
// HAS_LCD_CONTRAST // HAS_LCD_CONTRAST
// //
uint16_t lcd_contrast; // M250 C int16_t lcd_contrast; // M250 C
// //
// FWRETRACT // FWRETRACT
@ -618,7 +618,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(lcd_contrast); _FIELD_TEST(lcd_contrast);
#if !HAS_LCD_CONTRAST #if !HAS_LCD_CONTRAST
const uint16_t lcd_contrast = 32; const int16_t lcd_contrast = 32;
#endif #endif
EEPROM_WRITE(lcd_contrast); EEPROM_WRITE(lcd_contrast);
@ -1159,7 +1159,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(lcd_contrast); _FIELD_TEST(lcd_contrast);
#if !HAS_LCD_CONTRAST #if !HAS_LCD_CONTRAST
uint16_t lcd_contrast; int16_t lcd_contrast;
#endif #endif
EEPROM_READ(lcd_contrast); EEPROM_READ(lcd_contrast);

2
Marlin/ultralcd.cpp
View File

@ -5236,7 +5236,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if HAS_LCD_CONTRAST #if HAS_LCD_CONTRAST
void set_lcd_contrast(const uint16_t value) { void set_lcd_contrast(const int16_t value) {
lcd_contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX); lcd_contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
u8g.setContrast(lcd_contrast); u8g.setContrast(lcd_contrast);
} }

4
Marlin/ultralcd.h
View File

@ -71,8 +71,8 @@
#endif #endif
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
extern uint16_t lcd_contrast; extern int16_t lcd_contrast;
void set_lcd_contrast(const uint16_t value); void set_lcd_contrast(const int16_t value);
#endif #endif
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)

2
Marlin/ultralcd_impl_DOGM.h
View File

@ -222,7 +222,7 @@
#include "utf_mapper.h" #include "utf_mapper.h"
uint16_t lcd_contrast; // Initialized by settings.load() int16_t lcd_contrast; // Initialized by settings.load()
static char currentfont = 0; static char currentfont = 0;
// The current graphical page being rendered // The current graphical page being rendered