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

Merge pull request #4773 from 3d-gussner/MK3_fix_unload 

PFW-1561 Fix MMU unload issue
This commit is contained in:
3d-gussner 2024-09-23 07:39:18 +02:00 committed by GitHub
parent ab5c7ac6c6 402b9ed93a
commit aa4de7ae7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/fancheck.cpp
View File

@ -149,7 +149,7 @@ void checkFanSpeed()
lcd_reset_alert_level(); //for another fan speed error lcd_reset_alert_level(); //for another fan speed error
lcd_setstatuspgm(MSG_WELCOME); // Reset the status line message to visually show the error is gone lcd_setstatuspgm(MSG_WELCOME); // Reset the status line message to visually show the error is gone
} }
if (fans_check_enabled && (fan_check_error == EFCE_OK)) if (fans_check_enabled && (fan_check_error != EFCE_REPORTED))
{ {
for (uint8_t fan = 0; fan < 2; fan++) for (uint8_t fan = 0; fan < 2; fan++)
{ {

9
Firmware/ultralcd.cpp
View File

@ -5216,7 +5216,11 @@ static void lcd_main_menu()
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8
if (!printer_recovering()) { if (!printer_recovering()) {
if ( moves_planned() || printer_active()) { if ( moves_planned() || printer_active()
#ifdef FANCHECK
|| fan_check_error == EFCE_REPORTED
#endif //End FANCHECK
) {
MENU_ITEM_SUBMENU_P(_T(MSG_TUNE), lcd_tune_menu); MENU_ITEM_SUBMENU_P(_T(MSG_TUNE), lcd_tune_menu);
} else if (!Stopped) { } else if (!Stopped) {
MENU_ITEM_SUBMENU_P(_T(MSG_PREHEAT), lcd_preheat_menu); MENU_ITEM_SUBMENU_P(_T(MSG_PREHEAT), lcd_preheat_menu);
@ -5719,9 +5723,8 @@ void print_stop(bool interactive, bool unconditional_stop)
// Reset the sd status // Reset the sd status
card.sdprinting = false; card.sdprinting = false;
card.closefile(); card.closefile();
} else {
SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL);
} }
SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL);
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
mbl.active = false; mbl.active = false;