merged

FlippR-Driver/cli/PrintHandler.h

@@ -6,8 +6,8 @@
 #define flippR_driver_PRINTHANDLER_H
 
 #include <memory>
-#include "EventHandler.h"
-#include "IInputDriver.h"
+#include "input/EventHandler.h"
+#include "input/IInputDriver.h"
 
 class PrintHandler : public flippR_driver::input::EventHandler
 {

FlippR-Driver/cli/main.cpp

@@ -7,7 +7,7 @@
 #include <signal.h>
 
 #include "DriverFactory.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 #include "PrintHandler.h"
 

FlippR-Driver/include/DriverFactory.h

@@ -8,7 +8,7 @@
 #include <fstream>
 #include <memory>
 
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 namespace flippR_driver
 {

FlippR-Driver/include/input/EventHandler.h

@@ -15,7 +15,7 @@
 #include "IInputDriver.h"
 
 #include "IEventHandler.h"
-#include "Event.h"
+#include "input/Event.h"
 
 namespace flippR_driver
 {

FlippR-Driver/include/input/IEventHandler.h

@@ -8,7 +8,7 @@
 #ifndef SRC_IEVENTHANDLER_H_
 #define SRC_IEVENTHANDLER_H_
 
-#include "Event.h"
+#include "input/Event.h"
 
 class IEventHandler
 {

FlippR-Driver/include/input/IInputDriver.h

@@ -8,7 +8,7 @@
 #ifndef SRC_INPUT_IINPUTDRIVER_H_
 #define SRC_INPUT_IINPUTDRIVER_H_
 
-#include "IEventHandler.h"
+#include "input/IEventHandler.h"
 #include <memory>
 
 namespace flippR_driver

FlippR-Driver/include/output/IEightDigitDisplay.h

@@ -7,12 +7,18 @@
 
 #include <array>
 
+namespace flippr_driver
+{
+namespace output
+{
+
 class IEightDigitDisplay
 {
 public:
   virtual void write_score(int score);
   virtual void write_content(std::array<char, 8> content);
-
 };
 
+}
+}
 #endif //FLIPPR_DRIVER_IEIGHTDIGITDISPLAY_H

FlippR-Driver/include/output/IOutputDisplay.h

@@ -0,0 +1,31 @@
+/*
+ * IOutputDisplay.h
+ *
+ *  Created on: Nov 20, 2018
+ *      Author: johannes
+ */
+
+#ifndef SRC_OUTPUT_IOUTPUTDISPLAY_H_
+#define SRC_OUTPUT_IOUTPUTDISPLAY_H_
+
+namespace flippR_driver
+{
+namespace output
+{
+
+class IDisplay
+{
+
+public:
+  IDisplay();
+  virtual ~IDisplay();
+
+  virtual void write_score(int score) = 0;
+  virtual void write_content(std::array<char, DigitCount> content) = 0;
+};
+
+}
+}
+
+
+#endif /* SRC_OUTPUT_IOUTPUTDISPLAY_H_ */

FlippR-Driver/include/output/ISevenDigitDisplay.h

@@ -7,10 +7,18 @@
 
 #include <array>
 
+namespace flippr_driver
+{
+namespace output
+{
+
 class ISevenDigitDisplay
 {
 public:
   virtual void write_score(int score);
   virtual void write_content(std::array<char, 7> content);
 };
+
+}
+}
 #endif //FLIPPR_DRIVER_ISEVENDIGITDISPLAY_H

FlippR-Driver/src/input/DistributingEvent.h

@@ -5,7 +5,7 @@
 #ifndef flippR_driver_DISTRIBUTINGEVENT_H
 #define flippR_driver_DISTRIBUTINGEVENT_H
 
-#include "Event.h"
+#include "input/Event.h"
 #include "IEventNotifier.h"
 
 namespace flippR_driver

FlippR-Driver/src/input/ErrorEvent.hpp

@@ -8,7 +8,7 @@
 #ifndef SRC_INPUT_ERROREVENT_HPP_
 #define SRC_INPUT_ERROREVENT_HPP_
 
-#include "Event.h"
+#include "input/Event.h"
 
 namespace flippR_driver {
 namespace input {

FlippR-Driver/src/input/Event.cpp

@@ -4,7 +4,7 @@
  *  Created on: Jun 15, 2018
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
-#include "Event.h"
+#include "input/Event.h"
 
 #include "utility/config.h"
 

FlippR-Driver/src/input/EventHandler.cpp

@@ -4,7 +4,7 @@
  *  Created on: Jun 14, 2018
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
-#include "EventHandler.h"
+#include "input/EventHandler.h"
 #include "utility/config.h"
 
 namespace flippR_driver

FlippR-Driver/src/input/EventNotifier.h

@@ -16,8 +16,8 @@
 
 #include "utility/BlockingQueue.hpp"
 #include "utility/IBlockingQueue.h"
-#include "Event.h"
-#include "EventHandler.h"
+#include "input/Event.h"
+#include "input/EventHandler.h"
 
 #define HANDLER_TIMEOUT 2000
 

FlippR-Driver/src/input/IEventNotifier.h

@@ -8,8 +8,8 @@
 #ifndef SRC_INPUT_IEVENTNOTIFIER_H_
 #define SRC_INPUT_IEVENTNOTIFIER_H_
 
-#include "Event.h"
-#include "IEventHandler.h"
+#include "input/Event.h"
+#include "input/IEventHandler.h"
 #include <memory>
 
 namespace flippR_driver

FlippR-Driver/src/input/InputDriver.h

@@ -10,7 +10,7 @@
 #include <map>
 
 #include "IEventNotifier.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 #include "IDetector.h"
 
 namespace flippR_driver

FlippR-Driver/src/input/InputDriverFactory.h

@@ -12,7 +12,7 @@
 #include <atomic>
 
 #include "Detector.h"
-#include "IInputDriver.h"
+#include "input/IInputDriver.h"
 
 #include "utility/InputGPIOInterface.h"
 #include "json/json.hpp"