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

cleanup recursion workaround in nozzle change 

This fix is no longer needed today.

LCD knob clicks / and rotation, take care of updating lcd_draw_update.

The real bug was likely lcd_show_multiscreen_message_yes_no_and_wait_P calling lcd_update(), this is fixed now since.
This commit is contained in:
Guðni Már Gilbert 2024-07-28 18:20:17 +00:00 committed by gudnimg
parent ff16bfd8fa
commit f96cc2f400
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;