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

refactor outputdriverfactory

Browse Source
This commit is contained in:
Jonas Zeunert
2019-12-25 13:27:52 +01:00
parent 175a3c890a
commit 59b3590a06
5 changed files with 69 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,9 +14,12 @@ namespace detail
{
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
const uint8_t &fire_address) :
uint8_t pin_base,
uint8_t this->fire_address,
const std::vector<uint8_t> this->address_pins) :
output_item_mutex(output_item_mutex),
fire_address(fire_address)
this->fire_address(this->fire_address),
this->address_pins(this->address_pins)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController";
}
@@ -42,28 +45,28 @@ void SoundBoardPinController::deactivate(const items::detail::Sound &sound)
void SoundBoardPinController::write_sound_address(const uint8_t &address) const
{
// write_pin(pins_sound.at("A"), address & 0b0000001u);
// write_pin(pins_sound.at("B"), address & 0b0000010u);
// write_pin(pins_sound.at("C"), address & 0b0000100u);
// write_pin(pins_sound.at("D"), address & 0b0001000u);
// write_pin(pins_sound.at("E"), address & 0b0010000u);
// write_pin(pins_sound.at("F"), address & 0b0100000u);
// write_pin(pins_sound.at("G"), address & 0b1000000u);
write_pin(this->address_pins[0], address & 0b0000001u);
write_pin(this->address_pins[1], address & 0b0000010u);
write_pin(this->address_pins[2], address & 0b0000100u);
write_pin(this->address_pins[3], address & 0b0001000u);
write_pin(this->address_pins[4], address & 0b0010000u);
write_pin(this->address_pins[5], address & 0b0100000u);
write_pin(this->address_pins[6], address & 0b1000000u);
}
void SoundBoardPinController::fire_sound() const
{
// PinController::write_pin(pins_sound.at("fire"), true);
//
// PinController::write_pin(pins_sound.at("fire"), false);
PinController::write_pin(this->fire_address, true);
PinController::write_pin(this->fire_address, false);
}
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);
PinController::write_pin(this->pin_base + pin, value);
PinController::write_pin(this->fire_address, true);
PinController::write_pin(this->fire_address, false);
}
}