From e8c801a3c0bfaaa94367787a24afa9c1fbfb83df Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Thu, 13 Sep 2018 22:04:29 +0200
Subject: [PATCH] refactored matrix_config to input_config

---
 .../src/utilities/InputGPIOInterface.cpp       | 18 +++++++++---------
 .../src/utilities/InputGPIOInterface.h         |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
index 424158a..8f26111 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
@@ -42,32 +42,32 @@ void InputGPIOInterface::write_col(char data)
 }
 
 
-InputGPIOInterface::InputGPIOInterface(std::istream& matrix_config_stream)
+InputGPIOInterface::InputGPIOInterface(std::istream& input_config_stream)
 {
-  init_members(matrix_config_stream);
+  init_members(input_config_stream);
 
   init_pins();
 }
 
-void InputGPIOInterface::init_members(std::istream &matrix_config_stream)
+void InputGPIOInterface::init_members(std::istream &input_config_stream)
 {
-  json matrix_config;
-  matrix_config_stream >> matrix_config;
+  json input_config;
+  input_config_stream >> input_config;
 
   try {
-    json matrix_config_input = matrix_config.at("input");
+    json matrix_config_input = input_config.at("input");
 
-    json row_json = matrix_config.at("row");
+    json row_json = input_config.at("row");
     row_address_A = row_json.at("A").get<json::number_integer_t>();
     row_address_B = row_json.at("B").get<json::number_integer_t>();
     row_address_C = row_json.at("C").get<json::number_integer_t>();
 
-    json col_json = matrix_config.at("col");
+    json col_json = input_config.at("col");
     col_address_A = col_json.at("A").get<json::number_integer_t>();
     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 = matrix_config.at("data").get<nlohmann::json::number_integer_t>();
+    data_address = input_config.at("data").get<nlohmann::json::number_integer_t>();
   } catch (json::type_error& e) {
     CLOG(ERROR, INPUT_LOGGER) << "ERROR";
   } catch (json::out_of_range& e) {
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.h b/FlippR-Driver/src/utilities/InputGPIOInterface.h
index 0cf5e96..4bb6cc7 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.h
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.h
@@ -15,11 +15,11 @@
 class InputGPIOInterface : public IInputGPIOInterface, GPIOInterface
 {
 public:
-  InputGPIOInterface(std::istream& matrix_config_stream);
+  InputGPIOInterface(std::istream& input_config_stream);
   bool read_data(char pin);
 
 private:
-  void init_members(std::istream& matrix_config_stream);
+  void init_members(std::istream& input_config_stream);
   void init_pins();
   void write_row(char data);
   void write_col(char data);