merging

FlippR-Driver/src/utility/OutputGPIOInterface.h

@@ -9,6 +9,9 @@
 #define SRC_UTILITIES_OUTPUTGPIOINTERFACE_H_
 
 #include "GPIOInterface.h"
+
+#include "output/Event.h"
+
 #include <mcp23017.h>
 
 namespace FlippR_Driver
@@ -19,13 +22,22 @@ class OutputGPIOInterface : GPIOInterface
 {
 
 public:
-  void activate_cabinet_item(CabinetItem &item);
+  OutputGPIOInterface();
+
+  ~OutputGPIOInterface() = default;
+
+  void queue_output_item(shared_ptr<OutputItem> item);
   void write_display(Display &display);
 
 private:
-  void
+  void cycle_output_items();
+
+  void activate_sounds(OutputItem &item);
+  void activate_cabinet_item(OutputItem &item);
+
+
 private:
-  IBlockingQueue <CabinetItem> event_queue;
+  IBlockingQueue <output::Event> event_queue;
 
 };
 }

FlippR-Driver/src/utility/config.h

@@ -12,8 +12,6 @@
 
 #define LOGGER_FILE "driver.log"
 
-
-
 #define DRIVER_CONF_FILE "/var/log/flippr_driver.conf"
 
 #define HIGHEST_LOG_VERBOSITY 10