From d57da8656c3cd06e318cfe1edd160de7fa05d3dc Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 31 May 2018 20:10:59 +0200 Subject: [PATCH] detector stuff --- FlippR-Driver/src/input/Detector.cpp | 5 +++-- FlippR-Driver/src/input/InputDriver.hpp | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp index c247594..75b6fcc 100644 --- a/FlippR-Driver/src/input/Detector.cpp +++ b/FlippR-Driver/src/input/Detector.cpp @@ -26,8 +26,10 @@ Detector::~Detector() is_running = false; detect_thread.join(); + delete this->input_gpio_interface; this->input_gpio_interface = NULL; + delete this->event_notifier; this->event_notifier = NULL; } @@ -55,7 +57,7 @@ void Detector::detect() bool Detector::check_inputs(char& address) { - for(int pin = 0; pin < MATRIX_SIZE * MATRIX_SIZE; pin++) + for(int pin = 0; pin < (INPUT_MATRIX_SIZE * INPUT_MATRIX_SIZE); pin++) { if(input_gpio_interface->read_input_data(pin)) { @@ -64,7 +66,6 @@ bool Detector::check_inputs(char& address) } } return false; - } } diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.hpp index 44d4b0c..3e4c2be 100644 --- a/FlippR-Driver/src/input/InputDriver.hpp +++ b/FlippR-Driver/src/input/InputDriver.hpp @@ -9,6 +9,7 @@ #define SRC_INPUT_INPUTDRIVER_HPP_ #include "EventHandler.hpp" + namespace Input {