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

Refactores item factories

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-06 14:38:21 +01:00
parent 4a520fb12a
commit 83fe8675da
22 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ namespace output
namespace items
{
class OutputDisplay : public Display
class OutputDisplay : public virtual Display
{
public:

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

@@ -21,7 +21,7 @@ namespace items
namespace detail
{
class Display : public items::OutputDisplay
class Display : public virtual items::OutputDisplay
{
public:
Display(const uint8_t & address, const uint8_t & id);

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

@@ -20,7 +20,7 @@ namespace items
namespace detail
{
class EightDigitDisplay : public items::detail::Display, public items::EightDigitDisplay
class EightDigitDisplay : public virtual items::detail::Display, public virtual items::EightDigitDisplay
{
public:
EightDigitDisplay(uint8_t address, uint8_t id) :

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

@@ -23,7 +23,7 @@ namespace detail
Flipper::Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t & address, const uint8_t & pin_base, const std::string & name) :
Item(std::move(name)), DriverBoardItem(pin_controller, address, pin_base), pin_controller(std::move(pin_controller))
{
CLOG(INFO , OUTPUT_LOGGER) << "Created flipper \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
//CLOG(INFO , OUTPUT_LOGGER) << "Created flipper \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
}
Flipper::~Flipper()
@@ -33,13 +33,13 @@ Flipper::~Flipper()
void Flipper::activate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << "activated";
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << " activated";
this->pin_controller->activate(*this);
}
void Flipper::deactivate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << "deactivated";
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << " deactivated";
this->pin_controller->deactivate(*this);
}

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

@@ -18,7 +18,7 @@ namespace items
namespace detail
{
class SevenDigitDisplay : public items::detail::Display, public items::SevenDigitDisplay
class SevenDigitDisplay : public virtual items::detail::Display, public virtual items::SevenDigitDisplay
{
public:
SevenDigitDisplay(uint8_t address, uint8_t id) :