completed factory

FlippR-Driver/src/output/DisplayController.h

@@ -7,6 +7,7 @@
 
 #ifndef _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
 #define _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
+
 namespace flippR_driver
 {
 namespace output

FlippR-Driver/src/output/OutputDriverFactory.cpp

@@ -18,7 +18,6 @@
 #include "output/items/detail/EightDigitDisplay.h"
 #include "output/items/detail/SevenDigitDisplay.h"
 
-
 namespace flippR_driver
 {
 namespace output
@@ -53,12 +52,11 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream &output_pin_config,
   std::unique_ptr<DisplayBoardPinController> display_board_pin_controller(new detail::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
   auto displays = create_displays(display_config);
 
-  // todo
+  std::unique_ptr<DisplayController> display_controller(new detail::DisplayController(displays, std::move(display_board_pin_controller)));
-  std::vector<std::shared_ptr<items::OutputDisplay>> displays_vec;
-  boost::copy(displays | boost::adaptors::map_values, std::back_inserter(displays_vec));
-  std::unique_ptr<DisplayController> display_controller(new detail::DisplayController(displays_vec, std::move(display_board_pin_controller)));
 
-  return std::make_shared<detail::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, displays);
+  auto display_map = map_displays(displays);
+
+  return std::make_shared<detail::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, display_map);
 }
 
 std::map<std::string, uint8_t> parse_pins_driver_board(json &driver_board_config)
@@ -256,9 +254,9 @@ std::shared_ptr<items::detail::Sound> create_sound(nlohmann::json &sound_json, s
   }
 }
 
-std::map<uint8_t, std::shared_ptr<items::OutputDisplay>> create_displays(std::istream &display_config)
+std::vector<std::shared_ptr<items::OutputDisplay>> create_displays(std::istream &display_config)
 {
-  std::map<uint8_t, std::shared_ptr<items::OutputDisplay>> displays;
+  std::vector<std::shared_ptr<items::OutputDisplay>> displays;
 
   json display_config_json;
   display_config >> display_config_json;
@@ -267,6 +265,7 @@ std::map<uint8_t, std::shared_ptr<items::OutputDisplay>> create_displays(std::is
   for(json &display_json : displays_json)
   {
     auto display = create_display(display_json);
+    displays.push_back(display);
   }
 
   return displays;
@@ -300,6 +299,18 @@ std::shared_ptr<items::OutputDisplay> create_display(nlohmann::json &display_jso
   }
 }
 
+std::map<uint8_t, std::shared_ptr<items::Display>> map_displays(const std::vector<std::shared_ptr<items::OutputDisplay>> &displays)
+{
+  std::map<uint8_t, std::shared_ptr<items::Display>> display_map;
+
+  for(auto &display : displays)
+  {
+    display_map.emplace(display->get_address(), display);
+  }
+
+  return display_map;
+}
+
 }
 }
 }

FlippR-Driver/src/output/OutputDriverFactory.h

@@ -36,7 +36,8 @@ namespace OutputDriverFactory
 
     std::chrono::milliseconds get_deactivation_time(nlohmann::json &json);
 
-    std::map<uint8_t, std::shared_ptr<items::OutputDisplay>> create_displays(std::istream &display_config);
+    std::vector<std::shared_ptr<items::OutputDisplay>> create_displays(std::istream &display_config);
+    std::map<uint8_t, std::shared_ptr<items::Display>> map_displays(const std::vector<std::shared_ptr<items::OutputDisplay>> &displays);
     std::shared_ptr<items::OutputDisplay> create_display(nlohmann::json &display_json);
 
     std::map<std::string, uint8_t> parse_pins_driver_board(nlohmann::json &driver_board_config);

FlippR-Driver/src/output/detail/OutputDriver.cpp

@@ -19,7 +19,7 @@ namespace detail
 
 using namespace items;
 
-OutputDriver::OutputDriver(std::unique_ptr<output::DisplayController> display_controller, std::map<std::string, std::shared_ptr<Solenoid>> solenoids, std::map<std::string, std::shared_ptr<Lamp>> lamps, std::map<std::string, std::shared_ptr<Sound>> sounds, std::map<uint8_t, std::shared_ptr<Display>> displays)
+OutputDriver::OutputDriver(std::unique_ptr<output::DisplayController> display_controller, std::map<std::string, std::shared_ptr<Solenoid>> solenoids, std::map<std::string, std::shared_ptr<Lamp>> lamps, std::map<std::string, std::shared_ptr<Sound>> sounds, std::map<uint8_t, std::shared_ptr<items::Display>> displays)
 : display_controller(std::move(display_controller)), solenoids(std::move(solenoids)), lamps(std::move(lamps)), sounds(std::move(sounds)), displays(std::move(displays))
 {}
 

FlippR-Driver/src/output/detail/OutputDriver.h

@@ -23,7 +23,7 @@ namespace detail
 class OutputDriver : public output::OutputDriver
 {
 public:
-  OutputDriver(std::unique_ptr<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<items::Display>> displays);
+  OutputDriver(std::unique_ptr<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);
 
   ~OutputDriver() override = default;
 

FlippR-Driver/src/output/items/OutputDisplay.h

@@ -19,7 +19,7 @@ namespace output
 namespace items
 {
 
-class OutputDisplay : Display
+class OutputDisplay : public Display
 {
 
 public: