From 8583294e0d151bef26f8e60279b24afc2bb1c6db Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Fri, 9 Nov 2018 02:00:01 +0100 Subject: [PATCH] =?UTF-8?q?bis=20n=C3=A4chste=20woche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlippR-Driver/src/output/ActivateStrategy.cpp | 31 ----------------- FlippR-Driver/src/output/ActivateStrategy.h | 33 ------------------- FlippR-Driver/src/output/ActivationStrategy.h | 29 ---------------- .../src/output/DeactivateStrategy.cpp | 31 ----------------- FlippR-Driver/src/output/DeactivateStrategy.h | 32 ------------------ FlippR-Driver/src/output/Lamp.cpp | 10 ++++++ FlippR-Driver/src/output/Lamp.h | 7 ++++ FlippR-Driver/src/output/OutputItem.h | 8 +---- FlippR-Driver/src/output/Solenoid.cpp | 9 ++++- FlippR-Driver/src/output/Solenoid.h | 3 ++ FlippR-Driver/src/output/Sound.cpp | 2 ++ FlippR-Driver/src/output/TriggerStrategy.cpp | 31 ----------------- FlippR-Driver/src/output/TriggerStrategy.h | 33 ------------------- .../src/utility/IOutputGPIOInterface.h | 6 ++-- 14 files changed, 35 insertions(+), 230 deletions(-) delete mode 100644 FlippR-Driver/src/output/ActivateStrategy.cpp delete mode 100644 FlippR-Driver/src/output/ActivateStrategy.h delete mode 100644 FlippR-Driver/src/output/ActivationStrategy.h delete mode 100644 FlippR-Driver/src/output/DeactivateStrategy.cpp delete mode 100644 FlippR-Driver/src/output/DeactivateStrategy.h delete mode 100644 FlippR-Driver/src/output/TriggerStrategy.cpp delete mode 100644 FlippR-Driver/src/output/TriggerStrategy.h diff --git a/FlippR-Driver/src/output/ActivateStrategy.cpp b/FlippR-Driver/src/output/ActivateStrategy.cpp deleted file mode 100644 index 13843fe..0000000 --- a/FlippR-Driver/src/output/ActivateStrategy.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * ActivateStrategy.cpp - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#include "ActivateStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ -ActivateStrategy::ActivateStrategy() -{ - // TODO Auto-generated constructor stub - -} - -ActivateStrategy::~ActivateStrategy() -{ - // TODO Auto-generated destructor stub -} - -} -} -} - - diff --git a/FlippR-Driver/src/output/ActivateStrategy.h b/FlippR-Driver/src/output/ActivateStrategy.h deleted file mode 100644 index e15a2d3..0000000 --- a/FlippR-Driver/src/output/ActivateStrategy.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * ActivateStrategy.h - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#ifndef SRC_OUTPUT_ACTIVATESTRATEGY_H_ -#define SRC_OUTPUT_ACTIVATESTRATEGY_H_ - -#include "ActivationStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ - -class ActivateStrategy : public ActivationStrategy -{ -public: - ActivateStrategy(); - virtual ~ActivateStrategy(); - - virtual void operator()(); -}; - -} -} -} - -#endif /* SRC_OUTPUT_ACTIVATESTRATEGY_H_ */ diff --git a/FlippR-Driver/src/output/ActivationStrategy.h b/FlippR-Driver/src/output/ActivationStrategy.h deleted file mode 100644 index 04c1f97..0000000 --- a/FlippR-Driver/src/output/ActivationStrategy.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * ActivationStrategy.h - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#ifndef SRC_OUTPUT_ACTIVATIONSTRATEGY_H_ -#define SRC_OUTPUT_ACTIVATIONSTRATEGY_H_ - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ -class ActivationStrategy -{ -public: - virtual ~ActivationStrategy(){} - - virtual void operator()() = 0; -}; - -} -} -} - -#endif /* SRC_OUTPUT_ACTIVATIONSTRATEGY_H_ */ diff --git a/FlippR-Driver/src/output/DeactivateStrategy.cpp b/FlippR-Driver/src/output/DeactivateStrategy.cpp deleted file mode 100644 index a5331e5..0000000 --- a/FlippR-Driver/src/output/DeactivateStrategy.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * DeactivateStrategy.cpp - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#include "DeactivateStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ -DeactivateStrategy::DeactivateStrategy() -{ - // TODO Auto-generated constructor stub - -} - -DeactivateStrategy::~DeactivateStrategy() -{ - // TODO Auto-generated destructor stub -} - -} -} -} - - diff --git a/FlippR-Driver/src/output/DeactivateStrategy.h b/FlippR-Driver/src/output/DeactivateStrategy.h deleted file mode 100644 index ed299b6..0000000 --- a/FlippR-Driver/src/output/DeactivateStrategy.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * DeactivateStrategy.h - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#ifndef SRC_OUTPUT_DEACTIVATESTRATEGY_H_ -#define SRC_OUTPUT_DEACTIVATESTRATEGY_H_ - -#include "ActivationStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ -class DeactivateStrategy : public ActivationStrategy -{ -public: - DeactivateStrategy(); - virtual ~DeactivateStrategy(); - - virtual void operator()(); -}; - -} -} -} - -#endif /* SRC_OUTPUT_DEACTIVATESTRATEGY_H_ */ diff --git a/FlippR-Driver/src/output/Lamp.cpp b/FlippR-Driver/src/output/Lamp.cpp index 48685d9..4c5d99a 100644 --- a/FlippR-Driver/src/output/Lamp.cpp +++ b/FlippR-Driver/src/output/Lamp.cpp @@ -24,5 +24,15 @@ Lamp::~Lamp() // TODO Auto-generated destructor stub } +void Lamp::activate() +{ +// activate +} + +void Lamp::deactivate() +{ +// deactivate +} + } /* namespace output */ } diff --git a/FlippR-Driver/src/output/Lamp.h b/FlippR-Driver/src/output/Lamp.h index 57e1b7a..b5f043f 100644 --- a/FlippR-Driver/src/output/Lamp.h +++ b/FlippR-Driver/src/output/Lamp.h @@ -20,6 +20,13 @@ class Lamp : public OutputItem public: Lamp(std::shared_ptr output_gpio_interface, int address, std::string name); virtual ~Lamp(); + + void activate(); + void deactivate(); + bool is_activated(); + +private: + bool activated; }; } /* namespace output */ diff --git a/FlippR-Driver/src/output/OutputItem.h b/FlippR-Driver/src/output/OutputItem.h index 76b4b08..228cf7b 100644 --- a/FlippR-Driver/src/output/OutputItem.h +++ b/FlippR-Driver/src/output/OutputItem.h @@ -27,16 +27,10 @@ public: OutputItem(std::shared_ptr output_gpio_interface, int address, std::string name); virtual ~OutputItem(); - virtual bool isActivated(); - virtual bool activate(); - virtual bool deactivate(); - protected: - int address; + int address, i2c_address, data_pin_address; std::string name; - bool activated; - strategy::ActivationStrategy* strategy; std::shared_ptr output_gpio_interface; diff --git a/FlippR-Driver/src/output/Solenoid.cpp b/FlippR-Driver/src/output/Solenoid.cpp index 2192bcc..a0f1c57 100644 --- a/FlippR-Driver/src/output/Solenoid.cpp +++ b/FlippR-Driver/src/output/Solenoid.cpp @@ -18,10 +18,17 @@ Solenoid::Solenoid(std::shared_ptr output_gpio_in } -Solenoid::~Solenoid() +Solenoid::~Solenoid() { // TODO Auto-generated destructor stub } +void Solenoid::trigger() +{ +// activate +// wait +// deactivate +} + } /* namespace output */ } diff --git a/FlippR-Driver/src/output/Solenoid.h b/FlippR-Driver/src/output/Solenoid.h index 01c8fd9..c3a25a6 100644 --- a/FlippR-Driver/src/output/Solenoid.h +++ b/FlippR-Driver/src/output/Solenoid.h @@ -20,6 +20,9 @@ class Solenoid : public OutputItem public: Solenoid(std::shared_ptr output_gpio_interface, int address, std::string name); virtual ~Solenoid(); + + //muss task sein + void trigger(); }; } /* namespace output */ diff --git a/FlippR-Driver/src/output/Sound.cpp b/FlippR-Driver/src/output/Sound.cpp index d34ffe5..7f28239 100644 --- a/FlippR-Driver/src/output/Sound.cpp +++ b/FlippR-Driver/src/output/Sound.cpp @@ -19,6 +19,8 @@ Sound::Sound(std::shared_ptr output_gpio_interfac void Sound::play() { // this->output_gpio_interface->activate(this); +// wait +// deactivate() } } /* namespace output */ diff --git a/FlippR-Driver/src/output/TriggerStrategy.cpp b/FlippR-Driver/src/output/TriggerStrategy.cpp deleted file mode 100644 index fe8aeb2..0000000 --- a/FlippR-Driver/src/output/TriggerStrategy.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * TriggerStrategy.cpp - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#include "TriggerStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ - -TriggerStrategy::TriggerStrategy() -{ - // TODO Auto-generated constructor stub - -} - -TriggerStrategy::~TriggerStrategy() -{ - // TODO Auto-generated destructor stub -} - -} -} -} - diff --git a/FlippR-Driver/src/output/TriggerStrategy.h b/FlippR-Driver/src/output/TriggerStrategy.h deleted file mode 100644 index 0cf7e93..0000000 --- a/FlippR-Driver/src/output/TriggerStrategy.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * TriggerStrategy.h - * - * Created on: Nov 8, 2018 - * Author: johannes - */ - -#ifndef SRC_OUTPUT_TRIGGERSTRATEGY_H_ -#define SRC_OUTPUT_TRIGGERSTRATEGY_H_ - -#include "ActivationStrategy.h" - -namespace flippR_driver -{ -namespace output -{ -namespace strategy -{ - -class TriggerStrategy : public ActivationStrategy -{ -public: - TriggerStrategy(); - virtual ~TriggerStrategy(); - - virtual void operator()(); -}; - -} -} -} - -#endif /* SRC_OUTPUT_TRIGGERSTRATEGY_H_ */ diff --git a/FlippR-Driver/src/utility/IOutputGPIOInterface.h b/FlippR-Driver/src/utility/IOutputGPIOInterface.h index 449efd8..f262cc9 100644 --- a/FlippR-Driver/src/utility/IOutputGPIOInterface.h +++ b/FlippR-Driver/src/utility/IOutputGPIOInterface.h @@ -18,8 +18,10 @@ namespace utility class IOutputGPIOInterface { public: - void activate(int address, std::shared_ptr output_gpio_interface); - void deactivate(int address,std::shared_ptr output_gpio_interface); + //muss alles geschützt sein + void set_address(int i2c_address, int address); + void activate_pin(int i2c_address, int pin); + void deactivate_pin(int i2c_address, int pin); }; }