fuuuuuuuu

This commit is contained in:
Johannes Wendel
2019-07-16 22:12:46 +02:00
parent 25a937cc2d
commit 5fe28d46d9
48 changed files with 625 additions and 726 deletions

View File

@@ -2,7 +2,7 @@
// Created by rhetenor on 14.12.18.
//
#include "SoundBoardPinController.h"
#include "output/detail/SoundBoardPinController.h"
#include "utility/config.h"
@@ -13,17 +13,13 @@ namespace output
namespace detail
{
SoundBoardPinController::SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex) :
pins_sound(std::move(pins_sound)), output_item_mutex(std::move(output_item_mutex))
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
const uint8_t &fire_address
) :
output_item_mutex(std::move(output_item_mutex)),
fire_address(fire_address)
{
uint8_t i2c_address = pins_sound.at("i2c_address");
uint8_t pin_base = pins_sound.at("pin_base");
initialize_i2c_address(i2c_address, pin_base);
initialize_pins_output(pin_base, pins_sound.begin(), pins_sound.end());
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController with i2c_address 0x" << std::hex << i2c_address << " and pin_base " << std::dec << pin_base;
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController";
}
void SoundBoardPinController::activate(const items::detail::Sound &sound)
@@ -45,27 +41,27 @@ void SoundBoardPinController::deactivate(const items::detail::Sound &sound)
}
void SoundBoardPinController::write_sound_address(uint8_t address) const
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(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);
}
void SoundBoardPinController::fire_sound() const
{
PinController::write_pin(pins_sound.at("fire"), true);
PinController::write_pin(pins_sound.at("fire"), false);
// PinController::write_pin(pins_sound.at("fire"), true);
//
// PinController::write_pin(pins_sound.at("fire"), false);
}
void SoundBoardPinController::write_pin(uint8_t pin, bool value) 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("pin_base") + pin, value);
}
}