From a780eea620ba344aadbb98172fdbdc727fc3792b Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Mon, 6 May 2019 16:04:24 +0200
Subject: [PATCH] added some todos

---
 .../json_example/output/Display_Config.json    |  3 ++-
 .../json_example/output/Output_Pin_Config.json |  2 +-
 FlippR-Driver/include/output/items/Solenoid.h  |  2 +-
 .../output/detail/DriverBoardPinController.cpp |  1 +
 FlippR-Driver/src/output/detail/OutputDriver.h |  7 ++++++-
 .../tests/output/TestOutputDriver.cpp          | 18 ++++++++++++++++--
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/FlippR-Driver/contrib/json_example/output/Display_Config.json b/FlippR-Driver/contrib/json_example/output/Display_Config.json
index 3214a62..4fa52ea 100644
--- a/FlippR-Driver/contrib/json_example/output/Display_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Display_Config.json
@@ -1,10 +1,11 @@
 {
   "displays" :
   [
+  // todo add name!
     {
       "digits" : 8,
       "id" : 1,
       "address" : 1
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json b/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
index 697e403..bae61e5 100644
--- a/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
@@ -25,7 +25,7 @@
     "run" : 0
   },
   "driver_board" :
-  {
+  { // todo new layout!
     "i2c_address" : 32,
     "pin_base" : 65,
     "pin-select" :
diff --git a/FlippR-Driver/include/output/items/Solenoid.h b/FlippR-Driver/include/output/items/Solenoid.h
index 80dfda6..b603c4c 100644
--- a/FlippR-Driver/include/output/items/Solenoid.h
+++ b/FlippR-Driver/include/output/items/Solenoid.h
@@ -15,7 +15,7 @@ namespace output
 {
 namespace items
 {
-
+// todo get name? parent calss output_item?
 class Solenoid
 {
 public:
diff --git a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
index c0e7557..a64247f 100644
--- a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
+++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
@@ -45,6 +45,7 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i
   write_data(false);
 }
 
+// todo new layout without mux!
 
 void DriverBoardPinController::write_driver_board_address(uint8_t address) const
 {
diff --git a/FlippR-Driver/src/output/detail/OutputDriver.h b/FlippR-Driver/src/output/detail/OutputDriver.h
index e6c2a8e..dd95f45 100644
--- a/FlippR-Driver/src/output/detail/OutputDriver.h
+++ b/FlippR-Driver/src/output/detail/OutputDriver.h
@@ -32,10 +32,15 @@ public:
   void activate_displays() const override;
   void deactivate_displays() const override;
 
-  void deactivate_all_lamps() const override;
   void activate_all_lamps() const override;
+  void deactivate_all_lamps() const override;
   void rotate_all_lamps() const override;
 
+  void activate_flipper_relay();
+  void activate_top_flipper_relay();
+  void deactivate_flipper_relay();
+  void deactivate_top_flipper_relay();
+
   // todo driver board run for activate/deactivate?
   // todo what is flipper_relay ?
   std::vector<std::shared_ptr<items::Lamp>> get_lamps() const override;
diff --git a/FlippR-Driver/tests/output/TestOutputDriver.cpp b/FlippR-Driver/tests/output/TestOutputDriver.cpp
index dc72a5b..82aef79 100644
--- a/FlippR-Driver/tests/output/TestOutputDriver.cpp
+++ b/FlippR-Driver/tests/output/TestOutputDriver.cpp
@@ -31,8 +31,8 @@ SCENARIO("The OutputDriver should (de)activates the displays")
   GIVEN("An OutputDriver")
   {
     Mock<output::DisplayController> display_controller;
-    When(Method(display_controller, activate_displays)).AlwaysReturn();
-    When(Method(display_controller, deactivate_displays)).AlwaysReturn();
+    Fake(Method(display_controller, activate_displays));
+    Fake(Method(display_controller, deactivate_displays));
 
     std::map<std::string, std::shared_ptr<items::Solenoid>> solenoids;
     std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
@@ -61,3 +61,17 @@ SCENARIO("The OutputDriver should (de)activates the displays")
   }
 }
 
+
+SCENARIO("The OutputDriver should return a list of all items")
+{
+  GIVEN("An OutputDriver with some items")
+  {
+    Mock<output::DisplayController> display_controller;
+
+    std::map<std::string, std::shared_ptr<items::Solenoid>> solenoids;
+    std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
+    std::map<std::string, std::shared_ptr<items::Sound>> sounds;
+    std::map<uint8_t, std::shared_ptr<output::items::Display>> displays;
+  }
+
+}
\ No newline at end of file