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 FINDA flicker tests

pull/249/head
Guðni Már Gilbert 2022-12-17 13:06:53 +00:00
parent 27f28973d3
commit 7fe81be707
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/unit/logic/tool_change/test_tool_change.cpp
View File

@ -210,6 +210,8 @@ void ToolChangeFailLoadToFinda(logic::ToolChange &tc, uint8_t fromSlot, uint8_t
REQUIRE(VerifyState(tc, mg::FilamentLoadState::AtPulley, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::RUNNING, ProgressCode::ERRDisengagingIdler)); REQUIRE(VerifyState(tc, mg::FilamentLoadState::AtPulley, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::RUNNING, ProgressCode::ERRDisengagingIdler));
SimulateErrDisengagingIdler(tc, ErrorCode::FINDA_DIDNT_SWITCH_ON); SimulateErrDisengagingIdler(tc, ErrorCode::FINDA_DIDNT_SWITCH_ON);
REQUIRE(VerifyState(tc, mg::FilamentLoadState::AtPulley, mi::idler.IdleSlotIndex(), toSlot, false, false, ml::off, ml::blink0, ErrorCode::FINDA_DIDNT_SWITCH_ON, ProgressCode::ERRWaitingForUser));
} }
void ToolChangeFailLoadToFindaLeftBtn(logic::ToolChange &tc, uint8_t toSlot) { void ToolChangeFailLoadToFindaLeftBtn(logic::ToolChange &tc, uint8_t toSlot) {
@ -246,8 +248,6 @@ void ToolChangeFailLoadToFindaMiddleBtn(logic::ToolChange &tc, uint8_t toSlot) {
// now waiting for user input // now waiting for user input
REQUIRE_FALSE(mui::userInput.AnyEvent()); REQUIRE_FALSE(mui::userInput.AnyEvent());
REQUIRE(VerifyState(tc, mg::FilamentLoadState::AtPulley, mi::idler.IdleSlotIndex(), toSlot, false, false, ml::off, ml::blink0, ErrorCode::FINDA_DIDNT_SWITCH_ON, ProgressCode::ERRWaitingForUser));
PressButtonAndDebounce(tc, mb::Middle, true); PressButtonAndDebounce(tc, mb::Middle, true);
REQUIRE_FALSE(mi::idler.HomingValid()); REQUIRE_FALSE(mi::idler.HomingValid());
@ -460,7 +460,14 @@ void ToolChangeWithFlickeringFINDA(logic::ToolChange &tc, uint8_t fromSlot, uint
main_loop(); main_loop();
tc.Step(); tc.Step();
REQUIRE(VerifyState(tc, mg::FilamentLoadState::InSelector, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::RUNNING, ProgressCode::ERRDisengagingIdler)); REQUIRE(mf::finda.Pressed());
REQUIRE((int)mg::globals.FilamentLoaded() == (int)mg::FilamentLoadState::AtPulley);
REQUIRE(mm::PulleyEnabled() == false);
REQUIRE(ml::leds.Mode(toSlot, ml::green) == ml::off);
REQUIRE(ml::leds.Mode(toSlot, ml::red) == ml::blink0);
REQUIRE(tc.Error() == ErrorCode::RUNNING);
REQUIRE(tc.TopLevelState() == ProgressCode::ERRDisengagingIdler);
SimulateErrDisengagingIdler(tc, ErrorCode::FINDA_FLICKERS); // this should be a single step, Idler should remain disengaged due to previous error SimulateErrDisengagingIdler(tc, ErrorCode::FINDA_FLICKERS); // this should be a single step, Idler should remain disengaged due to previous error
// now we have 2 options what can happen: // now we have 2 options what can happen:
@ -469,22 +476,41 @@ void ToolChangeWithFlickeringFINDA(logic::ToolChange &tc, uint8_t fromSlot, uint
if (keepFindaPressed) { if (keepFindaPressed) {
// now waiting for user input // now waiting for user input
REQUIRE_FALSE(mui::userInput.AnyEvent()); REQUIRE_FALSE(mui::userInput.AnyEvent());
REQUIRE(VerifyState(tc, mg::FilamentLoadState::InSelector, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::FINDA_FLICKERS, ProgressCode::ERRWaitingForUser));
REQUIRE(mf::finda.Pressed());
REQUIRE((int)mg::globals.FilamentLoaded() == (int)mg::FilamentLoadState::AtPulley);
REQUIRE(mm::PulleyEnabled() == false);
REQUIRE(ml::leds.Mode(toSlot, ml::green) == ml::off);
REQUIRE(ml::leds.Mode(toSlot, ml::red) == ml::blink0);
REQUIRE(tc.Error() == ErrorCode::FINDA_FLICKERS);
REQUIRE(tc.TopLevelState() == ProgressCode::ERRWaitingForUser);
PressButtonAndDebounce(tc, mb::Middle, true); PressButtonAndDebounce(tc, mb::Middle, true);
// we should remain in the same error state // we should remain in the same error state
REQUIRE(VerifyState(tc, mg::FilamentLoadState::InSelector, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::RUNNING, ProgressCode::ERRDisengagingIdler)); REQUIRE(mf::finda.Pressed());
REQUIRE((int)mg::globals.FilamentLoaded() == (int)mg::FilamentLoadState::AtPulley);
REQUIRE(mm::PulleyEnabled() == false);
REQUIRE(ml::leds.Mode(toSlot, ml::green) == ml::off);
REQUIRE(ml::leds.Mode(toSlot, ml::red) == ml::blink0);
REQUIRE(tc.Error() == ErrorCode::RUNNING);
REQUIRE(tc.TopLevelState() == ProgressCode::ERRDisengagingIdler);
// Idler will try to rehome, allow it // Idler will try to rehome, allow it
SimulateIdlerHoming(tc); SimulateIdlerHoming(tc);
REQUIRE(VerifyState(tc, mg::FilamentLoadState::InSelector, toSlot, toSlot, false, true, ml::off, ml::blink0, ErrorCode::FINDA_FLICKERS, ProgressCode::ERRWaitingForUser));
// now "fix" FINDA and the command shall finish correctly REQUIRE(mf::finda.Pressed());
SetFINDAStateAndDebounce(false); REQUIRE((int)mg::globals.FilamentLoaded() == (int)mg::FilamentLoadState::AtPulley);
ToolChangeFailLoadToFindaMiddleBtn(tc, toSlot); REQUIRE(mm::PulleyEnabled() == false);
} else { REQUIRE(ml::leds.Mode(toSlot, ml::green) == ml::off);
SetFINDAStateAndDebounce(false); REQUIRE(ml::leds.Mode(toSlot, ml::red) == ml::blink0);
ToolChangeFailLoadToFindaMiddleBtn(tc, toSlot); REQUIRE(tc.Error() == ErrorCode::FINDA_FLICKERS);
REQUIRE(tc.TopLevelState() == ProgressCode::ERRWaitingForUser);
} }
// now "fix" FINDA and the command shall finish correctly
SetFINDAStateAndDebounce(false);
ToolChangeFailLoadToFindaMiddleBtn(tc, toSlot);
} }
TEST_CASE("tool_change::test_flickering_FINDA", "[tool_change]") { TEST_CASE("tool_change::test_flickering_FINDA", "[tool_change]") {