Merge pull request #45 from eppfel/master

Add ADC filter to remove jitters on touchRead

Author: Evert Arias

library.json

@@ -0,0 +1,30 @@
+{
+  "name": "EasyButton",
+  "keywords": "IO, button, sensor, arduino",
+  "description": "EasyButton is an small Arduino library for debouncing momentary contact switches like tactile buttons. It uses events and callbacks to trigger actions when a button is pressed once or held for a given duration. It also provides a sequence counter to be able to rise an event when a given pattern of presses has been matched.",
+  "version": "2.0.1",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/evert-arias/EasyButton"
+  },
+  "url": "https://easybtn.earias.me",
+  "frameworks": "arduino",
+  "platforms": "espressif8266, espressif32",
+  "dependencies": [
+    {
+      "owner": "megunolink",
+      "name": "MegunoLink",
+      "version": "^1.33"
+    }
+  ],
+  "authors": [
+    {
+      "name": "Evert Arias",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Felix A. Epp",
+      "url": "https://github.com/eppfel"
+    }
+  ]
+}

library.properties

@@ -6,4 +6,5 @@ sentence=Arduino library for debouncing momentary contact switches, detect press
 paragraph=EasyButton is an small Arduino library for debouncing momentary contact switches like tactile buttons. It uses events and callbacks to trigger actions when a button is pressed once or held for a given duration. It also provides a sequence counter to be able to rise an event when a given pattern of presses has been matched.
 category=Signal Input/Output
 url=https://easybtn.earias.me
-architectures=*
+architectures=*
+depends=MegunoLink

src/EasyButtonTouch.cpp

@@ -1,13 +1,24 @@
 /**
  * EasyButtonTouch.cpp
- * @author Evert Arias, Gutierrez PS
+ * @author Evert Arias, Gutierrez PS, Felix A. Epp
  * @version 2.0.0
  * @license MIT
  */
 
 #if defined(ESP32)
 #include "EasyButtonTouch.h"
 
+void EasyButtonTouch::setThreshold(int threshold)
+{
+	_touch_threshold = threshold;
+}
+
+void EasyButtonTouch::begin(int threshold)
+{
+	_touch_threshold = threshold;
+	begin();
+}
+
 void EasyButtonTouch::begin()
 {
 	_current_state = _readPin();
@@ -19,7 +30,8 @@ void EasyButtonTouch::begin()
 
 bool EasyButtonTouch::_readPin()
 {
-	return touchRead(_pin) < _touch_threshold;
+	ADCFilter.Filter(touchRead(_pin));
+	return ADCFilter.Current() < _touch_threshold;
 }
 
 #endif

src/EasyButtonTouch.h

@@ -1,6 +1,6 @@
 /**
  * EasyButtonTouch.h
- * @author Evert Arias, Gutierrez PS
+ * @author Evert Arias, Gutierrez PS, Felix A. Epp
  * @version 2.0.0
  * @license MIT
  */
@@ -9,16 +9,20 @@
 #define _EasyButtonTouch_h
 
 #include <Arduino.h>
+#include <Filter.h>
 #include "EasyButton.h"
 
 class EasyButtonTouch : public EasyButton
 {
 public:
-	EasyButtonTouch(uint8_t pin, uint32_t debounce_time = 35, uint16_t threshold = 50) : EasyButton(pin, debounce_time, false, false), _touch_threshold(threshold) {}
+	EasyButtonTouch(uint8_t pin, uint32_t debounce_time = 35, uint16_t threshold = 50) : EasyButton(pin, debounce_time, false, false), _touch_threshold(threshold), ADCFilter(5, threshold) {}
 	void begin();
+	void begin(int threshold);
+	void setThreshold(int threshold);
 
 private:
 	uint16_t _touch_threshold; // If touchRead() is below the threshold, the button is considered pressed.
+	ExponentialFilter<long> ADCFilter;
 
 	bool _readPin();
 };