From e646134b96c5581df658ef1d31152311ada9fa1c Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 21 Nov 2018 00:35:12 +0100 Subject: [PATCH] bla --- FlippR-Driver/src/output/items/Lamp.cpp | 2 +- FlippR-Driver/src/output/items/Lamp.h | 2 +- FlippR-Driver/src/output/items/OutputItem.cpp | 2 +- FlippR-Driver/src/output/items/OutputItem.h | 8 ++++---- 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 | 2 +- FlippR-Driver/src/utility/GPIOInterface.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FlippR-Driver/src/output/items/Lamp.cpp b/FlippR-Driver/src/output/items/Lamp.cpp index c157682..dd48fde 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, int i2c_address, int data_pin, std::string name, bool activated) +Lamp::Lamp(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated) : OutputItem(output_gpio_interface, 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 3dbaced..fa9fa00 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, int i2c_address, int data_pin, std::string name, bool activated = false); + Lamp(std::shared_ptr output_gpio_interface, 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 d092a4e..3cb3568 100644 --- a/FlippR-Driver/src/output/items/OutputItem.cpp +++ b/FlippR-Driver/src/output/items/OutputItem.cpp @@ -11,7 +11,7 @@ namespace output namespace items { -OutputItem::OutputItem(std::shared_ptr output_gpio_interface, int i2c_address, int data_pin_address, std::string name) +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) {} diff --git a/FlippR-Driver/src/output/items/OutputItem.h b/FlippR-Driver/src/output/items/OutputItem.h index 0686ddb..32495be 100644 --- a/FlippR-Driver/src/output/items/OutputItem.h +++ b/FlippR-Driver/src/output/items/OutputItem.h @@ -25,14 +25,14 @@ namespace items class OutputItem : public IOutputItem { public: - OutputItem(std::shared_ptr output_gpio_interface, int i2c_address, int data_pin_address, std::string name); + OutputItem(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin_address, std::string name); virtual ~OutputItem(); protected: - int i2c_address, data_pin_address; - std::string name; + const unsigned int i2c_address, data_pin_address; + const std::string name; - std::shared_ptr output_gpio_interface; + const std::shared_ptr output_gpio_interface; protected: void activate(); diff --git a/FlippR-Driver/src/output/items/Solenoid.cpp b/FlippR-Driver/src/output/items/Solenoid.cpp index 54f27cb..d686b9d 100644 --- a/FlippR-Driver/src/output/items/Solenoid.cpp +++ b/FlippR-Driver/src/output/items/Solenoid.cpp @@ -14,7 +14,7 @@ namespace output namespace items { -Solenoid::Solenoid(std::shared_ptr output_gpio_interface, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time) +Solenoid::Solenoid(std::shared_ptr output_gpio_interface, 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), deactivation_time(deactivation_time) diff --git a/FlippR-Driver/src/output/items/Solenoid.h b/FlippR-Driver/src/output/items/Solenoid.h index 95b85a3..322e1c1 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, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time); + Solenoid(std::shared_ptr output_gpio_interface, 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 da21146..ed1ac81 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, int i2c_address, int data_pin, std::string name) +Sound::Sound(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name) : OutputItem(output_gpio_interface, 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 1fb2441..583a6c2 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, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time); + Sound(std::shared_ptr output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time); virtual ~Sound() = default; virtual void play(); diff --git a/FlippR-Driver/src/utility/GPIOInterface.h b/FlippR-Driver/src/utility/GPIOInterface.h index 3822fdd..bc029bb 100644 --- a/FlippR-Driver/src/utility/GPIOInterface.h +++ b/FlippR-Driver/src/utility/GPIOInterface.h @@ -27,7 +27,7 @@ public: virtual ~GPIOInterface() {}; - +/* todo ???? */ static void initialize_input_pin(char address); static void initialize_output_pin(char address);