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

refactored everything

Browse Source
This commit is contained in:
Johannes Wendel
2018-11-09 01:16:35 +01:00
parent c53b6af33e
commit 3ea37e4e53
70 changed files with 202 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
FlippR-Driver/src/input/InputDriverFactory.cpp
View File

@@ -16,13 +16,13 @@
#include "EventNotifier.h"
using namespace nlohmann;
using namespace FlippR_Driver::utility;
using namespace flippR_driver::utility;
namespace FlippR_Driver
namespace flippR_driver
{
namespace Input
namespace input
{
std::shared_ptr<IInputDriver> InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream)
std::shared_ptr<IInputDriver> InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream)
{
LoggerFactory::CreateInputLogger();
@@ -52,9 +52,9 @@ void InputDriverFactory::create_input_events(json matrix_config, std::vector<std
{
int global_bounce_time = matrix_config.at("global_bounce_time").get<json::number_integer_t>();
auto& event_array = matrix_config.at("input_matrix");
for (auto &json_event : event_array)
for (auto &json_event : event_array)
{
try
try
{
std::string name = json_event.at("name");
char address = json_event.at("address").get<json::number_integer_t>();
@@ -73,7 +73,7 @@ void InputDriverFactory::create_input_events(json matrix_config, std::vector<std
events.push_back(event_ptr);
name_event_map.emplace(name, event_ptr);
}
catch (json::exception &e)
catch (json::exception &e)
{
CLOG(ERROR, INPUT_LOGGER) << "Matrix config-file corrupted: " << e.what();
exit(EXIT_FAILURE);