From 7ff4b706947e63d708cef90c936b936305947e58 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 21 Apr 2022 07:07:04 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Prevent=20accidental=20button=20?= =?UTF-8?q?press?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/MarlinCore.cpp | 1 + Marlin/src/lcd/marlinui.h | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index be93bfcfb9..279754aee3 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -271,6 +271,7 @@ bool wait_for_heatup = true; while (wait_for_user && !(ms && ELAPSED(millis(), ms))) idle(TERN_(ADVANCED_PAUSE_FEATURE, no_sleep)); wait_for_user = false; + while (ui.button_pressed()) safe_delay(50); } #endif diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index d9404541d2..b9c4e72371 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -709,8 +709,6 @@ public: static bool hw_button_pressed() { return BUTTON_CLICK(); } #endif - static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); } - #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION) static void wait_for_release(); #endif @@ -742,9 +740,12 @@ public: #else static void update_buttons() {} + static bool hw_button_pressed() { return false; } #endif + static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); } + #if ENABLED(TOUCH_SCREEN_CALIBRATION) static void touch_calibration_screen(); #endif