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

Merge pull request #4041 from 3d-gussner/MK3_312_Fix_fil_loaded_timeout 

MK3_3.12: Set `Is filament loaded? Yes|No` default to `No` without a timeout.
This commit is contained in:
3d-gussner 2023-02-21 07:18:20 +01:00 committed by GitHub
parent c3ea4f02d4 0eeaa5bed6
commit db7b472929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/ultralcd.cpp
View File

@ -3943,7 +3943,7 @@ void lcd_v2_calibration()
} }
else else
{ {
loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, true); loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, false);
lcd_update_enabled = true; lcd_update_enabled = true;
} }
@ -4218,10 +4218,10 @@ void lcd_wizard(WizState state)
setTargetBed(PLA_PREHEAT_HPB_TEMP); setTargetBed(PLA_PREHEAT_HPB_TEMP);
if (mmu_enabled) if (mmu_enabled)
{ {
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true); wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, false);
} else } else
{ {
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true); wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, false);
} }
if (wizard_event) state = S::Lay1CalCold; if (wizard_event) state = S::Lay1CalCold;
else else