Browse Source

move debouncer.debounce() to Row::process()

tags/v0.5.0
wolfv6 8 years ago
parent
commit
11f20376b7
3 changed files with 2 additions and 8 deletions
  1. 2
    6
      src/Row.cpp
  2. 0
    1
      src/Row.h
  3. 0
    1
      src/RowBase.h

+ 2
- 6
src/Row.cpp View File

@@ -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);
}

+ 0
- 1
src/Row.h View File

@@ -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[])

+ 0
- 1
src/RowBase.h View File

@@ -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,