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

🚸 COLOR_UI sleep timeout / setting (#24994)

Browse Source
This commit is contained in:
Tanguy Pruvot 2022-11-26 08:23:24 +01:00 committed by Scott Lahteine
parent b8ba9d60bb
commit b9bed1ca69
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/src/lcd/marlinui.cpp
View File

@ -196,12 +196,15 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load() uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
millis_t MarlinUI::screen_timeout_millis = 0; millis_t MarlinUI::screen_timeout_millis = 0;
#if DISABLED(TFT_COLOR_UI) void MarlinUI::refresh_screen_timeout() {
void MarlinUI::refresh_screen_timeout() { screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0; sleep_display(false);
sleep_display(false); }
}
#if !HAS_TOUCH_SLEEP && !HAS_MARLINUI_U8GLIB // without DOGM (COLOR_UI)
void MarlinUI::sleep_display(const bool sleep) {} // if unimplemented
#endif #endif
#endif #endif
void MarlinUI::init() { void MarlinUI::init() {
@ -731,6 +734,11 @@ void MarlinUI::init() {
void MarlinUI::wakeup_screen() { void MarlinUI::wakeup_screen() {
TERN(HAS_TOUCH_BUTTONS, touchBt.wakeUp(), touch.wakeUp()); TERN(HAS_TOUCH_BUTTONS, touchBt.wakeUp(), touch.wakeUp());
} }
#if HAS_DISPLAY_SLEEP && !HAS_MARLINUI_U8GLIB // without DOGM (COLOR_UI)
void MarlinUI::sleep_display(const bool sleep) {
if (!sleep) wakeup_screen(); // relay extra wake up events
}
#endif
#endif #endif
void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) { void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
@ -1071,7 +1079,7 @@ void MarlinUI::init() {
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
refresh_backlight_timeout(); refresh_backlight_timeout();
#elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI) #elif HAS_DISPLAY_SLEEP
refresh_screen_timeout(); refresh_screen_timeout();
#endif #endif
@ -1184,9 +1192,9 @@ void MarlinUI::init() {
WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
backlight_off_ms = 0; backlight_off_ms = 0;
} }
#elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI) #elif HAS_DISPLAY_SLEEP
if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis)) if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
sleep_display(true); sleep_display();
#endif #endif
// Change state of drawing flag between screen updates // Change state of drawing flag between screen updates

2
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -550,7 +550,7 @@ void menu_configuration() {
// //
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout); EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout);
#elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI) #elif HAS_DISPLAY_SLEEP
EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout); EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout);
#endif #endif

22
Marlin/src/lcd/tft/touch.cpp
View File

@ -43,7 +43,7 @@ int16_t Touch::x, Touch::y;
touch_control_t Touch::controls[]; touch_control_t Touch::controls[];
touch_control_t *Touch::current_control; touch_control_t *Touch::current_control;
uint16_t Touch::controls_count; uint16_t Touch::controls_count;
millis_t Touch::last_touch_ms = 0, millis_t Touch::next_touch_ms = 0,
Touch::time_to_hold, Touch::time_to_hold,
Touch::repeat_delay, Touch::repeat_delay,
Touch::touch_time; Touch::touch_time;
@ -83,8 +83,8 @@ void Touch::idle() {
// Return if Touch::idle is called within the same millisecond // Return if Touch::idle is called within the same millisecond
const millis_t now = millis(); const millis_t now = millis();
if (last_touch_ms == now) return; if (now <= next_touch_ms) return;
last_touch_ms = now; next_touch_ms = now;
if (get_point(&_x, &_y)) { if (get_point(&_x, &_y)) {
#if HAS_RESUME_CONTINUE #if HAS_RESUME_CONTINUE
@ -97,18 +97,18 @@ void Touch::idle() {
} }
#endif #endif
ui.reset_status_timeout(last_touch_ms); ui.reset_status_timeout(now);
if (touch_time) { if (touch_time) {
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if ENABLED(TOUCH_SCREEN_CALIBRATION)
if (touch_control_type == NONE && ELAPSED(last_touch_ms, touch_time + TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS) && ui.on_status_screen()) if (touch_control_type == NONE && ELAPSED(now, touch_time + TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS) && ui.on_status_screen())
ui.goto_screen(touch_screen_calibration); ui.goto_screen(touch_screen_calibration);
#endif #endif
return; return;
} }
if (time_to_hold == 0) time_to_hold = last_touch_ms + MINIMUM_HOLD_TIME; if (time_to_hold == 0) time_to_hold = now + MINIMUM_HOLD_TIME;
if (PENDING(last_touch_ms, time_to_hold)) return; if (PENDING(now, time_to_hold)) return;
if (x != 0 && y != 0) { if (x != 0 && y != 0) {
if (current_control) { if (current_control) {
@ -133,7 +133,7 @@ void Touch::idle() {
} }
if (!current_control) if (!current_control)
touch_time = last_touch_ms; touch_time = now;
} }
x = _x; x = _x;
y = _y; y = _y;
@ -252,8 +252,8 @@ void Touch::touch(touch_control_t *control) {
void Touch::hold(touch_control_t *control, millis_t delay) { void Touch::hold(touch_control_t *control, millis_t delay) {
current_control = control; current_control = control;
if (delay) { if (delay) {
repeat_delay = delay > MIN_REPEAT_DELAY ? delay : MIN_REPEAT_DELAY; repeat_delay = _MAX(delay, MIN_REPEAT_DELAY);
time_to_hold = last_touch_ms + repeat_delay; time_to_hold = next_touch_ms + repeat_delay;
} }
ui.refresh(); ui.refresh();
} }
@ -301,6 +301,8 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
#elif PIN_EXISTS(TFT_BACKLIGHT) #elif PIN_EXISTS(TFT_BACKLIGHT)
WRITE(TFT_BACKLIGHT_PIN, HIGH); WRITE(TFT_BACKLIGHT_PIN, HIGH);
#endif #endif
next_touch_ms = millis() + 100;
safe_delay(20);
} }
next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60); next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60);
} }

2
Marlin/src/lcd/tft/touch.h
View File

@ -103,7 +103,7 @@ class Touch {
static touch_control_t *current_control; static touch_control_t *current_control;
static uint16_t controls_count; static uint16_t controls_count;
static millis_t last_touch_ms, time_to_hold, repeat_delay, touch_time; static millis_t next_touch_ms, time_to_hold, repeat_delay, touch_time;
static TouchControlType touch_control_type; static TouchControlType touch_control_type;
static bool get_point(int16_t *x, int16_t *y); static bool get_point(int16_t *x, int16_t *y);

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

@ -658,7 +658,7 @@ void MarlinSettings::postprocess() {
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
ui.refresh_backlight_timeout(); ui.refresh_backlight_timeout();
#elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI) #elif HAS_DISPLAY_SLEEP
ui.refresh_screen_timeout(); ui.refresh_screen_timeout();
#endif #endif
} }