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

Merge pull request #4736 from gudnimg/cleanup_recursion_hack 

Remove recursion workaround in Nozzle Change
This commit is contained in:
3d-gussner 2024-08-08 11:17:28 +02:00 committed by GitHub
parent 80148a862d 25a11bb7d7
commit 428091b7c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/lcd.h
View File

@ -111,18 +111,18 @@ extern void lcd_buttons_update(void);
//! When constructed (on stack), original state state of lcd_update_enabled is stored //! When constructed (on stack), original state state of lcd_update_enabled is stored
//! and LCD updates are disabled. //! and LCD updates are disabled.
//! When destroyed (gone out of scope), original state of LCD update is restored. //! When destroyed (gone out of scope), original state of LCD update is restored.
//! It has zero overhead compared to storing bool saved = lcd_update_enabled //! Do not call lcd_update_enable() to prevent calling lcd_update() in sensitive code.
//! and calling lcd_update_enable(false) and lcd_update_enable(saved). //! in certain scenarios it will cause recursion e.g. in the menus.
class LcdUpdateDisabler class LcdUpdateDisabler
{ {
public: public:
LcdUpdateDisabler(): m_updateEnabled(lcd_update_enabled) LcdUpdateDisabler(): m_updateEnabled(lcd_update_enabled)
{ {
lcd_update_enable(false); lcd_update_enabled = false;
} }
~LcdUpdateDisabler() ~LcdUpdateDisabler()
{ {
lcd_update_enable(m_updateEnabled); lcd_update_enabled = m_updateEnabled;
} }
private: private:

10
Firmware/ultralcd.cpp
View File

@ -984,10 +984,7 @@ void lcd_commands()
break; break;
case 3: case 3:
#ifndef QUICK_NOZZLE_CHANGE #ifndef QUICK_NOZZLE_CHANGE
lcd_update_enabled = false; //hack to avoid lcd_update recursion.
lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP)); lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP));
lcd_update_enabled = true;
lcd_draw_update = 2; //force lcd clear and update after the stack unwinds.
enquecommand_P(G28W); enquecommand_P(G28W);
enquecommand_P(PSTR("G1 X125 Z200 F1000")); enquecommand_P(PSTR("G1 X125 Z200 F1000"));
enquecommand_P(PSTR("M109 S280")); enquecommand_P(PSTR("M109 S280"));
@ -1000,14 +997,9 @@ void lcd_commands()
fanSpeed = 255; //turn on fan fanSpeed = 255; //turn on fan
disable_heater(); disable_heater();
uint8_t choice = lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_COOLDOWN), true, LCD_LEFT_BUTTON_CHOICE); uint8_t choice = lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_COOLDOWN), true, LCD_LEFT_BUTTON_CHOICE);
lcd_update_enabled = false; //hack to avoid lcd_update recursion.
if (choice == LCD_MIDDLE_BUTTON_CHOICE) { if (choice == LCD_MIDDLE_BUTTON_CHOICE) {
lcd_update_enabled = true;
lcd_draw_update = 2; //force lcd clear and update after the stack unwinds.
break; break;
} }
lcd_update_enabled = true;
lcd_draw_update = 2; //force lcd clear and update after the stack unwinds.
} }
enquecommand_P(G28W); //home enquecommand_P(G28W); //home
enquecommand_P(PSTR("G1 X125 Z200 F1000")); //move to top center enquecommand_P(PSTR("G1 X125 Z200 F1000")); //move to top center
@ -1016,7 +1008,6 @@ void lcd_commands()
break; break;
case 2: case 2:
enquecommand_P(PSTR("M84 XY")); enquecommand_P(PSTR("M84 XY"));
lcd_update_enabled = false; //hack to avoid lcd_update recursion.
if (lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) { if (lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) {
#ifndef QUICK_NOZZLE_CHANGE #ifndef QUICK_NOZZLE_CHANGE
setTargetHotend(0); setTargetHotend(0);
@ -1028,7 +1019,6 @@ void lcd_commands()
#endif //QUICK_NOZZLE_CHANGE #endif //QUICK_NOZZLE_CHANGE
lcd_commands_step = 1; lcd_commands_step = 1;
} }
lcd_update_enabled = true;
break; break;
case 1: case 1:
lcd_commands_step = 0; lcd_commands_step = 0;