From ea75d6f2482dab60117a3e40cda49d24148f052b Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Wed, 15 Jan 2020 17:57:24 +0100
Subject: [PATCH 1/2] lamp items have no extender anymore

---
 FlippR-Driver/src/output/factories/LampFactory.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/FlippR-Driver/src/output/factories/LampFactory.cpp b/FlippR-Driver/src/output/factories/LampFactory.cpp
index 3acabd9..a86bf43 100644
--- a/FlippR-Driver/src/output/factories/LampFactory.cpp
+++ b/FlippR-Driver/src/output/factories/LampFactory.cpp
@@ -38,10 +38,8 @@ std::map<std::string, std::shared_ptr<items::Lamp>> LampFactory::getItemMap()
   {
     auto name = lamp.at(config_path::item_name).get<std::string>();
     auto address = lamp.at(config_path::item_address).get<uint8_t >();
-    auto extender = lamp.at(config_path::item_extender).get<std::string>();
-    auto pin_base = this->get_extender_pin_base(extender);
 
-    auto lamp_item = std::make_shared<items::detail::Lamp>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address + pin_base, name);
+    auto lamp_item = std::make_shared<items::detail::Lamp>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address, name);
     lamp_map.emplace(name, lamp_item);
   }
   return lamp_map;

From f25a98a3d39ed592465b751cdb6fcd23dc44592c Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Wed, 15 Jan 2020 18:04:13 +0100
Subject: [PATCH 2/2] no extenders for items

---
 FlippR-Driver/src/output/factories/FlipperFactory.cpp  | 4 +---
 FlippR-Driver/src/output/factories/LampFactory.cpp     | 4 ++--
 FlippR-Driver/src/output/factories/SolenoidFactory.cpp | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/FlippR-Driver/src/output/factories/FlipperFactory.cpp b/FlippR-Driver/src/output/factories/FlipperFactory.cpp
index 3d5e15a..c737db3 100644
--- a/FlippR-Driver/src/output/factories/FlipperFactory.cpp
+++ b/FlippR-Driver/src/output/factories/FlipperFactory.cpp
@@ -26,10 +26,8 @@ std::map<std::string, std::shared_ptr<items::Flipper>> FlipperFactory::getItemMa
   {
     auto name = flipper.at(config_path::item_name).get<std::string>();
     auto address = flipper.at(config_path::item_address).get<uint8_t >();
-    auto extender = flipper.at(config_path::item_extender).get<std::string>();
-    auto pin_base = this->get_extender_pin_base(extender);
 
-    auto flipper_item = std::make_shared<items::detail::Flipper>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address + pin_base, name);
+    auto flipper_item = std::make_shared<items::detail::Flipper>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address, name);
     flipper_map.emplace(name, flipper_item);
   }
   return flipper_map;
diff --git a/FlippR-Driver/src/output/factories/LampFactory.cpp b/FlippR-Driver/src/output/factories/LampFactory.cpp
index a86bf43..34c76bd 100644
--- a/FlippR-Driver/src/output/factories/LampFactory.cpp
+++ b/FlippR-Driver/src/output/factories/LampFactory.cpp
@@ -19,7 +19,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptr<DriverBoardPinC
   ItemFactory{object, pin_controller}
 {
   this->set_address_pins();
-/*  this->set_mux_pins();
+  this->set_mux_pins();
 
   auto controller = std::dynamic_pointer_cast<detail::DriverBoardPinController>(this->pin_controller);
 
@@ -27,7 +27,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptr<DriverBoardPinC
   controller->set_data_pin(data_pin);
 
   auto run_pin = this->get_address_pin(this->object.at(config_path::run_pin));
-  controller->set_run_pin(run_pin);*/
+  controller->set_run_pin(run_pin);
 }
 
 std::map<std::string, std::shared_ptr<items::Lamp>> LampFactory::getItemMap()
diff --git a/FlippR-Driver/src/output/factories/SolenoidFactory.cpp b/FlippR-Driver/src/output/factories/SolenoidFactory.cpp
index 88aca6f..f27c3e1 100644
--- a/FlippR-Driver/src/output/factories/SolenoidFactory.cpp
+++ b/FlippR-Driver/src/output/factories/SolenoidFactory.cpp
@@ -31,8 +31,6 @@ std::map<std::string, std::shared_ptr<items::Solenoid>> SolenoidFactory::getItem
   {
     auto name = solenoid.at(config_path::item_name).get<std::string>();
     auto address = solenoid.at(config_path::item_address).get<uint8_t >();
-    auto extender = solenoid.at(config_path::item_extender).get<std::string>();
-    auto pin_base = this->get_extender_pin_base(extender);
     std::chrono::milliseconds deactivation_time_chrono{this->deactivation_time};
 
     if (solenoid.find(config_path::deactivation_time) != solenoid.end())
@@ -40,7 +38,7 @@ std::map<std::string, std::shared_ptr<items::Solenoid>> SolenoidFactory::getItem
       deactivation_time_chrono = std::chrono::milliseconds{solenoid.at(config_path::deactivation_time).get<uint8_t>()};
     }
 
-    auto solenoid_item = std::make_shared<items::detail::Solenoid>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address + pin_base, name, deactivation_time_chrono);
+    auto solenoid_item = std::make_shared<items::detail::Solenoid>(std::static_pointer_cast<DriverBoardPinController>(this->pin_controller), address, name, deactivation_time_chrono);
     solenoid_map.emplace(name, solenoid_item);
   }
   return solenoid_map;