Added namespace to enum.

Author: lendres

src/ButtonBase.cpp

@@ -55,7 +55,7 @@ void ButtonBase::setDebounceInterval(int debounceInterval)
 	_debouncer.interval(debounceInterval);
 }
 
-BUTTONSTATUS ButtonBase::update()
+BUTTONSUITE::BUTTONSTATUS ButtonBase::update()
 {
 	// See ButtonEnums.h for the definitions of the different button states.
 
@@ -70,7 +70,7 @@ BUTTONSTATUS ButtonBase::update()
 		#ifdef BUTTONSUITEDEBUG
 			Serial.println("ButtonBase::update: JUSTPRESSED");
 		#endif
-		return JUSTPRESSED;
+		return BUTTONSUITE::JUSTPRESSED;
 	}
 
 	// Look to see if the button is currently pressed.
@@ -84,14 +84,14 @@ BUTTONSTATUS ButtonBase::update()
 			#ifdef BUTTONSUITEDEBUG
 				Serial.println("ButtonBase::update: ISSHORTPRESSED");
 			#endif
-			return ISSHORTPRESSED;
+			return BUTTONSUITE::ISSHORTPRESSED;
 		}
 		else
 		{
 			#ifdef BUTTONSUITEDEBUG
 				Serial.println("ButtonBase::update: ISLONGPRESSED");
 			#endif
-			return ISLONGPRESSED;			
+			return BUTTONSUITE::ISLONGPRESSED;			
 		}
 	} 
 
@@ -106,14 +106,14 @@ BUTTONSTATUS ButtonBase::update()
 			#ifdef BUTTONSUITEDEBUG
 				Serial.println("ButtonBase::update: WASSHORTPRESSED");
 			#endif
-			return WASSHORTPRESSED;
+			return BUTTONSUITE::WASSHORTPRESSED;
 		}
 		else
 		{
 			#ifdef BUTTONSUITEDEBUG
 				Serial.println("ButtonBase::update: WASLONGPRESSED");
 			#endif
-			return WASLONGPRESSED;
+			return BUTTONSUITE::WASLONGPRESSED;
 		}
 	}
 
@@ -122,5 +122,5 @@ BUTTONSTATUS ButtonBase::update()
 	#ifdef BUTTONSUITEDEBUG
 		Serial.println("ButtonBase::update: NOTPRESSED");
 	#endif
-	return NOTPRESSED;
+	return BUTTONSUITE::NOTPRESSED;
 }

src/ButtonBase.h

@@ -87,7 +87,7 @@ class ButtonBase
 	protected:
 		// Checks the button and returns the status/state.  This does the work of categorizing the state
 		// of the button.  It is up to the derived class to determine behavior based on the returned value.
-		BUTTONSTATUS update();
+		BUTTONSUITE::BUTTONSTATUS update();
 
 	private:
 		Bounce 		        _debouncer;

src/ButtonEnums.h

@@ -28,26 +28,29 @@
 #ifndef BUTTONENUMS_H
 #define BUTTONENUMS_H
 
-// Button status.
-enum BUTTONSTATUS
+namespace BUTTONSUITE
 {
-	// Was just pressed down (first call to "update" after the button was pressed).
-	JUSTPRESSED,
-	
-	// The button is being pressed and has been held lown shorter than the long press duration.
-	ISSHORTPRESSED,
-
-	// The button was just released and the duration held down was considered short (less than long press duration).
-	WASSHORTPRESSED,
-
-	// The button is being pressed and has been held down longer than the long press duration.
-	ISLONGPRESSED,
-
-	// The button was just released and the duration held down was considered long (more than long press duration).
-	WASLONGPRESSED,
-
-	// Button is not pressed/on.
-	NOTPRESSED
-};
+	// Button status.
+	enum BUTTONSTATUS
+	{
+		// Was just pressed down (first call to "update" after the button was pressed).
+		JUSTPRESSED,
+		
+		// The button is being pressed and has been held lown shorter than the long press duration.
+		ISSHORTPRESSED,
+
+		// The button was just released and the duration held down was considered short (less than long press duration).
+		WASSHORTPRESSED,
+
+		// The button is being pressed and has been held down longer than the long press duration.
+		ISLONGPRESSED,
+
+		// The button was just released and the duration held down was considered long (more than long press duration).
+		WASLONGPRESSED,
+
+		// Button is not pressed/on.
+		NOTPRESSED
+	};
+}
 
 #endif

