thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 'Back' Button for Touch TFT 320x240 (#15060)

Browse Source
This commit is contained in:
Robby Candra
2019-08-29 13:19:07 +07:00
committed by Scott Lahteine
parent 8196ced2de
commit 38983fdfa9
229 changed files with 1486 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/ultralcd.cpp
View File

@@ -804,7 +804,7 @@ void MarlinUI::update() {
}
else wait_for_unclick = false;
#if HAS_DIGITAL_BUTTONS && BUTTON_EXISTS(BACK)
#if HAS_DIGITAL_BUTTONS && (BUTTON_EXISTS(BACK) || ENABLED(TOUCH_BUTTONS))
if (LCD_BACK_CLICKED()) {
quick_feedback();
goto_previous_screen();
@@ -885,6 +885,11 @@ void MarlinUI::update() {
#if ENABLED(TOUCH_BUTTONS)
touch_buttons = read_touch_buttons();
if (touch_buttons) {
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
#endif
}
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)