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

schluss

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 17:11:53 +01:00
parent 87ae4b5c2b
commit 95b1ac85b8
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -65,7 +65,7 @@ std::map<std::string, uint8_t> parse_pins_driver_board(json &driver_board_config
try try
{ {
pins_driver_board["i2c_address"] = driver_board_config.at("i2c_address").get<uint8_t>(); pins_driver_board["i2c_address"] = driver_board_config.at("i2c_address").get<uint8_t>(); // todo dont write into map
pins_driver_board["pin_base"] = driver_board_config.at("pin_base").get<uint8_t>(); pins_driver_board["pin_base"] = driver_board_config.at("pin_base").get<uint8_t>();
pins_driver_board["data"] = driver_board_config.at("data").get<uint8_t>(); pins_driver_board["data"] = driver_board_config.at("data").get<uint8_t>();
pins_driver_board["CL"] = driver_board_config.at("CL").get<uint8_t>(); pins_driver_board["CL"] = driver_board_config.at("CL").get<uint8_t>();
@@ -95,7 +95,7 @@ std::map<std::string, uint8_t> parse_pins_sound_board(json &sound_board_config)
std::map<std::string, uint8_t> pins_sound; std::map<std::string, uint8_t> pins_sound;
try try
{ {
pins_sound["i2c_address"] = sound_board_config.at("i2c_address").get<uint8_t>(); pins_sound["i2c_address"] = sound_board_config.at("i2c_address").get<uint8_t>(); // todo dont write into map
pins_sound["pin_base"] = sound_board_config.at("pin_base").get<uint8_t>(); pins_sound["pin_base"] = sound_board_config.at("pin_base").get<uint8_t>();
pins_sound["fire"] = sound_board_config.at("fire").get<uint8_t>(); pins_sound["fire"] = sound_board_config.at("fire").get<uint8_t>();

1
FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp
View File

@@ -17,6 +17,7 @@ namespace detail
DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8_t> pins_display) : DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8_t> pins_display) :
pins_display_board(std::move(pins_display)) pins_display_board(std::move(pins_display))
{ {
// todo init
} }

2
FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
View File

@@ -14,7 +14,7 @@ namespace detail
DriverBoardPinController::DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex) : DriverBoardPinController::DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex) :
pins_driver_board(std::move(pins_driver_board)), output_item_mutex(std::move(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) void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_item)

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

@@ -14,6 +14,7 @@ namespace detail
SoundBoardPinController::SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex) : 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)) pins_sound(std::move(pins_sound)), output_item_mutex(std::move(output_item_mutex))
{ {
// todo init
} }

1
FlippR-Driver/src/utility/LoggerFactory.cpp
View File

@@ -36,6 +36,7 @@ el::Configurations createConfig(el::Level level)
conf.setGlobally(el::ConfigurationType::ToStandardOutput, "false"); conf.setGlobally(el::ConfigurationType::ToStandardOutput, "false");
conf.setGlobally(el::ConfigurationType::)
conf.set(level, el::ConfigurationType::ToStandardOutput, "true"); conf.set(level, el::ConfigurationType::ToStandardOutput, "true");
conf.set(level, el::ConfigurationType::ToFile, "true"); conf.set(level, el::ConfigurationType::ToFile, "true");
conf.set(level, el::ConfigurationType::Filename, LOGGER_FILE); conf.set(level, el::ConfigurationType::Filename, LOGGER_FILE);