josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3666 from 3d-gussner/MK3_3.12_tm_cal_click 

TM: Consume LCD click after calibration for MK3_3.12
This commit is contained in:
3d-gussner 2022-10-06 15:39:44 +02:00 committed by GitHub
parent d971944d1a ae1c88823c
commit b2a4194525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/lcd.h
View File

@ -204,11 +204,12 @@ private:
extern void lcd_set_custom_characters(void); extern void lcd_set_custom_characters(void);
extern void lcd_set_custom_characters_nextpage(void); extern void lcd_set_custom_characters_nextpage(void);
//! @brief Consume click event //! @brief Consume click and longpress event
inline void lcd_consume_click() inline void lcd_consume_click()
{ {
lcd_button_pressed = 0; lcd_button_pressed = 0;
lcd_buttons &= 0xff^EN_C; lcd_buttons &= 0xff^EN_C;
lcd_longpress_trigger = 0;
} }

1
Firmware/temperature.cpp
View File

@ -2906,6 +2906,7 @@ void temp_model_autotune(int16_t temp, bool selftest)
temp_model_report_settings(); temp_model_report_settings();
} }
lcd_consume_click();
menu_unset_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE); menu_unset_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE);
} }