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

Tune UI CutFilament & EjectFilament

This commit is contained in:
D.R.racer 2022-12-29 20:19:04 +01:00 committed by DRracer
parent ec1d12d929
commit 43f3865d7c
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Firmware/mmu2.cpp
View File

@ -444,15 +444,20 @@ bool MMU2::cut_filament(uint8_t slot){
if( ! WaitForMMUReady()) if( ! WaitForMMUReady())
return false; return false;
ReportingRAII rep(CommandInProgress::CutFilament); if( FindaDetectsFilament() ){
unload();
}
ReportingRAII rep(CommandInProgress::CutFilament);
for(;;){ for(;;){
logic.CutFilament(slot); logic.CutFilament(slot);
if( manage_response(false, true) ) if( manage_response(false, true) )
break; break;
IncrementMMUFails(); IncrementMMUFails();
} }
extruder = MMU2_NO_TOOL;
tool_change_extruder = MMU2_NO_TOOL;
Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
return true; return true;
} }
@ -536,44 +541,21 @@ bool MMU2::eject_filament(uint8_t slot, bool recover) {
if( ! WaitForMMUReady()) if( ! WaitForMMUReady())
return false; return false;
if( FindaDetectsFilament() ){
unload();
}
ReportingRAII rep(CommandInProgress::EjectFilament); ReportingRAII rep(CommandInProgress::EjectFilament);
current_position[E_AXIS] -= MMU2_FILAMENTCHANGE_EJECT_FEED; for(;;) {
plan_buffer_line_curposXYZE(2500.F / 60.F); logic.EjectFilament(slot);
st_synchronize(); if( manage_response(false, true) )
logic.EjectFilament(slot); break;
if( ! manage_response(false, false) ){ IncrementMMUFails();
// @@TODO failed to perform the command - retry
;
} }
if (recover) {
// LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER);
Sound_MakeSound(e_SOUND_TYPE_StandardPrompt);
//@@TODO wait_for_user = true;
//#if ENABLED(HOST_PROMPT_SUPPORT)
// host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), PSTR("Continue"));
//#endif
//#if ENABLED(EXTENSIBLE_UI)
// ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover"));
//#endif
//@@TODO while (wait_for_user) idle(true);
Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
// logic.Command(); //@@TODO command(MMU_CMD_R0);
if( ! manage_response(false, false) ){
// @@TODO failed to perform the command - retry
;
}
}
// no active tool
extruder = MMU2_NO_TOOL; extruder = MMU2_NO_TOOL;
tool_change_extruder = MMU2_NO_TOOL; tool_change_extruder = MMU2_NO_TOOL;
Sound_MakeSound(e_SOUND_TYPE_StandardConfirm); Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
// disable_E0(); // disable_E0();
return true; return true;
} }