Index: App/Controllers/Buttons.h
===================================================================
diff -u -r3323966fe741edbb36dffc78317ccf06ed93a68e -r38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9
--- App/Controllers/Buttons.h	(.../Buttons.h)	(revision 3323966fe741edbb36dffc78317ccf06ed93a68e)
+++ App/Controllers/Buttons.h	(.../Buttons.h)	(revision 38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9)
@@ -21,20 +21,27 @@
 
 // ********** public definitions **********
 
-typedef enum Buttons
+typedef enum Button_States
 {
-    BUTTON_OFF = 0,   // Off button
-    BUTTON_STOP,      // Stop button
-    NUM_OF_BUTTONS
-} BUTTON_T;
+    BUTTON_STATE_RELEASED = 0,
+    BUTTON_STATE_PRESSED,
+    NUM_OF_BUTTON_STATES
+} BUTTON_STATE_T;
 
 // ********** public function prototypes **********
 
 void initButtons( void );
 void execButtons( void );
 BOOL isStopButtonPressed( void );
-BOOL isButtonPressedRaw( BUTTON_T button );
 void userConfirmOffButton( U08 response );
 SELF_TEST_STATUS_T execStuckButtonTest( void );
 
+DATA_GET_PROTOTYPE( BUTTON_STATE_T, getOffButtonState );
+DATA_GET_PROTOTYPE( BUTTON_STATE_T, getStopButtonState );
+
+BOOL testSetOffButtonStateOverride( BUTTON_STATE_T state );
+BOOL testResetOffButtonStateOverride( void );
+BOOL testSetStopButtonStateOverride( BUTTON_STATE_T state );
+BOOL testResetStopButtonStateOverride( void );
+
 #endif