From 2bef8b6f2d4644ff0393d3ae391ad6b3507c40d2 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 31 May 2018 16:19:24 +0200 Subject: [PATCH] refactor --- FlippR-Driver/src/input/Detector.h | 2 +- FlippR-Driver/src/input/{InputEvent.h => InputEvent.hpp} | 0 .../input/{InputEventHandler.h => InputEventHandler.hpp} | 2 +- FlippR-Driver/src/input/InputEventNotifier.h | 4 ++-- .../src/input/{InputFactory.h => InputFactory.hpp} | 0 FlippR-Driver/src/input/main.cpp | 3 ++- FlippR-Driver/src/utilities/InputGPIOInterface.cpp | 8 ++++---- FlippR-Driver/src/utilities/InputGPIOInterface.h | 3 ++- 8 files changed, 12 insertions(+), 10 deletions(-) rename FlippR-Driver/src/input/{InputEvent.h => InputEvent.hpp} (100%) rename FlippR-Driver/src/input/{InputEventHandler.h => InputEventHandler.hpp} (97%) rename FlippR-Driver/src/input/{InputFactory.h => InputFactory.hpp} (100%) diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h index ecb14ed..4106a22 100644 --- a/FlippR-Driver/src/input/Detector.h +++ b/FlippR-Driver/src/input/Detector.h @@ -18,7 +18,7 @@ #include #include "../utilities/InputGPIOInterface.h" -#include "InputEvent.h" +#include "InputEvent.hpp" #include "InputEventNotifier.h" #define SLEEP_DURATION_NANO 900 diff --git a/FlippR-Driver/src/input/InputEvent.h b/FlippR-Driver/src/input/InputEvent.hpp similarity index 100% rename from FlippR-Driver/src/input/InputEvent.h rename to FlippR-Driver/src/input/InputEvent.hpp diff --git a/FlippR-Driver/src/input/InputEventHandler.h b/FlippR-Driver/src/input/InputEventHandler.hpp similarity index 97% rename from FlippR-Driver/src/input/InputEventHandler.h rename to FlippR-Driver/src/input/InputEventHandler.hpp index 8aa411c..98af782 100644 --- a/FlippR-Driver/src/input/InputEventHandler.h +++ b/FlippR-Driver/src/input/InputEventHandler.hpp @@ -12,8 +12,8 @@ #ifndef INPUTEVENTHANDLER_H_ #define INPUTEVENTHANDLER_H_ -#include "InputEvent.h" #include "Detector.h" +#include "InputEvent.hpp" namespace Input { diff --git a/FlippR-Driver/src/input/InputEventNotifier.h b/FlippR-Driver/src/input/InputEventNotifier.h index 850e536..827028c 100644 --- a/FlippR-Driver/src/input/InputEventNotifier.h +++ b/FlippR-Driver/src/input/InputEventNotifier.h @@ -13,8 +13,8 @@ #include #include "../utilities/BlockingQueue.hpp" -#include "InputEventHandler.h" -#include "InputEvent.h" +#include "InputEvent.hpp" +#include "InputEventHandler.hpp" namespace Input { diff --git a/FlippR-Driver/src/input/InputFactory.h b/FlippR-Driver/src/input/InputFactory.hpp similarity index 100% rename from FlippR-Driver/src/input/InputFactory.h rename to FlippR-Driver/src/input/InputFactory.hpp diff --git a/FlippR-Driver/src/input/main.cpp b/FlippR-Driver/src/input/main.cpp index 2450b1f..62571d8 100644 --- a/FlippR-Driver/src/input/main.cpp +++ b/FlippR-Driver/src/input/main.cpp @@ -1,7 +1,8 @@ #include -#include "InputEvent.h" #include "Detector.h" #include + +#include "InputEvent.hpp" int main() { return 0; diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp index e83d63d..56376f6 100644 --- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp +++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp @@ -7,9 +7,6 @@ #include "InputGPIOInterface.h" -class InputGPIOInterface -{ - bool InputGPIOInterface::read_input_data(char pin) { // setting address to read @@ -33,4 +30,7 @@ void InputGPIOInterface::write_input_col(char data) write_pin(this->input_col_address, data & 0b100); } -}; + +InputGPIOInterface() +{ +} diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.h b/FlippR-Driver/src/utilities/InputGPIOInterface.h index 59124d8..3fda1eb 100644 --- a/FlippR-Driver/src/utilities/InputGPIOInterface.h +++ b/FlippR-Driver/src/utilities/InputGPIOInterface.h @@ -14,7 +14,8 @@ class InputGPIOInterface : GPIOInterface { public: - bool read_input_data(); + InputGPIOInterface(); + bool read_input_data(char pin); private: void write_input_row(char data);