Index: App/Controllers/Buttons.c
===================================================================
diff -u -r38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9 -r40a959e1341c8964f872df462ac3a2d874e3b0b3
--- App/Controllers/Buttons.c	(.../Buttons.c)	(revision 38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9)
+++ App/Controllers/Buttons.c	(.../Buttons.c)	(revision 40a959e1341c8964f872df462ac3a2d874e3b0b3)
@@ -14,8 +14,8 @@
  *
  **************************************************************************/
 
-#include <Controllers/Buttons.h>
 #include "Common.h"
+#include "Buttons.h"
 #include "CPLD.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
@@ -43,12 +43,10 @@
 // ********** private data **********
 
 DATA_DECL( BUTTON_STATE_T, OffButtonState, dataOffButtonState, BUTTON_STATE_RELEASED, BUTTON_STATE_PRESSED );
-//static BUTTON_STATE_T offButtonState = BUTTON_STATE_RELEASED;
 static BUTTON_STATE_T prevOffButtonState = BUTTON_STATE_RELEASED;
 static BOOL offButtonPressPending = FALSE;
 
 DATA_DECL( BUTTON_STATE_T, StopButtonState, dataStopButtonState, BUTTON_STATE_RELEASED, BUTTON_STATE_PRESSED );
-//static BUTTON_STATE_T stopButtonState = BUTTON_STATE_RELEASED;
 static BUTTON_STATE_T prevStopButtonState = BUTTON_STATE_RELEASED;
 static BOOL stopButtonPressPending = FALSE;
 static U32  stopButtonPendingTimer = 0;
@@ -76,11 +74,9 @@
  *************************************************************************/
 void initButtons( void )
 {
-    //offButtonState = BUTTON_STATE_RELEASED;
     prevOffButtonState = BUTTON_STATE_RELEASED;
     offButtonPressPending = FALSE;
 
-    //stopButtonState = BUTTON_STATE_RELEASED;
     prevStopButtonState = BUTTON_STATE_RELEASED;
     stopButtonPressPending = FALSE;
     stopButtonPendingTimer = 0;
@@ -346,109 +342,36 @@
 }
 
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
 
 /*************************************************************************
- * @brief testSetOffButtonStateOverride
+ * @brief testSetOffButtonStateOverride and testResetOffButtonStateOverride
  * The testSetOffButtonStateOverride function overrides the state of the \n
- * off button with a given state.
+ * off button with a given state. \n
+ * The testResetOffButtonStateOverride function resets the override of the \n
+ * state of the off button.
  * @details
  * Inputs : none
  * Outputs : dataOffButtonState
  * @param state : override state for the off button
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetOffButtonStateOverride( BUTTON_STATE_T state )
-{
-    BOOL result = FALSE;
+DATA_OVERRIDE_FUNC( BUTTON_STATE_T, testSetOffButtonStateOverride, testResetOffButtonStateOverride, dataOffButtonState )
 
-    // verify test login successfully completed before executing override
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        dataOffButtonState.ovData = state;
-        dataOffButtonState.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
 /*************************************************************************
- * @brief testResetOffButtonStateOverride
- * The testResetOffButtonStateOverride function resets the override of the \n
- * state of the off button.
- * @details
- * Inputs : none
- * Outputs : dataOffButtonState
- * @param none
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetOffButtonStateOverride( void )
-{
-    BOOL result = FALSE;
-
-    // verify test login successfully completed before executing override reset
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        dataOffButtonState.override = OVERRIDE_RESET;
-        dataOffButtonState.ovData = dataOffButtonState.ovInitData;
-    }
-
-    return result;
-}
-
-/*************************************************************************
- * @brief testSetStopButtonStateOverride
+ * @brief testSetStopButtonStateOverride and testResetStopButtonStateOverride
  * The testSetStopButtonStateOverride function overrides the state of the \n
- * stop button with a given state.
+ * stop button with a given state. \n
+ * The testResetStopButtonStateOverride function resets the override of the \n
+ * state of the stop button.
  * @details
  * Inputs : none
  * Outputs : dataStopButtonState
  * @param state : override state for the stop button
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetStopButtonStateOverride( BUTTON_STATE_T state )
-{
-    BOOL result = FALSE;
+DATA_OVERRIDE_FUNC( BUTTON_STATE_T, testSetStopButtonStateOverride, testResetStopButtonStateOverride, dataStopButtonState )
 
-    // verify test login successfully completed before executing override
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        dataStopButtonState.ovData = state;
-        dataStopButtonState.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*************************************************************************
- * @brief testResetStopButtonStateOverride
- * The testResetStopButtonStateOverride function resets the override of the \n
- * state of the stop button.
- * @details
- * Inputs : none
- * Outputs : dataStopButtonState
- * @param none
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetStopButtonStateOverride( void )
-{
-    BOOL result = FALSE;
-
-    // verify test login successfully completed before executing override reset
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        dataStopButtonState.override = OVERRIDE_RESET;
-        dataStopButtonState.ovData = dataStopButtonState.ovInitData;
-    }
-
-    return result;
-}
-