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

hmmm dunno if this is better

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-11 12:30:27 +01:00
parent 3103fb77c7
commit 20774b5b1f
16 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
FlippR-Driver/src/output/IOutputGPIOInterface.h
View File

@@ -7,9 +7,10 @@
#include "IOutputGPIOInterface.h"
#include "output/items/IItem.h"
#include "output/items/ISoundItem.h"
#include "output/items/DriverBoardItem.h"
#include "output/items/SoundItem.h"
#include "output/items/IDisplay.h"
#include <memory>
namespace flippR_driver
@@ -22,11 +23,11 @@ class IOutputGPIOInterface
public:
virtual ~IOutputGPIOInterface() = default;
virtual void activate(items::IItem *driver_board_item) = 0;
virtual void activate(items::ISoundItem *sound) = 0;
virtual void activate(items::DriverBoardItem *driver_board_item) = 0;
virtual void activate(items::SoundItem *sound) = 0;
virtual void deactivate(items::IItem *driver_board_item) = 0;
virtual void deactivate(items::ISoundItem *sound) = 0;
virtual void deactivate(items::DriverBoardItem *driver_board_item) = 0;
virtual void deactivate(items::SoundItem *sound) = 0;
virtual void write_display(std::shared_ptr<output::items::IDisplay> display) = 0;
//Display gpio interface!