src/CountingButton.cpp

@@ -46,14 +46,14 @@ int CountingButton::getCount()
 	// Catch transitions from HIGH to LOW.
 	switch (update())
 	{
-		case WASSHORTPRESSED:
+		case BUTTONSUITE::WASSHORTPRESSED:
 		{
 			// Button was pushed, so increment counter.
 			_count++;
 			break;
 		}
 
-		case WASLONGPRESSED:
+		case BUTTONSUITE::WASLONGPRESSED:
 		{
 			// If the reset on long press mode is enabled, we reset, otherwise we treat
 			// this as a regular buttom push.

src/CycleButton.cpp

@@ -86,13 +86,13 @@ int CycleButton::getValue()
 	// Catch transitions from HIGH to LOW.
 	switch (update())
 	{
-		case WASSHORTPRESSED:
+		case BUTTONSUITE::WASSHORTPRESSED:
 		{
 			incrementValue();
 			break;
 		}
 
-		case WASLONGPRESSED:
+		case BUTTONSUITE::WASLONGPRESSED:
 		{
 			// If the reset on long press mode is enabled, we reset, otherwise we treat
 			// this as a regular buttom push.

src/LatchingButton.cpp

@@ -51,12 +51,12 @@ void LatchingButton::setDefaultState(bool latched)
 bool LatchingButton::pushed()
 {
 	// Get the status.
-	BUTTONSTATUS buttonStatus = update();
+	BUTTONSUITE::BUTTONSTATUS buttonStatus = update();
 
 	switch (buttonStatus)
 	{
-		case WASSHORTPRESSED:
-		case WASLONGPRESSED:
+		case BUTTONSUITE::WASSHORTPRESSED:
+		case BUTTONSUITE::WASLONGPRESSED:
 		{
 			// Toggle state.
 			_latched = !_latched;

src/MomentaryButton.cpp

@@ -41,7 +41,7 @@ MomentaryButton::~MomentaryButton()
 
 bool MomentaryButton::pushed()
 {
-	BUTTONSTATUS buttonStatus = update();
+	BUTTONSUITE::BUTTONSTATUS buttonStatus = update();
 
-	return buttonStatus == ISSHORTPRESSED || buttonStatus == ISLONGPRESSED;
+	return buttonStatus == BUTTONSUITE::ISSHORTPRESSED || buttonStatus == BUTTONSUITE::ISLONGPRESSED;
 }

src/PushEventButton.cpp

@@ -53,13 +53,13 @@ void PushEventButton::setCaptureType(CAPTURETYPE captureType)
 
 bool PushEventButton::pushed()
 {
-	BUTTONSTATUS status = update();
+	BUTTONSUITE::BUTTONSTATUS status = update();
 
 	switch (_captureType)
 	{
 		case CAPTUREPUSH:
 		{
-			if (status == JUSTPRESSED)
+			if (status == BUTTONSUITE::JUSTPRESSED)
 			{
 				return true;
 			}
@@ -71,7 +71,7 @@ bool PushEventButton::pushed()
 
 		case CAPTURERELEASE:
 		{
-			if (status == BUTTONSTATUS::WASSHORTPRESSED || status == BUTTONSTATUS::WASLONGPRESSED)
+			if (status == BUTTONSUITE::BUTTONSTATUS::WASSHORTPRESSED || status == BUTTONSUITE::BUTTONSTATUS::WASLONGPRESSED)
 			{
 				return true;
 			}