Merge pull request #38 from umeshwalkar/master

Updated preprocessor macros INTERRUPT and POLL to avoid conflicts
evert-arias · Apr 3, 2020 · 5496efd · 5496efd
2 parents c4b7ff0 + ebee876
commit 5496efd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/EasyButton.cpp b/src/EasyButton.cpp
@@ -120,7 +120,7 @@ bool EasyButton::read(int read_type)
 		// since button released, reset _pressed_for_callbackCalled value.
 		_held_callback_called = false;
 	}
-	else if(isPressed() && read_type == POLL)
+	else if(isPressed() && read_type == EASYBUTTON_TYPE_POLL)
 		_checkPressedTime();
 
 

diff --git a/src/EasyButton.h b/src/EasyButton.h
@@ -20,8 +20,8 @@
 #include "FunctionalInterrupt.h"
 #endif
 
-#define INTERRUPT 0
-#define POLL 1
+#define EASYBUTTON_TYPE_INTERRUPT 0
+#define EASYBUTTON_TYPE_POLL 1
 
 #define MAX_SEQUENCES 5
 
@@ -38,7 +38,7 @@ class EasyButton
 	~EasyButton() {}
 	// PUBLIC FUNCTIONS
 	virtual void begin();														// Initialize a button object and the pin it's connected to.
-	bool read(int read_type = POLL);											// Returns the current debounced button state, true for pressed, false for released.
+	bool read(int read_type = EASYBUTTON_TYPE_POLL);											// Returns the current debounced button state, true for pressed, false for released.
 	void update();																// Update button pressed time, only needed when using interrupts
 	void onPressed(callback_t callback);										// Call a callback function when the button has been pressed and released.
 	void onPressedFor(uint32_t duration, callback_t callback);					// Call a callback function when the button has been held for at least the given number of milliseconds.