rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

readded address

Browse Source
This commit is contained in:
Jonas Zeunert
2018-11-21 00:38:21 +01:00
parent e646134b96
commit 7c15f417d5
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/src/output/items/Lamp.cpp
View File

@@ -14,9 +14,9 @@ namespace output
namespace items
{
Lamp::Lamp(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated)
Lamp::Lamp(std::shared_ptr<utility::IOutputGPIOInterface> 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)
{}

2
FlippR-Driver/src/output/items/Lamp.h
View File

@@ -21,7 +21,7 @@ namespace items
class Lamp : public OutputItem, ILamp
{
public:
Lamp(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, bool activated = false);
Lamp(std::shared_ptr<utility::IOutputGPIOInterface> 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();

4
FlippR-Driver/src/output/items/OutputItem.cpp
View File

@@ -11,8 +11,8 @@ namespace output
namespace items
{
OutputItem::OutputItem(std::shared_ptr<utility::IOutputGPIOInterface> 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<utility::IOutputGPIOInterface> 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()

4
FlippR-Driver/src/output/items/OutputItem.h
View File

@@ -25,11 +25,11 @@ namespace items
class OutputItem : public IOutputItem
{
public:
OutputItem(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin_address, std::string name);
OutputItem(std::shared_ptr<utility::IOutputGPIOInterface> 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<utility::IOutputGPIOInterface> output_gpio_interface;

4
FlippR-Driver/src/output/items/Solenoid.cpp
View File

@@ -14,9 +14,9 @@ namespace output
namespace items
{
Solenoid::Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time)
Solenoid::Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> 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)
{}

2
FlippR-Driver/src/output/items/Solenoid.h
View File

@@ -25,7 +25,7 @@ namespace items
class Solenoid : public ISolenoid, OutputItem
{
public:
Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time);
Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> 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();

4
FlippR-Driver/src/output/items/Sound.cpp
View File

@@ -16,9 +16,9 @@ namespace output
namespace items
{
Sound::Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name)
Sound::Sound(std::shared_ptr<utility::IOutputGPIOInterface> 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)
{}

2
FlippR-Driver/src/output/items/Sound.h
View File

@@ -25,7 +25,7 @@ namespace items
class Sound : public ISound, OutputItem
{
public:
Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time);
Sound(std::shared_ptr<utility::IOutputGPIOInterface> 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();