Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PFW-1561 Fix MMU unload issue #4779

Merged
merged 3 commits into from
Sep 23, 2024
Merged

PFW-1561 Fix MMU unload issue #4779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bbe7f6
Fix MMU unload issue after a fan check issue has been solved
3d-gussner Sep 17, 2024
2c5c7da
Enable Tune menu during fan check issues, user can then disable the f…
3d-gussner Sep 17, 2024
c134884
Add `#ifdef FANCHECK` thanks @gudnimg
3d-gussner Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Firmware/fancheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void checkFanSpeed()
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
}
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++)
{
Expand Down
9 changes: 6 additions & 3 deletions Firmware/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5216,7 +5216,11 @@ static void lcd_main_menu()
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8

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);
} else if (!Stopped) {
MENU_ITEM_SUBMENU_P(_T(MSG_PREHEAT), lcd_preheat_menu);
Expand Down Expand Up @@ -5719,9 +5723,8 @@ void print_stop(bool interactive, bool unconditional_stop)
// Reset the sd status
card.sdprinting = false;
card.closefile();
} else {
SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL);
}
SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL);

#ifdef MESH_BED_LEVELING
mbl.active = false;
Expand Down
Loading