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

Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament.

This commit is contained in:
Marek Bel 2018-09-17 21:23:13 +02:00
parent a687b8e64a
commit ab2d350ed1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/mmu.cpp
View File

@ -1020,16 +1020,16 @@ void mmu_eject_filament(uint8_t filament, bool recover)
current_position[E_AXIS] -= 80; current_position[E_AXIS] -= 80;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2500 / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2500 / 60, active_extruder);
st_synchronize(); st_synchronize();
} mmu_command(MMU_CMD_E0 + filament);
manage_response(false, false);
if (recover)
{
lcd_show_fullscreen_message_and_wait_P(_i("Please remove filament and then press the knob."));
mmu_command(MMU_CMD_R0);
manage_response(false, false);
}
mmu_command(MMU_CMD_E0 + filament); }
manage_response(false, false);
if (recover)
{
lcd_show_fullscreen_message_and_wait_P(_i("Please remove filament and then press the knob."));
mmu_command(MMU_CMD_R0);
manage_response(false, false);
}
} }
else else
{ {

1
Firmware/ultralcd.cpp
View File

@ -3244,6 +3244,7 @@ const char* lcd_display_message_fullscreen_P(const char *msg)
*/ */
void lcd_show_fullscreen_message_and_wait_P(const char *msg) void lcd_show_fullscreen_message_and_wait_P(const char *msg)
{ {
LcdUpdateDisabler lcdUpdateDisabler;
const char *msg_next = lcd_display_message_fullscreen_P(msg); const char *msg_next = lcd_display_message_fullscreen_P(msg);
bool multi_screen = msg_next != NULL; bool multi_screen = msg_next != NULL;
lcd_set_custom_characters_nextpage(); lcd_set_custom_characters_nextpage();