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

still not done with refactoring but enough for today

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 02:56:29 +01:00
parent 8e12b3f3fa
commit ff3376b9d7
12 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,8 @@ class IItem
public:
virtual ~IItem() = default;
virtual uint8_t get_address() = 0;
virtual std::string get_name() = 0;
virtual uint8_t get_address() const = 0;
virtual std::string get_name() const = 0;
};
}

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

@@ -16,12 +16,12 @@ Item::Item(uint8_t address, std::string name) :
address(address), name(std::move(name))
{}
uint8_t Item::get_address()
uint8_t Item::get_address() const
{
return this->address;
}
std::string Item::get_name()
std::string Item::get_name() const
{
return this->name;
}

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

@@ -27,8 +27,8 @@ public:
Item(uint8_t address, std::string name);
~Item() override = default;
uint8_t get_address() override;
std::string get_name() override;
uint8_t get_address() const override;
std::string get_name() const override;
protected:
const uint8_t address;

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

@@ -21,12 +21,12 @@ DriverBoardItem(std::move(pin_controller), address, std::move(name)), activated(
void Lamp::activate()
{
pin_controller->activate(this);
pin_controller->activate(*this);
}
void Lamp::deactivate()
{
pin_controller->deactivate(this);
pin_controller->deactivate(*this);
}
}

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

@@ -22,11 +22,11 @@ Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, uin
void Solenoid::triggerTask()
{
pin_controller->activate(this);
pin_controller->activate(*this);
std::this_thread::sleep_for(deactivation_time);
pin_controller->deactivate(this);
pin_controller->deactivate(*this);
}
void Solenoid::trigger()

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

@@ -27,11 +27,11 @@ void Sound::play()
void Sound::playTask()
{
pin_controller->activate(this);
pin_controller->activate(*this);
std::this_thread::sleep_for(deactivation_time);
pin_controller->deactivate(this);
pin_controller->deactivate(*this);
}
}