From b16d9aa70a88078c08bd9f25a1af0ef8fd202019 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 27 Dec 2019 21:20:42 +0100 Subject: [PATCH] working on factory no motivation --- FlippR-Driver/src/output/OutputDriverFactory.cpp | 8 +++++++- .../src/output/detail/SoundBoardPinController.cpp | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index 0fec373..a59afec 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -186,7 +186,7 @@ uint8_t get_sound_fire_address() auto pin_base = get_pin_base(fire_pin, port_extenders, "sound_config.json"); auto address = get_value("address", fire_pin, "sound_config.json"); - return pin_base + address; + return address; } std::map parse_pins_display_board(std::istream &display_config) @@ -330,6 +330,12 @@ type get_value(const std::string & name, json & object, const std::string & file return element; } +std::shared_ptr create_SoundBoardPinController() +{ + + return std::shared_ptr(); +} + } } } \ No newline at end of file diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp index 07bb0e6..7151a17 100644 --- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp @@ -18,8 +18,9 @@ SoundBoardPinController::SoundBoardPinController(std::shared_ptr out uint8_t fire_address, const std::vector address_pins) : output_item_mutex(output_item_mutex), - fire_address(this->fire_address), - address_pins(this->address_pins) + pin_base(pin_base), + fire_address(fire_address), + address_pins(address_pins) { CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController"; }