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

Impelements and integrates DisplayFactory. Further does some refactoring

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-06 12:42:04 +01:00
parent d90e904b4c
commit 4a520fb12a
21 changed files with 192 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ private:
public:
std::string content;
private:
protected:
const uint8_t id;
const uint8_t address;

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

@@ -24,7 +24,10 @@ class EightDigitDisplay : public items::detail::Display, public items::EightDigi
{
public:
EightDigitDisplay(uint8_t address, uint8_t id) :
detail::Display(address, id) {}
detail::Display(address, id)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created EightDigitDisplay with address " << int{this->address} << " and id: " << int{id};
}
~EightDigitDisplay() override = default;
@@ -38,7 +41,10 @@ public:
detail::Display::write_content(content, 8);
}
std::string get_name() const override
{
return "EightDigitDisplay " + this->id;
}
};

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

@@ -35,6 +35,11 @@ public:
~SevenDigitDisplay() override = default;
std::string get_name() const override
{
return "EightDigitDisplay " + this->id;
}
};
}
}

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

@@ -1,5 +1,5 @@
/*
* Solenoid.cpp
* Solenoid.cppthis->pins_display_board.end(),
*
* Created on: Aug 2, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
@@ -21,7 +21,7 @@ namespace detail
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t & address, const uint8_t & pin_base, const std::string & name, const std::chrono::milliseconds & deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(pin_controller, address, pin_base), pin_controller(pin_controller), deactivation_time(deactivation_time)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address << " and deactivation-time: " << deactivation_time.count();
//CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address << " and deactivation-time: " << deactivation_time.count();
}
void Solenoid::triggerTask()