fix button reading

Author: thijstriemstra

Button_PCF8574/Button_PCF8574.cpp

@@ -27,26 +27,26 @@ void Button_PCF8574::loop() {
 }
 
 void Button_PCF8574::read() {
-  /*
-  int buttonReading = _mcp->getPin(_btnPin, _port);
+  uint8_t buttonReading = _expander->digitalRead(_btnPin);
 
   // if the switch changed, due to noise or pressing
   if (buttonReading != _lastBtnState) {
     // reset the debouncing timer
     _lastDebounceTime = millis();
   }
+
   if ((millis() - _lastDebounceTime) > _debounceDelay) {
     // if the button state has changed
     if (buttonReading != _currentBtnState) {
       _currentBtnState = buttonReading;
 
       // only toggle if the new button state is HIGH
       if (_currentBtnState == HIGH) {
-        _callback.callbackIntArg(_btnPin);
+        _callback.callback();
       }
     }
   }
+
   // save the switch reading
   _lastBtnState = buttonReading;
-  */
-}
+}

Button_PCF8574/Button_PCF8574.h

@@ -30,7 +30,7 @@ class Button_PCF8574
     Method _callback;
     MultiPlexer_PCF8574* _expander;
     unsigned long _lastDebounceTime = 0;
-    unsigned long _debounceDelay = 5;
+    unsigned long _debounceDelay = 50;
 };
 
 #endif

MultiPlexer_PCF8574/MultiPlexer_PCF8574.cpp

@@ -31,3 +31,7 @@ void MultiPlexer_PCF8574::pinMode(uint8_t pin, uint8_t mode, uint8_t initialValu
 void MultiPlexer_PCF8574::digitalWrite(uint8_t pin, uint8_t value) {
   _expander->digitalWrite(pin, value);
 }
+
+uint8_t MultiPlexer_PCF8574::digitalRead(uint8_t pin, bool forceReadNow) {
+  _expander->digitalRead(pin, forceReadNow);
+}

MultiPlexer_PCF8574/MultiPlexer_PCF8574.h

@@ -19,6 +19,7 @@ class MultiPlexer_PCF8574
     void loop();
     void pinMode(uint8_t pin, uint8_t mode, uint8_t initialValue = HIGH);
     void digitalWrite(uint8_t pin, uint8_t value);
+    uint8_t digitalRead(uint8_t pin, bool forceReadNow = true);
 
   private:
     PCF8574* _expander;