From 3471ebc77dca07e6937d5dd3f5c7d1f9eac1f772 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Tue, 6 Aug 2019 22:41:30 +0200 Subject: [PATCH] fixed typo --- .../contrib/json_example/server_config.json | 2 +- FlippR-Driver/networking/FlippRServer.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/server_config.json b/FlippR-Driver/contrib/json_example/server_config.json index 2eddb85..d8109d3 100644 --- a/FlippR-Driver/contrib/json_example/server_config.json +++ b/FlippR-Driver/contrib/json_example/server_config.json @@ -4,5 +4,5 @@ "lamp-config" :"../../contrib/json_example/output/Lamp_Config.json", "solenoid-config" :"../../contrib/json_example/output/Solenoid_Config.json", "sound-config" :"../../contrib/json_example/output/Sound_Config.json", - "display-config" :"../../contrib/json_example/output/Display_Config.json", + "display-config" :"../../contrib/json_example/output/Display_Config.json" } diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 93465d0..8ba7583 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -127,10 +127,10 @@ void FlippRServer::initialize_output_driver() try { - lamp_config_stream.open(this->configs["lamp_config"].toString()); - solenoid_config_stream.open(this->configs["solenoid_config"].toString()); - sound_config_stream.open(this->configs["sound_config"].toString()); - display_config_stream.open(this->configs["display_config"].toString()); + lamp_config_stream.open(this->configs["lamp-config"].toString()); + solenoid_config_stream.open(this->configs["solenoid-config"].toString()); + sound_config_stream.open(this->configs["sound-config"].toString()); + display_config_stream.open(this->configs["display-config"].toString()); } catch(const std::exception& e) { @@ -151,8 +151,8 @@ void FlippRServer::initialize_input_driver() try { - input_config_stream.open(this->configs["input_config"].toString()); - matrix_config_stream.open(this->configs["matrix_config"].toString()); + input_config_stream.open(this->configs["input-config"].toString()); + matrix_config_stream.open(this->configs["matrix-config"].toString()); } catch(const std::exception& e) {