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

🐛 E3V2 Brightness followup (#22821)

Browse Source 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
Miguel Risco-Castillo
2021-09-25 05:59:43 -05:00
committed by Scott Lahteine
parent e705a7724e
commit 89898181bd
16 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/lcd/e3v2/common/dwin_api.cpp
View File

@ -78,14 +78,16 @@ bool DWIN_Handshake() {
&& databuf[3] == 'K' );
}
// Set the backlight brightness
// brightness: (0x00-0x1F)
void DWIN_LCD_Brightness(const uint8_t brightness) {
size_t i = 0;
DWIN_Byte(i, 0x30);
DWIN_Byte(i, _MAX(brightness, 0x1F));
DWIN_Send(i);
}
#if HAS_LCD_BRIGHTNESS
// Set LCD backlight (from DWIN Enhanced)
// brightness: 0x00-0xFF
void DWIN_LCD_Brightness(const uint8_t brightness) {
size_t i = 0;
DWIN_Byte(i, 0x30);
DWIN_Byte(i, brightness);
DWIN_Send(i);
}
#endif
// Set screen display direction
// dir: 0=0°, 1=90°, 2=180°, 3=270°

8
Marlin/src/lcd/e3v2/common/dwin_api.h
View File

@ -90,9 +90,11 @@ bool DWIN_Handshake();
// DWIN startup
void DWIN_Startup();
// Set the backlight brightness
// brightness: (0x00-0xFF)
void DWIN_LCD_Brightness(const uint8_t brightness);
#if HAS_LCD_BRIGHTNESS
// Set the backlight brightness
// brightness: (0x00-0xFF)
void DWIN_LCD_Brightness(const uint8_t brightness);
#endif
// Set screen display direction
// dir: 0=0°, 1=90°, 2=180°, 3=270°

4
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@ -1816,6 +1816,10 @@ void HMI_SDCardInit() { card.cdroot(); }
void MarlinUI::refresh() { /* Nothing to see here */ }
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
#endif
#if ENABLED(SCROLL_LONG_FILENAMES)
char shift_name[LONG_FILENAME_LENGTH + 1];

9
Marlin/src/lcd/e3v2/enhanced/dwin.cpp
View File

@ -865,6 +865,10 @@ void HMI_SDCardInit() { card.cdroot(); }
void MarlinUI::refresh() { /* Nothing to see here */ }
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
#endif
#define ICON_Folder ICON_More
#if ENABLED(SCROLL_LONG_FILENAMES)
@ -2186,9 +2190,8 @@ void SetPID(celsius_t t, heater_id_t h) {
#endif
#if HAS_LCD_BRIGHTNESS
void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
void LiveBrightness() { DWIN_LCD_Brightness(HMI_value.Value); }
void SetBrightness() { SetIntOnClick(MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, ui.brightness, ApplyBrightness, LiveBrightness); }
void LiveBrightness() { ui.set_brightness(HMI_value.Value); }
void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, nullptr, LiveBrightness); }
#endif
#if ENABLED(SOUND_MENU_ITEM)

8
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@ -2717,7 +2717,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Float(ui.brightness, row, false, 1);
}
else
Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
break;
case VISUAL_TIME_FORMAT:
if (draw) {
@ -3879,7 +3879,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Float(ui.brightness, row, false, 1);
}
else
Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
break;
}
break;
@ -4800,6 +4800,10 @@ void CrealityDWINClass::Update() {
void MarlinUI::update() { CrealityDWIN.Update(); }
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
#endif
void CrealityDWINClass::State_Update() {
if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));

4
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
View File

@ -254,6 +254,10 @@ void MarlinUI::draw_status_message(const bool blink) {
#endif
}
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
#endif
#if HAS_LCD_MENU
#include "../../menu/menu.h"