Merge pull request #1583 from mkbel/fix_cut

Fix unable to cut filament, if nozzle is already preheated.
This commit is contained in:
PavelSindler 2019-03-04 15:29:54 +01:00 committed by GitHub
commit 1051b7c39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2535,6 +2535,14 @@ if(current_temperature[0]>(target_temperature[0]*0.95))
menu_back(nLevel);
menu_submenu(mmu_fil_eject_menu);
break;
case e_FILAMENT_ACTION_mmuCut:
nLevel=bFilamentPreheatState?1:2;
bFilamentAction=true;
menu_back(nLevel);
menu_submenu(mmu_cut_filament_menu);
break;
case e_FILAMENT_ACTION_none:
break;
}
if(bFilamentWaitingFlag)
Sound_MakeSound(e_SOUND_TYPE_StandardPrompt);
@ -2559,6 +2567,11 @@ else {
case e_FILAMENT_ACTION_mmuEject:
lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1
break;
case e_FILAMENT_ACTION_mmuCut:
lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1
break;
case e_FILAMENT_ACTION_none:
break;
}
lcd_set_cursor(0,3);
lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1