reafectored stuff and corrected shit to make everything compiling

FlippR-Driver/src/utility/GPIOInterface.cpp

@@ -19,6 +19,11 @@ namespace utility
 
 std::once_flag GPIOInterface::GPIO_LIB_INITIALIZED;
 
+GPIOInterface::GPIOInterface()
+{
+  std::call_once(GPIO_LIB_INITIALIZED, wiringPiSetup);
+}
+
 void GPIOInterface::initialize_input_pin(char address)
 {
   pinMode(address, INPUT);
@@ -39,9 +44,5 @@ void GPIOInterface::initialize_output_pin(char address)
   pinMode(address, OUTPUT);
 }
 
-GPIOInterface::GPIOInterface()
-{
-  std::call_once(GPIO_LIB_INITIALIZED, wiringPiSetup);
 }
 }
-}

FlippR-Driver/src/utility/GPIOInterface.h

@@ -23,7 +23,9 @@ namespace utility
 class GPIOInterface
 {
 public:
+  GPIOInterface();
   virtual ~GPIOInterface() {};
+
 /* todo ???? */
   static void initialize_input_pin(char address);
 
@@ -41,4 +43,4 @@ public:
 }
 
 
-#endif
+#endif

FlippR-Driver/src/utility/IOutputGPIOInterface.h

@@ -7,6 +7,8 @@
 
 #include "IOutputGPIOInterface.h"
 
+#include "output/items/IOutputItem.h"
+
 #include <memory>
 
 namespace flippR_driver
@@ -22,6 +24,9 @@ public:
   void activate_pin(int i2c_address, int pin);
   void deactivate_pin(int i2c_address, int pin);
 
+  void activate_output_item(output::items::IOutputItem *item);
+  void deactivate_output_item(output::items::IOutputItem *item);
+
   //Display gpio interface!
 };
 

FlippR-Driver/src/utility/InputGPIOInterface.cpp

@@ -20,6 +20,13 @@ namespace utility
 
 using namespace nlohmann;
 
+InputGPIOInterface::InputGPIOInterface(std::istream &input_config_stream)
+{
+  init_members(input_config_stream);
+
+  init_pins();
+}
+
 bool InputGPIOInterface::read_data(char pin)
 {
   // setting address to read
@@ -46,13 +53,6 @@ void InputGPIOInterface::write_col(char data)
   write_pin(this->col_address_C, data & 0b100);
 }
 
-InputGPIOInterface::inputGPIOInterface(std::istream &input_config_stream)
-{
-  init_members(input_config_stream);
-
-  init_pins();
-}
-
 void InputGPIOInterface::init_members(std::istream &input_config_stream)
 {
   json input_config;
@@ -96,4 +96,4 @@ void InputGPIOInterface::init_pins()
 }
 
 }
-}
+}

FlippR-Driver/src/utility/OutputGPIOInterface.h

@@ -11,6 +11,7 @@
 #include "GPIOInterface.h"
 
 #include "output/items/IOutputItem.h"
+#include "output/items/IDisplay.h"
 
 #include <mcp23017.h>
 #include <mutex>
@@ -26,10 +27,10 @@ class OutputGPIOInterface : public GPIOInterface
 public:
   virtual ~OutputGPIOInterface() = default;
 
-  void activate_output_item(output::items::OutputItem *item);
-  void deactivate_output_item(output::items::OutputItem *item);
+  void activate_output_item(output::items::IOutputItem *item);
+  void deactivate_output_item(output::items::IOutputItem *item);
 
-  void write_display(Display &display);
+  void write_display(output::items::IDisplay &display);
 
 private:
   std::mutex output_item_mutex;
@@ -39,4 +40,4 @@ private:
 }
 }
 
-#endif
+#endif

FlippR-Driver/src/utility/OutputGpioInterface.cpp

@@ -1,28 +1,31 @@
-//
-// Created by rhetenor on 21.11.18.
-//
+/*
+ * OutputGPIOInterface.h
+ *
+ *  Created on: May 31, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+#include "OutputGPIOInterface.h"
 
 namespace flippR_driver
 {
 namespace utility
 {
+using namespace output::items;
 
-  void OutputGPIOInterface::activate_output_item(output::items::OutputItem *item)
-  {
-    std::lock_guard<std::mutex> guard(output_item_mutex);
+void OutputGPIOInterface::activate_output_item(IOutputItem *item)
+{
+  std::lock_guard<std::mutex> guard(output_item_mutex);
+}
 
-  }
+void OutputGPIOInterface::deactivate_output_item(IOutputItem *item)
+{
+  std::lock_guard<std::mutex> guard(output_item_mutex);
+}
 
-  void OutputGPIOInterface::deactivate_output_item(output::items::OutputItem *item)
-  {
-    std::lock_guard<std::mutex> guard(output_item_mutex);
-
-  }
-
-  void OutputGPIOInterface::write_display(Display &display)
-  {
-
-  }
+void OutputGPIOInterface::write_display(IDisplay &display)
+{
+}
 
 }
 }