From f03fe500db99b44312b69094757b17612afc2f66 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Tue, 4 Dec 2018 17:58:23 +0100 Subject: [PATCH] nearly compiling --- FlippR-Driver/src/input/Detector.cpp | 2 +- FlippR-Driver/src/input/Detector.h | 4 ++-- FlippR-Driver/src/output/DisplayController.cpp | 2 +- FlippR-Driver/src/output/DisplayController.h | 4 ++-- FlippR-Driver/src/output/items/Item.cpp | 2 +- FlippR-Driver/src/output/items/Item.h | 4 ++-- FlippR-Driver/src/output/items/Lamp.cpp | 2 +- FlippR-Driver/src/output/items/Lamp.h | 2 +- FlippR-Driver/src/output/items/Solenoid.cpp | 2 +- FlippR-Driver/src/output/items/Solenoid.h | 2 +- FlippR-Driver/src/output/items/Sound.cpp | 2 +- FlippR-Driver/src/output/items/Sound.h | 3 ++- 12 files changed, 16 insertions(+), 15 deletions(-) diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp index d782da9..c9e7f2d 100644 --- a/FlippR-Driver/src/input/Detector.cpp +++ b/FlippR-Driver/src/input/Detector.cpp @@ -17,7 +17,7 @@ namespace flippR_driver namespace input { -Detector::Detector(std::unique_ptr input_gpio_interface, std::vector> events) : +Detector::Detector(std::unique_ptr input_gpio_interface, std::vector> events) : input_gpio_interface(std::move(input_gpio_interface)), events(events), is_running(true) { this->detect_thread = std::thread(&Detector::detect, this); diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h index 1282427..7f69985 100644 --- a/FlippR-Driver/src/input/Detector.h +++ b/FlippR-Driver/src/input/Detector.h @@ -34,7 +34,7 @@ class Detector : public IDetector { public: - Detector(std::unique_ptr input_gpio_interface, std::vector> events); + Detector(std::unique_ptr input_gpio_interface, std::vector> events); ~Detector(); private: @@ -42,7 +42,7 @@ private: void check_inputs(); private: - std::unique_ptr input_gpio_interface; + std::unique_ptr input_gpio_interface; std::vector> events; diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp index 6973cf0..a41c0da 100644 --- a/FlippR-Driver/src/output/DisplayController.cpp +++ b/FlippR-Driver/src/output/DisplayController.cpp @@ -15,7 +15,7 @@ namespace flippR_driver namespace output { -DisplayController::DisplayController(std::vector> displays, std::shared_ptr output_gpio_interface) +DisplayController::DisplayController(std::vector> displays, std::shared_ptr output_gpio_interface) : displays(displays), output_gpio_interface(output_gpio_interface), is_running(true) { this->display_cycle_thread = std::thread(&DisplayController::cycle_displays, this); diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h index fa4d510..f403272 100644 --- a/FlippR-Driver/src/output/DisplayController.h +++ b/FlippR-Driver/src/output/DisplayController.h @@ -24,7 +24,7 @@ namespace output class DisplayController : public IDisplayController { public: - explicit DisplayController(std::vector> displays, std::shared_ptr output_gpio_interface); + explicit DisplayController(std::vector> displays, std::shared_ptr output_gpio_interface); ~DisplayController(); private: @@ -35,7 +35,7 @@ private: std::thread display_cycle_thread; - std::shared_ptr output_gpio_interface; + std::shared_ptr output_gpio_interface; bool is_running; }; diff --git a/FlippR-Driver/src/output/items/Item.cpp b/FlippR-Driver/src/output/items/Item.cpp index d979089..2aa6c72 100644 --- a/FlippR-Driver/src/output/items/Item.cpp +++ b/FlippR-Driver/src/output/items/Item.cpp @@ -11,7 +11,7 @@ namespace output namespace items { -Item::Item(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) : +Item::Item(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) : address(address), name(name), gpio_interface(output_gpio_interface) diff --git a/FlippR-Driver/src/output/items/Item.h b/FlippR-Driver/src/output/items/Item.h index 2ed1b04..5455ebe 100644 --- a/FlippR-Driver/src/output/items/Item.h +++ b/FlippR-Driver/src/output/items/Item.h @@ -25,7 +25,7 @@ namespace items class Item : public IItem { public: - Item(std::shared_ptr output_gpio_interface, uint8_t address, std::string name); + Item(std::shared_ptr output_gpio_interface, uint8_t address, std::string name); virtual ~Item(); uint8_t get_address() override; @@ -34,7 +34,7 @@ protected: const uint8_t address; const std::string name; - const std::shared_ptr gpio_interface; + const std::shared_ptr gpio_interface; }; diff --git a/FlippR-Driver/src/output/items/Lamp.cpp b/FlippR-Driver/src/output/items/Lamp.cpp index a91bd51..1ef6aec 100644 --- a/FlippR-Driver/src/output/items/Lamp.cpp +++ b/FlippR-Driver/src/output/items/Lamp.cpp @@ -14,7 +14,7 @@ namespace output namespace items { -Lamp::Lamp(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) +Lamp::Lamp(std::shared_ptr output_gpio_interface, uint8_t address, std::string name) : Item(output_gpio_interface, address, name), activated(false) diff --git a/FlippR-Driver/src/output/items/Lamp.h b/FlippR-Driver/src/output/items/Lamp.h index cbd5a5d..973d5fa 100644 --- a/FlippR-Driver/src/output/items/Lamp.h +++ b/FlippR-Driver/src/output/items/Lamp.h @@ -22,7 +22,7 @@ namespace items class Lamp : public Item, ILamp, IDriverBoardItem { public: - Lamp(std::shared_ptr output_gpio_interface, uint8_t address, std::string name); + Lamp(std::shared_ptr output_gpio_interface, uint8_t address, std::string name); virtual ~Lamp() = default; void activate(); diff --git a/FlippR-Driver/src/output/items/Solenoid.cpp b/FlippR-Driver/src/output/items/Solenoid.cpp index 220f055..6e793f4 100644 --- a/FlippR-Driver/src/output/items/Solenoid.cpp +++ b/FlippR-Driver/src/output/items/Solenoid.cpp @@ -16,7 +16,7 @@ namespace output namespace items { -Solenoid::Solenoid(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time): +Solenoid::Solenoid(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time): Item(output_gpio_interface, address, name), deactivation_time(deactivation_time) {} diff --git a/FlippR-Driver/src/output/items/Solenoid.h b/FlippR-Driver/src/output/items/Solenoid.h index e796d6e..4edb078 100644 --- a/FlippR-Driver/src/output/items/Solenoid.h +++ b/FlippR-Driver/src/output/items/Solenoid.h @@ -25,7 +25,7 @@ namespace items class Solenoid : public Item, ISolenoid, IDriverBoardItem { public: - Solenoid(std::shared_ptr output_gpio_interface, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time); + Solenoid(std::shared_ptr output_gpio_interface, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time); virtual ~Solenoid() = default; void trigger(); diff --git a/FlippR-Driver/src/output/items/Sound.cpp b/FlippR-Driver/src/output/items/Sound.cpp index e6a1eb2..0c7b933 100644 --- a/FlippR-Driver/src/output/items/Sound.cpp +++ b/FlippR-Driver/src/output/items/Sound.cpp @@ -16,7 +16,7 @@ namespace output namespace items { -Sound::Sound(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id) : +Sound::Sound(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id) : Item(output_gpio_interface, address, name), deactivation_time(deactivation_time), id(id) diff --git a/FlippR-Driver/src/output/items/Sound.h b/FlippR-Driver/src/output/items/Sound.h index bf9c5d5..aa40465 100644 --- a/FlippR-Driver/src/output/items/Sound.h +++ b/FlippR-Driver/src/output/items/Sound.h @@ -31,7 +31,7 @@ public: u_int id; public: - Sound(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id); + Sound(std::shared_ptr output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id); virtual ~Sound() = default; virtual void play(); @@ -40,6 +40,7 @@ private: std::chrono::milliseconds deactivation_time; std::future play_task; + private: virtual void playTask(); };