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

menus updated, set lcd_commands_step = 0;

This commit is contained in:
PavelSindler 2017-12-12 14:25:13 +01:00
parent 9ef5570fa3
commit a724c2664c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View File

@ -4924,7 +4924,7 @@ static void lcd_main_menu()
} }
#ifdef SDSUPPORT #ifdef SDSUPPORT
if (card.cardOK) if (card.cardOK || lcd_commands_type == LCD_COMMAND_V2_CAL)
{ {
if (card.isFileOpen()) if (card.isFileOpen())
{ {
@ -4940,6 +4940,9 @@ static void lcd_main_menu()
MENU_ITEM(submenu, MSG_STOP_PRINT, lcd_sdcard_stop); MENU_ITEM(submenu, MSG_STOP_PRINT, lcd_sdcard_stop);
} }
} }
else if (lcd_commands_type == LCD_COMMAND_V2_CAL && mesh_bed_leveling_flag == false && homing_flag == false) {
//MENU_ITEM(submenu, MSG_STOP_PRINT, lcd_sdcard_stop);
}
else else
{ {
if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL))
@ -4951,6 +4954,7 @@ static void lcd_main_menu()
MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
#endif #endif
} }
} else } else
{ {
MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu); MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
@ -5168,6 +5172,7 @@ void lcd_print_stop() {
lcd_return_to_status(); lcd_return_to_status();
lcd_ignore_click(true); lcd_ignore_click(true);
lcd_commands_step = 0;
lcd_commands_type = LCD_COMMAND_STOP_PRINT; lcd_commands_type = LCD_COMMAND_STOP_PRINT;
// Turn off the print fan // Turn off the print fan