From 8772c165f2c41dae3908f9526f33668d69d6d8c8 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 4 Oct 2018 23:30:07 +0200 Subject: [PATCH] working on outputs --- FlippR-Driver/src/output/Display.cpp | 26 ------------------- FlippR-Driver/src/output/DisplayController.h | 2 +- .../src/output/OutputDriverFactory.h | 4 +++ .../src/utilities/OutputGPIOInterface.h | 8 +++++- 4 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 FlippR-Driver/src/output/Display.cpp diff --git a/FlippR-Driver/src/output/Display.cpp b/FlippR-Driver/src/output/Display.cpp deleted file mode 100644 index 98c61e3..0000000 --- a/FlippR-Driver/src/output/Display.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Display.cpp - * - * Created on: Aug 2, 2018 - * Author: rhetenor - */ - -#include "Display.h" -namespace FlippR_Driver -{ -namespace output -{ - - Display::Display() - { - // TODO Auto-generated constructor stub - - } - - Display::~Display() - { - // TODO Auto-generated destructor stub - } - -} /* namespace output */ -} \ No newline at end of file diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h index d5c75f4..8d25c1a 100644 --- a/FlippR-Driver/src/output/DisplayController.h +++ b/FlippR-Driver/src/output/DisplayController.h @@ -27,7 +27,7 @@ public: virtual ~DisplayController(); private: - void cycleDisplays(); + void cycle_displays(); private: std::vector> displays; diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h index 9627738..506487d 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.h +++ b/FlippR-Driver/src/output/OutputDriverFactory.h @@ -5,6 +5,10 @@ #ifndef FLIPPR_DRIVER_OUTPUTDRIVERFACTORY_H #define FLIPPR_DRIVER_OUTPUTDRIVERFACTORY_H +#include + +#include "OutputDriver.h" + namespace FlippR_Driver { namespace output diff --git a/FlippR-Driver/src/utilities/OutputGPIOInterface.h b/FlippR-Driver/src/utilities/OutputGPIOInterface.h index 0075030..ebccb4b 100644 --- a/FlippR-Driver/src/utilities/OutputGPIOInterface.h +++ b/FlippR-Driver/src/utilities/OutputGPIOInterface.h @@ -14,8 +14,14 @@ class OutputGPIOInterface : GPIOInterface { +public: + void activate_cabinet_item(CabinetItem &item); + void write_display(Display &display); + private: - IBlockingQueue> + void +private: + IBlockingQueue event_queue; };