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

Merge pull request #4043 from 3d-gussner/MK3_Fix_fil_loaded_timeout 

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

4
Firmware/ultralcd.cpp
View File

@ -3704,7 +3704,7 @@ void lcd_v2_calibration()
} }
else else
{ {
loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, LCD_LEFT_BUTTON_CHOICE); loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, LCD_MIDDLE_BUTTON_CHOICE);
lcd_update_enabled = true; lcd_update_enabled = true;
} }
@ -3971,7 +3971,7 @@ void lcd_wizard(WizState state)
//start to preheat nozzle and bed to save some time later //start to preheat nozzle and bed to save some time later
setTargetHotend(PLA_PREHEAT_HOTEND_TEMP); setTargetHotend(PLA_PREHEAT_HOTEND_TEMP);
setTargetBed(PLA_PREHEAT_HPB_TEMP); setTargetBed(PLA_PREHEAT_HPB_TEMP);
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, LCD_MIDDLE_BUTTON_CHOICE);
if (wizard_event == LCD_LEFT_BUTTON_CHOICE) { if (wizard_event == LCD_LEFT_BUTTON_CHOICE) {
state = S::Lay1CalCold; state = S::Lay1CalCold;
} else { // MIDDLE_BUTTON_CHOICE } else { // MIDDLE_BUTTON_CHOICE