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

some json parsing error

Browse Source
This commit is contained in:
Jonas Zeunert
2018-09-14 01:11:05 +02:00
parent 7fbc907c8c
commit fb94424d4b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,9 @@ namespace Input {
void void
InputDriverFactory::create_input_events(json matrix_config, std::map<char, std::shared_ptr<Event>> address_event_map, InputDriverFactory::create_input_events(json matrix_config, std::map<char, std::shared_ptr<Event>>& address_event_map,
std::map<std::string, std::shared_ptr<Event>> name_event_map) { std::map<std::string, std::shared_ptr<Event>>& name_event_map) {
for (auto &json_event : matrix_config) { for (auto &json_event : matrix_config.at("input_matrix")) {
try { try {
std::string name = json_event.at("name"); std::string name = json_event.at("name");

2
FlippR-Driver/src/input/InputDriverFactory.h
View File

@@ -29,7 +29,7 @@ public:
static std::shared_ptr<IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream); static std::shared_ptr<IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream);
private: private:
static void create_input_events(nlohmann::json matrix_config, std::map<char, std::shared_ptr<Event>> address_event_map, std::map<std::string, std::shared_ptr<Event>> name_event_map); static void create_input_events(nlohmann::json matrix_config, std::map<char, std::shared_ptr<Event>>& address_event_map, std::map<std::string, std::shared_ptr<Event>>& name_event_map);
}; };
} }
} }