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

asdf

Browse Source
This commit is contained in:
Jonas Zeunert
2018-09-14 01:25:22 +02:00
parent 8122bf7bac
commit 913353e56f
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
FlippR-Driver/contrib/Input_Config.json
View File

@@ -1,27 +1,27 @@
{
"row":
[
{
"A": 15
},
{
"B": 16
},
{
"C": 1
}
],
"col" :
[
{
"A": 4
},
{
"B": 5
},
{
"C": 6
}
],
"data" : 13
"input" : {
"row": [
{
"A": 15
},
{
"B": 16
},
{
"C": 1
}
],
"col": [
{
"A": 4
},
{
"B": 5
},
{
"C": 6
}
],
"data": 13
}
}

6
FlippR-Driver/src/utilities/InputGPIOInterface.cpp
View File

@@ -67,11 +67,11 @@ void InputGPIOInterface::init_members(std::istream &input_config_stream)
col_address_B = col_json.at("B").get<json::number_integer_t>();
col_address_C = col_json.at("C").get<json::number_integer_t>();
data_address = input_config.at("data").get<nlohmann::json::number_integer_t>();
data_address = input_config.at("data").get<json::number_integer_t>();
} catch (json::type_error& e) {
CLOG(ERROR, INPUT_LOGGER) << "ERROR";
CLOG(ERROR, INPUT_LOGGER) << e.what();
} catch (json::out_of_range& e) {
CLOG(ERROR, INPUT_LOGGER) << "ANOTHER ERROR!";
CLOG(ERROR, INPUT_LOGGER) << e.what();
}
}