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

deleted pin base from controller sound

Browse Source
This commit is contained in:
Jonas Zeunert
2019-12-27 21:26:17 +01:00
parent 2cf88d755e
commit 89e622381a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,11 +14,9 @@ namespace detail
{ {
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex, SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
uint8_t pin_base,
uint8_t fire_address, uint8_t fire_address,
const std::vector<uint8_t> address_pins) : const std::vector<uint8_t> address_pins) :
output_item_mutex(output_item_mutex), output_item_mutex(output_item_mutex),
pin_base(pin_base),
fire_address(fire_address), fire_address(fire_address),
address_pins(address_pins) address_pins(address_pins)
{ {
@@ -64,7 +62,7 @@ void SoundBoardPinController::fire_sound() const
void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const
{ {
PinController::write_pin(this->pin_base + pin, value); PinController::write_pin(pin, value);
PinController::write_pin(this->fire_address, true); PinController::write_pin(this->fire_address, true);
PinController::write_pin(this->fire_address, false); PinController::write_pin(this->fire_address, false);

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

@@ -19,7 +19,7 @@ namespace detail
class SoundBoardPinController : public output::SoundBoardPinController class SoundBoardPinController : public output::SoundBoardPinController
{ {
public: public:
SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex, uint8_t pin_base, uint8_t fire_address, const std::vector<uint8_t> address_pins); SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex, uint8_t fire_address, const std::vector<uint8_t> address_pins);
~SoundBoardPinController() override = default; ~SoundBoardPinController() override = default;
void activate(const items::detail::Sound &sound); void activate(const items::detail::Sound &sound);