From 11f20376b75cf1cd9e11c114bb8a714a85255c03 Mon Sep 17 00:00:00 2001 From: wolfv6 Date: Sun, 5 Jun 2016 16:33:13 -0600 Subject: [PATCH] move debouncer.debounce() to Row::process() --- src/Row.cpp | 8 ++------ src/Row.h | 1 - src/RowBase.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Row.cpp b/src/Row.cpp index 10bb8d7..121ffa4 100644 --- a/src/Row.cpp +++ b/src/Row.cpp @@ -17,11 +17,7 @@ void Row::process(const bool activeHigh) wait(); scan(activeHigh); //save column-port-pin values to portState rowState = getRowState(rowEnd, activeHigh); - debouncedChanged = debounce(rowState); + //debouncedChanged = debounce(rowState); + debouncedChanged = debouncer.debounce(rowState, debounced); pressRelease(rowEnd, debouncedChanged); } - -uint8_t Row::debounce(const uint8_t rowState) -{ - return debouncer.debounce(rowState, debounced); -} diff --git a/src/Row.h b/src/Row.h index 18c114a..2881a20 100644 --- a/src/Row.h +++ b/src/Row.h @@ -18,7 +18,6 @@ class Row : public RowBase { private: Debouncer_4Samples debouncer; - virtual uint8_t debounce(const uint8_t rowState); public: Row( RowPort &refRowPort, const uint8_t rowPin, ColPort *const ptrsColPorts[], const uint8_t colPortCount, Key *const ptrsKeys[]) diff --git a/src/RowBase.h b/src/RowBase.h index 1d833ce..0816d1b 100644 --- a/src/RowBase.h +++ b/src/RowBase.h @@ -27,7 +27,6 @@ class RowBase void wait(); void scan(const bool activeHigh); uint8_t getRowState(uint16_t& rowEnd, const bool activeHigh); - virtual uint8_t debounce(const uint8_t rowState)=0; void pressRelease(const uint16_t rowEnd, const uint8_t debouncedChanged); public: RowBase( RowPort &refRowPort, const uint8_t rowPin,