From 43ecba364bb231558052c3e1c979fa87e52f4d71 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 21 Nov 2018 00:28:18 +0100 Subject: [PATCH] dunno --- FlippR-Driver/src/output/items/OutputItem.cpp | 6 ++++++ FlippR-Driver/src/utility/OutputGPIOInterface.h | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/FlippR-Driver/src/output/items/OutputItem.cpp b/FlippR-Driver/src/output/items/OutputItem.cpp index c624fa4..d092a4e 100644 --- a/FlippR-Driver/src/output/items/OutputItem.cpp +++ b/FlippR-Driver/src/output/items/OutputItem.cpp @@ -2,6 +2,8 @@ // Created by rhetenor on 21.11.18. // +#include "OutputItem.h" + namespace flippR_driver { namespace output @@ -9,6 +11,10 @@ namespace output namespace items { +OutputItem::OutputItem(std::shared_ptr output_gpio_interface, int i2c_address, int data_pin_address, std::string name) + : i2c_address(i2c_address), data_pin_address(data_pin_address), name(name), output_gpio_interface(output_gpio_interface) +{} + void OutputItem::activate() { diff --git a/FlippR-Driver/src/utility/OutputGPIOInterface.h b/FlippR-Driver/src/utility/OutputGPIOInterface.h index 267a589..961bb5e 100644 --- a/FlippR-Driver/src/utility/OutputGPIOInterface.h +++ b/FlippR-Driver/src/utility/OutputGPIOInterface.h @@ -9,23 +9,27 @@ #define SRC_UTILITIES_OUTPUTGPIOINTERFACE_H_ #include "GPIOInterface.h" + +#include "output/items/IOutputItem.h" + #include +#include namespace flippR_driver { namespace utility { -class OutputGPIOInterface : GPIOInterface +class OutputGPIOInterface : public GPIOInterface { public: - void activate_cabinet_item(CabinetItem &item); + void activate_output_item(output::items::OutputItem &item); + void deactivate_output_item(output::items::OutputItem &item); + void write_display(Display &display); private: - void -private: - IBlockingQueue event_queue; + std::mutex output_item_mutex; }; }