bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

✨ M256 LCD brightness (#22478)

Browse Source
This commit is contained in:
Scott Lahteine
2021-08-01 14:28:53 -05:00
parent eeac85642f
commit 4b2fdbeeb1
10 changed files with 114 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Marlin/src/module/settings.cpp
View File

@ -36,7 +36,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V83"
#define EEPROM_VERSION "V84"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@ -353,6 +353,11 @@ typedef struct SettingsDataStruct {
//
int16_t lcd_contrast; // M250 C
//
// HAS_LCD_BRIGHTNESS
//
uint8_t lcd_brightness; // M256 B
//
// Controller fan settings
//
@ -999,17 +1004,19 @@ void MarlinSettings::postprocess() {
//
{
_FIELD_TEST(lcd_contrast);
const int16_t lcd_contrast =
#if HAS_LCD_CONTRAST
ui.contrast
#else
127
#endif
;
const int16_t lcd_contrast = TERN(HAS_LCD_CONTRAST, ui.contrast, 127);
EEPROM_WRITE(lcd_contrast);
}
//
// LCD Brightness
//
{
_FIELD_TEST(lcd_brightness);
const uint8_t lcd_brightness = TERN(HAS_LCD_BRIGHTNESS, ui.brightness, 255);
EEPROM_WRITE(lcd_brightness);
}
//
// Controller Fan
//
@ -1846,6 +1853,16 @@ void MarlinSettings::postprocess() {
}
}
//
// LCD Brightness
//
{
_FIELD_TEST(lcd_brightness);
uint8_t lcd_brightness;
EEPROM_READ(lcd_brightness);
TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.set_brightness(lcd_brightness));
}
//
// Controller Fan
//
@ -2829,6 +2846,11 @@ void MarlinSettings::reset() {
//
TERN_(HAS_LCD_CONTRAST, ui.set_contrast(DEFAULT_LCD_CONTRAST));
//
// LCD Brightness
//
TERN_(HAS_LCD_BRIGHTNESS, ui.set_brightness(DEFAULT_LCD_BRIGHTNESS));
//
// Controller Fan
//
@ -3406,6 +3428,11 @@ void MarlinSettings::reset() {
CONFIG_ECHO_MSG(" M250 C", ui.contrast);
#endif
#if HAS_LCD_BRIGHTNESS
CONFIG_ECHO_HEADING("LCD Brightness:");
CONFIG_ECHO_MSG(" M256 B", ui.brightness);
#endif
TERN_(CONTROLLER_FAN_EDITABLE, M710_report(forReplay));
#if ENABLED(POWER_LOSS_RECOVERY)

2
Marlin/src/module/stepper/trinamic.cpp
View File

@ -1008,7 +1008,7 @@ void reset_trinamic_drivers() {
TMC_SW_DETAIL(Y), TMC_SW_DETAIL(Y2),
TMC_SW_DETAIL(Z), TMC_SW_DETAIL(Z2), TMC_SW_DETAIL(Z3), TMC_SW_DETAIL(Z4),
TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K),
TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
};
constexpr bool sc_sw_done(size_t start, size_t end) { return start == end; }