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

nearly compiling

Browse Source
This commit is contained in:
Jonas Zeunert
2019-05-06 21:41:05 +02:00
parent 8b67be312a
commit 2e7a60c0de
9 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ namespace detail
class DriverBoardItem : public output::items::DriverBoardItem
{
public:
DriverBoardItem(const uint8_t address);
DriverBoardItem(uint8_t address);
~DriverBoardItem() override = default;

2
FlippR-Driver/src/output/items/detail/Flipper.cpp
View File

@@ -21,7 +21,7 @@ namespace detail
{
Flipper::Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :
DriverBoardItem(pin_controller, address, name)
Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller))
{
CLOG(INFO, OUTPUT_LOGGER) << "Created Flipper relay " << this->name << " with address " << this->address;
}

5
FlippR-Driver/src/output/items/detail/Flipper.h
View File

@@ -9,7 +9,7 @@
#define _SRC_FLIPPR_CODE_FLIPPER_H
#include "output/items/Flipper.h"
#include "output/items/DriverBoardItem.h"
#include "output/items/detail/DriverBoardItem.h"
namespace flippR_driver
{
@@ -20,7 +20,7 @@ namespace items
namespace detail
{
class Flipper : public detail::Item, public items::Flipper, public DriverBoardItem
class Flipper : public detail::Item, public items::Flipper, public detail::DriverBoardItem
{
public:
Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name);
@@ -31,6 +31,7 @@ public:
bool is_activated() override;
private:
const std::shared_ptr<DriverBoardPinController> pin_controller;
bool activated;
};

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

@@ -13,15 +13,10 @@ namespace items
namespace detail
{
Item::Item(uint8_t address, std::string name) :
address(address), name(std::move(name))
Item::Item(std::string name) :
name(std::move(name))
{}
uint8_t Item::get_address() const
{
return this->address;
}
std::string Item::get_name() const
{
return this->name;

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

@@ -20,7 +20,7 @@ namespace detail
{
Lamp::Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :
detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller), activated(false)
detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), activated(false)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created lamp " << name << " with address " << address;
}