2
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -5,7 +5,7 @@
#include "OutputDriverFactory.h"
#include "OutputDriver.h"
#include "OutputGPIOInterface.h"
namespace flippR_driver
{

3
FlippR-Driver/src/output/OutputDriverFactory.h
View File

@@ -9,8 +9,9 @@
#include "output/items/Solenoid.h"
#include "output/items/Lamp.h"
#include "output/items/Sound.h"
#include "OutputGPIOInterface.h"
#include "IOutputGPIOInterface.h"
#include "json/json.hpp"
#include <memory>
namespace flippR_driver

9
FlippR-Driver/src/output/OutputGPIOInterface.cpp
View File

@@ -12,7 +12,6 @@ namespace flippR_driver
namespace output
{
using namespace output::items;
using namespace nlohmann;
OutputGPIOInterface::OutputGPIOInterface(std::map<std::string, uint8_t> pins_driver_board, std::map<std::string, uint8_t> pins_sound, std::map<std::string, uint8_t> pins_display)
: pins_driver_board(std::move(pins_driver_board)), pins_sound(std::move(pins_sound)), pins_display(std::move(pins_display))
@@ -45,7 +44,7 @@ void OutputGPIOInterface::initialize_i2c_addresses()
mcp23017Setup(pins_display.at("pin_base"), pins_display.at("i2c_address"));
}
void OutputGPIOInterface::activate(output::items::ISoundItem *sound)
void OutputGPIOInterface::activate(items::SoundItem *sound)
{
std::lock_guard<std::mutex> guard(output_item_mutex);
@@ -54,7 +53,7 @@ void OutputGPIOInterface::activate(output::items::ISoundItem *sound)
fire_sound(true);
}
void OutputGPIOInterface::activate(output::items::IItem *driver_board_item)
void OutputGPIOInterface::activate(items::DriverBoardItem *driver_board_item)
{
std::lock_guard<std::mutex> guard(output_item_mutex);
@@ -63,7 +62,7 @@ void OutputGPIOInterface::activate(output::items::IItem *driver_board_item)
write_data(true);
}
void OutputGPIOInterface::deactivate(output::items::IItem *driver_board_item)
void OutputGPIOInterface::deactivate(items::DriverBoardItem *driver_board_item)
{
std::lock_guard<std::mutex> guard(output_item_mutex);
@@ -72,7 +71,7 @@ void OutputGPIOInterface::deactivate(output::items::IItem *driver_board_item)
write_data(false);
}
void OutputGPIOInterface::deactivate(output::items::ISoundItem *sound)
void OutputGPIOInterface::deactivate(items::SoundItem *sound)
{
std::lock_guard<std::mutex> guard(output_item_mutex);

9
FlippR-Driver/src/output/OutputGPIOInterface.h
View File

@@ -13,7 +13,6 @@
#include "output/items/IItem.h"
#include "json/json.hpp"
#include <mcp23017.h>
#include <mutex>
@@ -32,11 +31,11 @@ public:
~OutputGPIOInterface() override = default;
void activate(items::IItem *driver_board_item) override;
void activate(items::ISoundItem *sound) override;
void activate(items::DriverBoardItem *driver_board_item) override;
void activate(items::SoundItem *sound) override;
void deactivate(items::IItem *driver_board_item) override;
void deactivate(items::ISoundItem *sound) override;
void deactivate(items::DriverBoardItem *driver_board_item) override;
void deactivate(items::SoundItem *sound) override;
void write_display(std::shared_ptr<output::items::IDisplay> display) override;

10
FlippR-Driver/src/output/items/IDriverBoardItem.h → FlippR-Driver/src/output/items/DriverBoardItem.h
View File

@@ -5,7 +5,7 @@
#ifndef FLIPPR_DRIVER_IDRIVERBOARDITEM_H
#define FLIPPR_DRIVER_IDRIVERBOARDITEM_H
#include "output/items/IItem.h"
#include "output/items/Item.h"
#include <cstdint>
@@ -16,10 +16,14 @@ namespace output
namespace items
{
class IDriverBoardItem : public IItem
class DriverBoardItem : public Item
{
public:
~IDriverBoardItem() override = default;
DriverBoardItem(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name) :
Item(output_gpio_interface, address, name) {}
~DriverBoardItem() override = default;
};
}

26
FlippR-Driver/src/output/items/ISoundItem.h
View File

@@ -1,26 +0,0 @@
//
// Created by rhetenor on 23.11.18.
//
#ifndef FLIPPR_DRIVER_ISOUNDITEM_H
#define FLIPPR_DRIVER_ISOUNDITEM_H
#include "IItem.h"
namespace flippR_driver
{
namespace output
{
namespace items
{
class ISoundItem : public IItem
{
public:
~ISoundItem() override = default;
};
}
}
}
#endif //FLIPPR_DRIVER_ISOUNDITEM_H

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

@@ -4,6 +4,7 @@
#include "Item.h"
namespace flippR_driver
{
namespace output

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

@@ -10,8 +10,6 @@
#include "output/items/IItem.h"
#include "output/IOutputGPIOInterface.h"
#include <memory>
#include <string>
@@ -19,6 +17,9 @@ namespace flippR_driver
{
namespace output
{
class IOutputGPIOInterface;
namespace items
{

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

@@ -7,6 +7,7 @@
#include "Lamp.h"
#include "output/IOutputGPIOInterface.h"
namespace flippR_driver
{
namespace output
@@ -14,10 +15,8 @@ namespace output
namespace items
{
Lamp::Lamp(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name)
:
Item(std::move(output_gpio_interface), address, std::move(name)),
activated(false)
Lamp::Lamp(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name) :
DriverBoardItem(std::move(output_gpio_interface), address, std::move(name)), activated(false)
{}
void Lamp::activate()

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

@@ -8,8 +8,8 @@
#ifndef _SRC_OUTPUT_LAMP_H_
#define _SRC_OUTPUT_LAMP_H_
#include "Item.h"
#include "output/items/ILamp.h"
#include "DriverBoardItem.h"
namespace flippR_driver
{
@@ -18,7 +18,7 @@ namespace output
namespace items
{
class Lamp : public Item, public ILamp
class Lamp : public DriverBoardItem, public ILamp
{
public:
Lamp(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name);

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

@@ -7,6 +7,8 @@
#include "Solenoid.h"
#include "output/IOutputGPIOInterface.h"
namespace flippR_driver
{
namespace output
@@ -15,8 +17,7 @@ namespace items
{
Solenoid::Solenoid(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time):
Item(std::move(output_gpio_interface), address, std::move(name)),
deactivation_time(deactivation_time)
DriverBoardItem(std::move(output_gpio_interface), address, std::move(name)), deactivation_time(deactivation_time)
{}
void Solenoid::triggerTask()

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

@@ -9,7 +9,7 @@
#define _SRC_OUTPUT_SOLENOID_H_
#include "output/items/ISolenoid.h"
#include "Item.h"
#include "DriverBoardItem.h"
#include <future>
#include <chrono>
@@ -21,7 +21,7 @@ namespace output
namespace items
{
class Solenoid : public Item, public ISolenoid
class Solenoid : public DriverBoardItem, public ISolenoid
{
public:
Solenoid(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time);

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

@@ -7,6 +7,8 @@
#include "Sound.h"
#include "output/IOutputGPIOInterface.h"
namespace flippR_driver
{
namespace output
@@ -15,9 +17,7 @@ namespace items
{
Sound::Sound(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id) :
Item(std::move(output_gpio_interface), address, std::move(name)),
deactivation_time(deactivation_time),
id(id)
SoundItem(std::move(output_gpio_interface), address, std::move(name)), deactivation_time(deactivation_time), id(id)
{}
void Sound::play()

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

@@ -9,16 +9,13 @@
#define _SRC_OUTPUT_SOUND_H_
#include "output/items/ISound.h"
#include "output/items/ISoundItem.h"
#include "Item.h"
#include "output/items/SoundItem.h"
#include <memory>
#include <string>
#include <chrono>
#include <future>
namespace flippR_driver
{
namespace output
@@ -26,7 +23,7 @@ namespace output
namespace items
{
class Sound : public ISound, public Item, public ISoundItem
class Sound : public SoundItem, public ISound
{
public:
u_int id;
@@ -35,9 +32,6 @@ public:
Sound(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id);
~Sound() override = default;
std::string get_name() override;
uint8_t get_address() override;
void play() override;
private:

29
FlippR-Driver/src/output/items/SoundItem.h Normal file
View File

@@ -0,0 +1,29 @@
//
// Created by rhetenor on 23.11.18.
//
#ifndef FLIPPR_DRIVER_ISOUNDITEM_H
#define FLIPPR_DRIVER_ISOUNDITEM_H
#include "Item.h"
namespace flippR_driver
{
namespace output
{
namespace items
{
class SoundItem : public Item
{
public:
SoundItem(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name) :
Item(output_gpio_interface, address, name) {}
~SoundItem() override = default;
};
}
}
}
#endif //FLIPPR_DRIVER_ISOUNDITEM_H