diff --git a/.travis.yml b/.travis.yml index a5ad47484dba4ea9dd226db215ab695723232bec..7e2edc73766ff01aff4ff03c976a9b78ea813deb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -438,3 +438,12 @@ script: - cp Marlin/Configuration.h Marlin/src/config/default/Configuration.h - cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} + # + # Enable VIKI2, SDSUPPORT + # + - restore_configs + - opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB + - cp Marlin/Configuration.h Marlin/src/config/default/Configuration.h + - cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h + - opt_enable VIKI2 SDSUPPORT + - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 2add63942c3d7c8980b8e5b86d17a0b793384236..4473ded646410d55fba266efadb767c7900e24a1 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -3166,6 +3166,7 @@ void kill_screen(const char* lcd_msg) { #endif #if HAS_LCD_CONTRAST + // please don't remove the "(int16_t*)" - it's needed for the VIKI2 display --- see PR #9132 before changing it MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); #endif #if ENABLED(FWRETRACT) @@ -5243,7 +5244,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } #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); u8g.setContrast(lcd_contrast); } diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 98e8ffa134b599febc57b4d720a6662cdcec98b6..857d0344bbe976322df22f41b5cb88fe59df1547 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -84,8 +84,8 @@ #endif #if ENABLED(DOGLCD) - extern uint16_t lcd_contrast; - void set_lcd_contrast(const uint16_t value); + extern int16_t lcd_contrast; + void set_lcd_contrast(const int16_t value); #endif #if ENABLED(SHOW_BOOTSCREEN) diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index 57f9ab1ae058e85fbccf53234272a87b60d65e81..e8b11fb13366b611d78819615728a50831c8f422 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -230,7 +230,7 @@ #include "utf_mapper.h" -uint16_t lcd_contrast; // Initialized by settings.load() +int16_t lcd_contrast; // Initialized by settings.load() static char currentfont = 0; // The current graphical page being rendered diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index d2680229a9d885c26d6a3dbeeedcf69b05efa3d4..6ae28bc81cb048d19030f1a1b13a99072fe092ca 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -189,7 +189,7 @@ typedef struct SettingsDataStruct { // // HAS_LCD_CONTRAST // - uint16_t lcd_contrast; // M250 C + int16_t lcd_contrast; // M250 C // // FWRETRACT @@ -596,7 +596,7 @@ void MarlinSettings::postprocess() { _FIELD_TEST(lcd_contrast); #if !HAS_LCD_CONTRAST - const uint16_t lcd_contrast = 32; + const int16_t lcd_contrast = 32; #endif EEPROM_WRITE(lcd_contrast); @@ -1143,7 +1143,7 @@ void MarlinSettings::postprocess() { _FIELD_TEST(lcd_contrast); #if !HAS_LCD_CONTRAST - uint16_t lcd_contrast; + int16_t lcd_contrast; #endif EEPROM_READ(lcd_contrast);