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

working on rewrite

Browse Source
This commit is contained in:
Jonas Zeunert
2019-05-06 20:53:52 +02:00
parent c92d0736a6
commit 18b1b190be
16 changed files with 27 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@
using namespace flippR_driver::output;
items::detail::DriverBoardItem::DriverBoardItem(std::shared_ptr<OutputPinController> pin_controller, const uint8_t address) :
pin_controller(std::move(pin_controller)), address(address)
items::detail::DriverBoardItem::DriverBoardItem(const uint8_t address) :
address(address)
{}
uint8_t items::detail::DriverBoardItem::get_address() const

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

@@ -7,8 +7,6 @@
#include "output/items/DriverBoardItem.h"
#include "output/OutputPinController.h"
#include <memory>
namespace flippR_driver
{
@@ -22,7 +20,7 @@ namespace detail
class DriverBoardItem : public output::items::DriverBoardItem
{
public:
DriverBoardItem(std::shared_ptr<OutputPinController> pin_controller, const uint8_t address);
DriverBoardItem(const uint8_t address);
~DriverBoardItem() override = default;
@@ -30,8 +28,6 @@ public:
protected:
const uint8_t address;
const std::shared_ptr<OutputPinController> pin_controller;
};

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(std::move(pin_controller), address), 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;
}

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

@@ -35,6 +35,7 @@ public:
bool is_activated() override;
private:
const std::shared_ptr<DriverBoardPinController> pin_controller;
bool activated;
};

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

@@ -19,7 +19,7 @@ namespace detail
{
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(std::move(pin_controller), address), deactivation_time(deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address;
}

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

@@ -38,6 +38,7 @@ private:
virtual void triggerTask();
private:
const std::shared_ptr<DriverBoardPinController> pin_controller;
const std::chrono::milliseconds deactivation_time;
std::future<void> trigger_task;

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

@@ -21,8 +21,7 @@ namespace detail
{
Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id)
:
pin_controller(std::move(pin_controller)), detail::Item(std::move(name)), DriverBoardItem(pin_controller, address), deactivation_time(deactivation_time), id(id)
: detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time), id(id)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created sound " << id << " with name " << name << " and address " << address;
}