Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unloading state machine

pull/126/head
Alex Voinea 2021-09-30 20:39:54 +02:00 committed by DRracer
parent 221f40c7a1
commit 6071257973
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/logic/unload_filament.cpp
View File

@ -33,25 +33,22 @@ bool UnloadFilament::StepInner() {
error = ErrorCode::FINDA_DIDNT_SWITCH_OFF; error = ErrorCode::FINDA_DIDNT_SWITCH_OFF;
ml::leds.SetMode(mg::globals.ActiveSlot(), ml::green, ml::off); ml::leds.SetMode(mg::globals.ActiveSlot(), ml::green, ml::off);
ml::leds.SetMode(mg::globals.ActiveSlot(), ml::red, ml::blink0); ml::leds.SetMode(mg::globals.ActiveSlot(), ml::red, ml::blink0);
mi::idler.Disengage();
} else { } else {
state = ProgressCode::DisengagingIdler; state = ProgressCode::UnloadingToPulley;
mm::motion.PlanMove<mm::Pulley>(-config::cuttingEdgeToFindaMidpoint, config::pulleyFeedrate);
} }
// in all cases disengage the idler }
return false;
case ProgressCode::UnloadingToPulley:
if (mm::motion.QueueEmpty()) {
state = ProgressCode::DisengagingIdler;
mi::idler.Disengage(); mi::idler.Disengage();
} }
return false; return false;
case ProgressCode::DisengagingIdler: case ProgressCode::DisengagingIdler:
if (!mi::idler.Engaged()) {
state = ProgressCode::AvoidingGrind; // @@TODO what was this originally? Why are we supposed to move the pulley when the idler is not engaged?
// may be the pulley was to move along with the idler?
// mm::motion.PlanMove(mm::Pulley, -100, 10); // @@TODO constants
}
return false;
case ProgressCode::AvoidingGrind: // state 3 move a little bit so it is not a grinded hole in filament
if (mm::motion.QueueEmpty()) { if (mm::motion.QueueEmpty()) {
state = ProgressCode::FinishingMoves; state = ProgressCode::FinishingMoves;
mi::idler.Disengage();
return true;
} }
return false; return false;
case ProgressCode::FinishingMoves: case ProgressCode::FinishingMoves: