Fixed time handling in damper

Author: fooker

devices/sonoff/Impl.cpp

@@ -33,7 +33,7 @@ class SonoffDevice : public Device {
 
     Socket<SOCKET_NAME, SOCKET_GPIO> socket;
     Light<LIGHT_NAME, LIGHT_GPIO> light;
-    ToggleButton<BUTTON_NAME, BUTTON_GPIO, true, 1> button;
+    ToggleButton<BUTTON_NAME, BUTTON_GPIO, true> button;
 };
 
 

framework/features/Button.h

@@ -3,9 +3,10 @@
 
 #include "Feature.h"
 #include "../util/Observed.h"
+#include "../util/Damper.h"
 
 
-template<const char* const name, uint16_t gpio, bool inverted, uint16_t damper_time = 0>
+template<const char* const name, uint16_t gpio, bool inverted, uint16_t damper_time = 100>
 class Button : public Feature<name> {
     constexpr static const char* const ON = "1";
     constexpr static const char* const OFF = "0";

framework/features/Socket.h

@@ -5,8 +5,8 @@
 
 
 template <const char* const name, uint16_t gpio, bool invert=false>
-class Socket : public OnOffFeature<name, gpio, invert, 1> {
-    using OnOffFeature<name, gpio, invert, 1>::OnOffFeature;
+class Socket : public OnOffFeature<name, gpio, invert, 1000> {
+    using OnOffFeature<name, gpio, invert, 1000>::OnOffFeature;
 };
 
 #endif

framework/features/ToggleButton.h

@@ -4,8 +4,8 @@
 #include "Button.h"
 
 
-template<const char* const name, uint16_t gpio, bool inverted = true, bool activeEdge = true>
-class ToggleButton : public Button<name, gpio, inverted> {
+template<const char* const name, uint16_t gpio, bool inverted = true, bool activeEdge = true, uint16_t damper_time = 100>
+class ToggleButton : public Button<name, gpio, inverted, damper_time> {
 protected:
     using Button<name, gpio, inverted>::LOG;
 

framework/features/TriggerButton.h

@@ -4,8 +4,8 @@
 #include "Button.h"
 
 
-template<const char* const name, uint16_t gpio, bool inverted=true>
-class TriggerButton : public Button<name, gpio, inverted> {
+template<const char* const name, uint16_t gpio, bool inverted=true, uint16_t damper_time = 100>
+class TriggerButton : public Button<name, gpio, inverted, damper_time> {
 
 public:
     using Callback = typename Button<name, gpio, inverted>::Callback;

framework/util/Damper.h

@@ -5,15 +5,18 @@
 template<uint16_t damper_time = 0>
 class Damper {
 public:
-    Damper() : lastChange(RTC.getRtcNanoseconds()) {  }
+    Damper() :
+            lastChange(RTC.getRtcNanoseconds() / 1000000) {
+    }
 
     bool isDamped() {
-        if(damper_time <= 0)
-          return false;
+        if (damper_time == 0) {
+            return false;
+        }
 
-        const uint64_t now = RTC.getRtcNanoseconds();
+        const uint32_t now = RTC.getRtcNanoseconds() / 1000000;
 
-        if (this->lastChange + ((uint64_t) damper_time * NS_PER_SECOND) > now) {
+        if (this->lastChange + ((uint32_t) damper_time) > now) {
             return true;
         }
 
@@ -23,7 +26,7 @@ class Damper {
     }
 
 private:
-    uint64_t lastChange;
+    uint32_t lastChange;
 };
 
 #endif