From 6c785845ef61d76e9ece79e2f62e67db8814284a Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 10 Oct 2018 12:14:26 +0200 Subject: [PATCH] started implementing displaycontroller --- FlippR-Driver/src/output/DisplayController.cpp | 15 +++++++++++---- FlippR-Driver/src/output/DisplayController.h | 8 +++++--- FlippR-Driver/src/utilities/LoggerFactory.cpp | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp index 5c8274a..fe26cb7 100644 --- a/FlippR-Driver/src/output/DisplayController.cpp +++ b/FlippR-Driver/src/output/DisplayController.cpp @@ -7,20 +7,27 @@ #include "DisplayController.h" +#include "utilities/config.h" + namespace FlippR_Driver { namespace output { -DisplayController::DisplayController() +DisplayController::DisplayController(std::vector> displays) + : displays(displays) { - // TODO Auto-generated constructor stub + this->display_cycle_thread = std::thread(&DisplayController::cycle_displays, this); + CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayController and started writing them."; } -DisplayController::~DisplayController() +void DisplayController::cycle_displays() { - // TODO Auto-generated destructor stub + for(auto& display : displays) + { + + } } } diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h index 8d25c1a..cc8eb5b 100644 --- a/FlippR-Driver/src/output/DisplayController.h +++ b/FlippR-Driver/src/output/DisplayController.h @@ -10,10 +10,10 @@ #include "IDisplayController.h" -#include "utilities/config.h" #include "IDisplay.h" -#include +#include +#include namespace FlippR_Driver { @@ -23,7 +23,7 @@ namespace output class DisplayController : public IDisplayController { public: - DisplayController(); + explicit DisplayController(std::vector> displays); virtual ~DisplayController(); private: @@ -31,6 +31,8 @@ private: private: std::vector> displays; + + std::thread display_cycle_thread; }; } diff --git a/FlippR-Driver/src/utilities/LoggerFactory.cpp b/FlippR-Driver/src/utilities/LoggerFactory.cpp index 319d7a4..0e9f043 100644 --- a/FlippR-Driver/src/utilities/LoggerFactory.cpp +++ b/FlippR-Driver/src/utilities/LoggerFactory.cpp @@ -40,6 +40,7 @@ el::Configurations createConfig(el::Level level) return conf; } + void CreateInputLogger(el::Level level) { el::Loggers::getLogger(INPUT_LOGGER);