From 7c15f417d518b185c048f691714daa71a0f44701 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 21 Nov 2018 00:38:21 +0100 Subject: [PATCH] readded address --- FlippR-Driver/src/output/items/Lamp.cpp | 4 ++-- FlippR-Driver/src/output/items/Lamp.h | 2 +- FlippR-Driver/src/output/items/OutputItem.cpp | 4 ++-- FlippR-Driver/src/output/items/OutputItem.h | 4 ++-- FlippR-Driver/src/output/items/Solenoid.cpp | 4 ++-- FlippR-Driver/src/output/items/Solenoid.h | 2 +- FlippR-Driver/src/output/items/Sound.cpp | 4 ++-- FlippR-Driver/src/output/items/Sound.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/FlippR-Driver/src/output/items/Lamp.cpp b/FlippR-Driver/src/output/items/Lamp.cpp index dd48fde..71d41e0 100644 --- a/FlippR-Driver/src/output/items/Lamp.cpp +++ b/FlippR-Driver/src/output/items/Lamp.cpp @@ -14,9 +14,9 @@ namespace output namespace items { -Lamp::Lamp(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated) +Lamp::Lamp(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int address, unsigned int data_pin, std::string name, bool activated) : -OutputItem(output_gpio_interface, i2c_address, data_pin, name), +OutputItem(output_gpio_interface, address, i2c_address, data_pin, name), activated(activated) {} diff --git a/FlippR-Driver/src/output/items/Lamp.h b/FlippR-Driver/src/output/items/Lamp.h index fa9fa00..58ff2d2 100644 --- a/FlippR-Driver/src/output/items/Lamp.h +++ b/FlippR-Driver/src/output/items/Lamp.h @@ -21,7 +21,7 @@ namespace items class Lamp : public OutputItem, ILamp { public: - Lamp(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated = false); + Lamp(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated = false); virtual ~Lamp() = default; void activate(); diff --git a/FlippR-Driver/src/output/items/OutputItem.cpp b/FlippR-Driver/src/output/items/OutputItem.cpp index 3cb3568..e8aa639 100644 --- a/FlippR-Driver/src/output/items/OutputItem.cpp +++ b/FlippR-Driver/src/output/items/OutputItem.cpp @@ -11,8 +11,8 @@ namespace output namespace items { -OutputItem::OutputItem(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned 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) +OutputItem::OutputItem(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin_address, std::string name) + : address(address), 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/output/items/OutputItem.h b/FlippR-Driver/src/output/items/OutputItem.h index 32495be..e14b8c9 100644 --- a/FlippR-Driver/src/output/items/OutputItem.h +++ b/FlippR-Driver/src/output/items/OutputItem.h @@ -25,11 +25,11 @@ namespace items class OutputItem : public IOutputItem { public: - OutputItem(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin_address, std::string name); + OutputItem(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin_address, std::string name); virtual ~OutputItem(); protected: - const unsigned int i2c_address, data_pin_address; + const unsigned int address, i2c_address, data_pin_address; const std::string name; const std::shared_ptr output_gpio_interface; diff --git a/FlippR-Driver/src/output/items/Solenoid.cpp b/FlippR-Driver/src/output/items/Solenoid.cpp index d686b9d..7883885 100644 --- a/FlippR-Driver/src/output/items/Solenoid.cpp +++ b/FlippR-Driver/src/output/items/Solenoid.cpp @@ -14,9 +14,9 @@ namespace output namespace items { -Solenoid::Solenoid(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time) +Solenoid::Solenoid(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time) : -OutputItem(output_gpio_interface, i2c_address, data_pin, name), +OutputItem(output_gpio_interface, address, i2c_address, data_pin, name), deactivation_time(deactivation_time) {} diff --git a/FlippR-Driver/src/output/items/Solenoid.h b/FlippR-Driver/src/output/items/Solenoid.h index 322e1c1..02ce3b0 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 ISolenoid, OutputItem { public: - Solenoid(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time); + Solenoid(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, 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 ed1ac81..b45b96a 100644 --- a/FlippR-Driver/src/output/items/Sound.cpp +++ b/FlippR-Driver/src/output/items/Sound.cpp @@ -16,9 +16,9 @@ namespace output namespace items { -Sound::Sound(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name) +Sound::Sound(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, std::string name) : -OutputItem(output_gpio_interface, i2c_address, data_pin, name), +OutputItem(output_gpio_interface, address, i2c_address, data_pin, name), deactivation_time(deactivation_time) {} diff --git a/FlippR-Driver/src/output/items/Sound.h b/FlippR-Driver/src/output/items/Sound.h index 583a6c2..5336ed7 100644 --- a/FlippR-Driver/src/output/items/Sound.h +++ b/FlippR-Driver/src/output/items/Sound.h @@ -25,7 +25,7 @@ namespace items class Sound : public ISound, OutputItem { public: - Sound(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time); + Sound(std::shared_ptr output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time); virtual ~Sound() = default; virtual void play();