From 0bd78685403c30c72c1c1ee17b775afa482732e9 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Fri, 7 Dec 2018 16:35:36 +0100
Subject: [PATCH] arbeit arbeit

---
 FlippR-Driver/include/DriverFactory.h          |  7 ++++++-
 FlippR-Driver/src/DriverFactory.cpp            | 11 ++++++++++-
 FlippR-Driver/src/output/OutputDriverFactory.h |  8 ++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/FlippR-Driver/include/DriverFactory.h b/FlippR-Driver/include/DriverFactory.h
index 80d188d..1ad5028 100644
--- a/FlippR-Driver/include/DriverFactory.h
+++ b/FlippR-Driver/include/DriverFactory.h
@@ -5,14 +5,19 @@
 #ifndef flippR_driver_DRIVERFACTORY_H
 #define flippR_driver_DRIVERFACTORY_H
 
-#include <fstream>
+#include <istream>
 #include <memory>
 
 #include "input/IInputDriver.h"
+#include "output/IOutputDriver.h"
 
 namespace flippR_driver
 {
   std::shared_ptr<input::IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream);
+  std::shared_ptr<output::IOutputDriver> get_OutputDriver(std::istream &output_pin_config,
+                                                          std::istream &lamp_config,
+                                                          std::istream &solenoid_config,
+                                                          std::istream &sound_config);
 }
 
 #endif //flippR_driver_DRIVERFACTORY_H
diff --git a/FlippR-Driver/src/DriverFactory.cpp b/FlippR-Driver/src/DriverFactory.cpp
index e8704b4..8b8b9c5 100644
--- a/FlippR-Driver/src/DriverFactory.cpp
+++ b/FlippR-Driver/src/DriverFactory.cpp
@@ -5,11 +5,20 @@
 #include "DriverFactory.h"
 
 #include "input/InputDriverFactory.h"
+#include "output/OutputDriverFactory.h"
 
 namespace flippR_driver
 {
   std::shared_ptr<input::IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream)
   {
-    return flippR_driver::input::InputDriverFactory::get_InputDriver(input_config_stream, matrix_config_stream);
+    return input::InputDriverFactory::get_InputDriver(input_config_stream, matrix_config_stream);
+  }
+
+  std::shared_ptr<output::IOutputDriver> get_OutputDriver(std::istream &output_pin_config,
+                                                          std::istream &lamp_config,
+                                                          std::istream &solenoid_config,
+                                                          std::istream &sound_config)
+  {
+    return output::OutputDriverFactory::get_OutputDriver(output_pin_config, lamp_config, solenoid_config, sound_config);
   }
 }
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h
index da98a15..b627ea9 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.h
+++ b/FlippR-Driver/src/output/OutputDriverFactory.h
@@ -5,18 +5,18 @@
 #ifndef flippR_driver_OUTPUTDRIVERFACTORY_H
 #define flippR_driver_OUTPUTDRIVERFACTORY_H
 
-#include <memory>
-
-#include "OutputDriver.h"
+#include <output/IOutputDriver.h>
 #include "OutputGPIOInterface.h"
 
+#include <memory>
+
 namespace flippR_driver
 {
 namespace output
 {
 namespace OutputDriverFactory
 {
-  static std::shared_ptr<OutputDriver> getOutputDriver(std::istream &output_gpio_config, std::istream &output_config);
+  static std::shared_ptr<IOutputDriver> get_OutputDriver(std::istream &output_pin_config, std::istream &solenoid_config, std::istream &lamp_config, std::istream &sound_config);
 
   namespace
   {