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

Shorten ADC reinit usage

pull/26/head
D.R.racer 2021-06-18 06:46:29 +02:00 committed by DRracer
parent 3cb3cebed9
commit b338949acb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp
View File

@ -61,8 +61,8 @@ TEST_CASE("feed_to_finda::feed_phase_unlimited", "[feed_to_finda]") {
// now let the filament be pushed into the FINDA - do 500 steps without triggering the condition // now let the filament be pushed into the FINDA - do 500 steps without triggering the condition
// and then let the simulated ADC channel 1 create a FINDA switch // and then let the simulated ADC channel 1 create a FINDA switch
hal::adc::TADCData switchFindaOn({ 600, 700, 800, 900 }); hal::adc::ReinitADC(1, hal::adc::TADCData({ 600, 700, 800, 900 }), 1);
hal::adc::ReinitADC(1, std::move(switchFindaOn), 1);
REQUIRE(WhileCondition( REQUIRE(WhileCondition(
ff, ff,
[&]() { return ff.State() == FeedToFinda::PushingFilament; }, [&]() { return ff.State() == FeedToFinda::PushingFilament; },
@ -120,8 +120,8 @@ TEST_CASE("feed_to_finda::FINDA_failed", "[feed_to_finda]") {
REQUIRE(modules::leds::leds.LedOn(modules::globals::globals.ActiveSlot(), modules::leds::Color::green)); REQUIRE(modules::leds::leds.LedOn(modules::globals::globals.ActiveSlot(), modules::leds::Color::green));
// now let the filament be pushed into the FINDA - but we make sure the FINDA doesn't trigger at all // now let the filament be pushed into the FINDA - but we make sure the FINDA doesn't trigger at all
hal::adc::TADCData switchFindaOff({ 0 }); hal::adc::ReinitADC(1, hal::adc::TADCData({ 0 }), 100);
hal::adc::ReinitADC(1, std::move(switchFindaOff), 100);
REQUIRE(!WhileCondition( REQUIRE(!WhileCondition(
ff, // boo, this formatting is UGLY! ff, // boo, this formatting is UGLY!
[&]() { return ff.State() == FeedToFinda::PushingFilament; }, [&]() { return ff.State() == FeedToFinda::PushingFilament; },