From 22522c253ff1ce267445835819d1270efb605ae8 Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Thu, 21 Oct 2021 08:46:45 +0200
Subject: [PATCH] Update code after rebase onto main

---
 src/logic/cut_filament.cpp                                  | 2 +-
 tests/unit/logic/eject_filament/test_eject_filament.cpp     | 2 +-
 tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp | 2 +-
 tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp       | 4 ++--
 tests/unit/logic/helpers/helpers.ipp                        | 2 +-
 tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp   | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/logic/cut_filament.cpp b/src/logic/cut_filament.cpp
index b6b5664..f1c4e3c 100644
--- a/src/logic/cut_filament.cpp
+++ b/src/logic/cut_filament.cpp
@@ -49,7 +49,7 @@ bool CutFilament::StepInner() {
         break;
     case ProgressCode::SelectingFilamentSlot:
         if (mi::idler.Engaged() && ms::selector.Slot() == cutSlot) { // idler and selector finished their moves
-            mg::globals.SetActiveSlot(cutSlot);
+            mg::globals.SetFilamentLoaded(cutSlot, mg::FilamentLoadState::AtPulley);
             feed.Reset(true);
             state = ProgressCode::FeedingToFinda;
         }
diff --git a/tests/unit/logic/eject_filament/test_eject_filament.cpp b/tests/unit/logic/eject_filament/test_eject_filament.cpp
index 7499453..52c8e29 100644
--- a/tests/unit/logic/eject_filament/test_eject_filament.cpp
+++ b/tests/unit/logic/eject_filament/test_eject_filament.cpp
@@ -26,7 +26,7 @@ TEST_CASE("eject_filament::eject0", "[eject_filament][.]") {
     using namespace logic;
 
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     EjectFilament ef;
     // restart the automaton
diff --git a/tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp b/tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp
index 2fc0097..0d24e30 100644
--- a/tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp
+++ b/tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp
@@ -25,7 +25,7 @@ TEST_CASE("feed_to_bondtech::feed_phase_unlimited", "[feed_to_bondtech]") {
     using namespace logic;
 
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     FeedToBondtech fb;
     main_loop();
diff --git a/tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp b/tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp
index aeb2b87..e6355f6 100644
--- a/tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp
+++ b/tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp
@@ -25,7 +25,7 @@ TEST_CASE("feed_to_finda::feed_phase_unlimited", "[feed_to_finda]") {
     using namespace logic;
 
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     FeedToFinda ff;
     main_loop();
@@ -93,7 +93,7 @@ TEST_CASE("feed_to_finda::FINDA_failed", "[feed_to_finda]") {
     using namespace logic;
 
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     FeedToFinda ff;
     main_loop();
diff --git a/tests/unit/logic/helpers/helpers.ipp b/tests/unit/logic/helpers/helpers.ipp
index d45b61d..9b5189b 100644
--- a/tests/unit/logic/helpers/helpers.ipp
+++ b/tests/unit/logic/helpers/helpers.ipp
@@ -118,7 +118,7 @@ bool VerifyState2(SM &uf, mg::FilamentLoadState fls, uint8_t idlerSlotIndex, uin
 template<typename SM>
 void InvalidSlot(SM &logicSM,  uint8_t activeSlot, uint8_t invSlot){
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(5);
+    EnsureActiveSlotIndex(5, mg::FilamentLoadState::AtPulley);
 
     REQUIRE(VerifyEnvironmentState(mg::FilamentLoadState::AtPulley, mi::Idler::IdleSlotIndex(), ms::Selector::IdleSlotIndex(), false, false, ml::off, ml::off));
 
diff --git a/tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp b/tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp
index bba9e35..2bf0998 100644
--- a/tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp
+++ b/tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp
@@ -23,7 +23,7 @@ namespace ha = hal::adc;
 
 TEST_CASE("unload_to_finda::regular_unload", "[unload_to_finda]") {
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     // we need finda ON
     SetFINDAStateAndDebounce(true);
@@ -63,7 +63,7 @@ TEST_CASE("unload_to_finda::regular_unload", "[unload_to_finda]") {
 
 TEST_CASE("unload_to_finda::no_sense_FINDA_upon_start", "[unload_to_finda]") {
     ForceReinitAllAutomata(); // that implies FINDA OFF which should really not happen for an unload call
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     logic::UnloadToFinda ff;
 
@@ -77,7 +77,7 @@ TEST_CASE("unload_to_finda::no_sense_FINDA_upon_start", "[unload_to_finda]") {
 
 TEST_CASE("unload_to_finda::unload_without_FINDA_trigger", "[unload_to_finda]") {
     ForceReinitAllAutomata();
-    EnsureActiveSlotIndex(0);
+    EnsureActiveSlotIndex(0, mg::FilamentLoadState::AtPulley);
 
     // we need finda ON
     SetFINDAStateAndDebounce(true);