merged
This commit is contained in:
@@ -5,10 +5,9 @@
|
||||
#ifndef FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
|
||||
#define FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
|
||||
|
||||
#include <map>
|
||||
|
||||
#include "output/DisplayBoardPinController.h"
|
||||
|
||||
#include <map>
|
||||
|
||||
namespace flippR_driver
|
||||
{
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "output/detail/DisplayController.h"
|
||||
|
||||
#include "output/DisplayController.h"
|
||||
|
||||
#include "utility/config.h"
|
||||
|
||||
namespace flippR_driver
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <thread>
|
||||
|
||||
#include "output/DisplayController.h"
|
||||
|
||||
#include "output/items/OutputDisplay.h"
|
||||
#include "output/DisplayBoardPinController.h"
|
||||
|
||||
|
||||
@@ -14,8 +14,7 @@ namespace detail
|
||||
{
|
||||
|
||||
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
|
||||
const uint8_t &fire_address
|
||||
) :
|
||||
const uint8_t &fire_address) :
|
||||
output_item_mutex(std::move(output_item_mutex)),
|
||||
fire_address(fire_address)
|
||||
{
|
||||
@@ -62,6 +61,9 @@ void SoundBoardPinController::fire_sound() const
|
||||
void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const
|
||||
{
|
||||
// PinController::write_pin(pins_sound.at("pin_base") + pin, value);
|
||||
// PinController::write_pin(pins_sound.at("fire"), true);
|
||||
//
|
||||
// PinController::write_pin(pins_sound.at("fire"), false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user