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

still great refactor

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 01:58:05 +01:00
parent 2aee0f4f9d
commit 67edde9078
22 changed files with 243 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FlippR-Driver/src/output/impl/SoundBoardPinController.h
View File

@@ -5,11 +5,11 @@
#ifndef FLIPPR_DRIVER_SOUNDBOARDPINCONTROLLER_H
#define FLIPPR_DRIVER_SOUNDBOARDPINCONTROLLER_H
#include <map>
#include "output/SoundBoardPinController.h"
#include "PinController.h"
#include "OutputPinController.h"
#include <map>
namespace flippR_driver
{
namespace output
@@ -17,10 +17,10 @@ namespace output
namespace impl
{
class SoundBoardPinController : public PinController, public output::SoundBoardPinController
class SoundBoardPinController : public OutputPinController, public output::SoundBoardPinController
{
public:
SoundBoardPinController();
SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex);
~SoundBoardPinController() override = default;
void activate(const items::Sound &sound) override;
@@ -31,7 +31,7 @@ private:
void fire_sound(bool fire);
void write_pin(uint8_t pin, bool value);
private:
std::shared_ptr<std::mutex> output_item_mutex;