From 8ae499c3526d8e234322b657775715fa9026d060 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 30 Sep 2022 12:24:54 +0200 Subject: [PATCH 1/2] TM: Consume LCD click after calibration Consume any pending LCD click after the temperature model calibration. Since we're already in the status menu, the usual consume action is not done automatically here. --- Firmware/temperature.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5c52289ef..9148de43b 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2906,6 +2906,7 @@ void temp_model_autotune(int16_t temp, bool selftest) temp_model_report_settings(); } + lcd_consume_click(); menu_unset_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE); } From ae1c88823c6d8e72da4d23fa27d065b4b934585e Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 30 Sep 2022 14:29:37 +0200 Subject: [PATCH 2/2] Also consume longpress in lcd_consume_click() --- Firmware/lcd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 50d6bde37..7886b5097 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -204,11 +204,12 @@ private: extern void lcd_set_custom_characters(void); extern void lcd_set_custom_characters_nextpage(void); -//! @brief Consume click event +//! @brief Consume click and longpress event inline void lcd_consume_click() { lcd_button_pressed = 0; lcd_buttons &= 0xff^EN_C; + lcd_longpress_trigger = 0; }