Skip to content

Commit b0798fc

Browse files
Update - fix ProUI frozen LCD off
1 parent 6badd1b commit b0798fc

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

Marlin/src/core/boards.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@
275275
#define BOARD_MKS_SGEN_L_V2 2509 // MKS SGEN_L V2
276276
#define BOARD_BTT_SKR_E3_TURBO 2510 // BigTreeTech SKR E3 Turbo
277277
#define BOARD_FLY_CDY 2511 // FLYmaker FLY CDY
278-
#define BOARD_XTLW_CLIMBER_8TH_LPC 2512 // XTLW_CLIMBER_8TH_LPC
278+
#define BOARD_XTLW_CLIMBER_8TH_LPC 2512 // XTLW Climber 8
279279

280280
//
281281
// SAM3X8E ARM Cortex-M3
282282
//
283283

284284
#define BOARD_DUE3DOM 3000 // DUE3DOM for Arduino DUE
285285
#define BOARD_DUE3DOM_MINI 3001 // DUE3DOM MINI for Arduino DUE
286-
#define BOARD_RADDS 3002 // RADDS
286+
#define BOARD_RADDS 3002 // RADDS v1.5/v1.6`
287287
#define BOARD_RAMPS_FD_V1 3003 // RAMPS-FD v1
288288
#define BOARD_RAMPS_FD_V2 3004 // RAMPS-FD v2
289289
#define BOARD_RAMPS_SMART_EFB 3005 // RAMPS-SMART (Power outputs: Hotend, Fan, Bed)

Marlin/src/lcd/e3v2/proui/dwin.cpp

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,8 +1283,8 @@ void Draw_Main_Area() {
12831283
void HMI_WaitForUser() {
12841284
EncoderState encoder_diffState = get_encoder_state();
12851285
if ((encoder_diffState != ENCODER_DIFF_NO) && !ui.backlight) {
1286-
if (checkkey == WaitResponse) { HMI_ReturnScreen(); }
1287-
return ui.refresh_brightness();
1286+
ui.refresh_brightness();
1287+
return HMI_ReturnScreen();
12881288
}
12891289
if (!wait_for_user) {
12901290
switch (checkkey) {
@@ -2316,7 +2316,16 @@ void MarlinUI::update() {
23162316
}
23172317

23182318
#if HAS_LCD_BRIGHTNESS
2319-
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
2319+
void MarlinUI::_set_brightness() {
2320+
if (backlight) {
2321+
DWIN_LCD_Brightness(brightness);
2322+
wait_for_user = false;
2323+
}
2324+
else {
2325+
DWIN_LCD_Brightness(0);
2326+
wait_for_user = true;
2327+
}
2328+
}
23202329
#endif
23212330

23222331
void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const) {
@@ -2519,7 +2528,7 @@ void ApplyMove() {
25192528
void ApplyBrightness() { ui.set_brightness(MenuData.Value); }
25202529
void LiveBrightness() { DWIN_LCD_Brightness(MenuData.Value); }
25212530
void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, ApplyBrightness, LiveBrightness); }
2522-
void TurnOffBacklight() { HMI_SaveProcessID(WaitResponse); ui.set_brightness(0); DWIN_RedrawScreen(); }
2531+
void TurnOffBacklight() { ui.set_brightness(0); DWIN_RedrawScreen(); }
25232532
#endif
25242533

25252534
#if ENABLED(CASE_LIGHT_MENU)

0 commit comments

Comments
 (0)