From 0ff3035f3a45c6a818e6ca0dd6f82b6a47e6b78d 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 553f992aae..50172f98b9 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 4cff3c30f2..cb2d8f8672 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -717,8 +717,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 @@ -750,9 +748,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