From 95b1ac85b876478976f854d7d191f3605fbb79d6 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 14 Dec 2018 17:11:53 +0100 Subject: [PATCH] schluss --- FlippR-Driver/src/output/OutputDriverFactory.cpp | 4 ++-- FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp | 1 + FlippR-Driver/src/output/detail/DriverBoardPinController.cpp | 2 +- FlippR-Driver/src/output/detail/SoundBoardPinController.cpp | 1 + FlippR-Driver/src/utility/LoggerFactory.cpp | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index 2414d31..e991f2a 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -65,7 +65,7 @@ std::map parse_pins_driver_board(json &driver_board_config try { - pins_driver_board["i2c_address"] = driver_board_config.at("i2c_address").get(); + pins_driver_board["i2c_address"] = driver_board_config.at("i2c_address").get(); // todo dont write into map pins_driver_board["pin_base"] = driver_board_config.at("pin_base").get(); pins_driver_board["data"] = driver_board_config.at("data").get(); pins_driver_board["CL"] = driver_board_config.at("CL").get(); @@ -95,7 +95,7 @@ std::map parse_pins_sound_board(json &sound_board_config) std::map pins_sound; try { - pins_sound["i2c_address"] = sound_board_config.at("i2c_address").get(); + pins_sound["i2c_address"] = sound_board_config.at("i2c_address").get(); // todo dont write into map pins_sound["pin_base"] = sound_board_config.at("pin_base").get(); pins_sound["fire"] = sound_board_config.at("fire").get(); diff --git a/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp b/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp index bdf1eb6..d5d32b2 100644 --- a/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp @@ -17,6 +17,7 @@ namespace detail DisplayBoardPinController::DisplayBoardPinController(std::map pins_display) : pins_display_board(std::move(pins_display)) { + // todo init } diff --git a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp index 4e5a5de..f7c9832 100644 --- a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp @@ -14,7 +14,7 @@ namespace detail DriverBoardPinController::DriverBoardPinController(std::map pins_driver_board, std::shared_ptr output_item_mutex) : pins_driver_board(std::move(pins_driver_board)), output_item_mutex(std::move(output_item_mutex)) { - + // todo init } void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_item) diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp index d5b53ee..7ade5ce 100644 --- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp @@ -14,6 +14,7 @@ namespace detail SoundBoardPinController::SoundBoardPinController(std::map pins_sound, std::shared_ptr output_item_mutex) : pins_sound(std::move(pins_sound)), output_item_mutex(std::move(output_item_mutex)) { + // todo init } diff --git a/FlippR-Driver/src/utility/LoggerFactory.cpp b/FlippR-Driver/src/utility/LoggerFactory.cpp index b66737f..8a1ac62 100644 --- a/FlippR-Driver/src/utility/LoggerFactory.cpp +++ b/FlippR-Driver/src/utility/LoggerFactory.cpp @@ -36,6 +36,7 @@ el::Configurations createConfig(el::Level level) conf.setGlobally(el::ConfigurationType::ToStandardOutput, "false"); + conf.setGlobally(el::ConfigurationType::) conf.set(level, el::ConfigurationType::ToStandardOutput, "true"); conf.set(level, el::ConfigurationType::ToFile, "true"); conf.set(level, el::ConfigurationType::Filename, LOGGER_FILE);