Index: App/Contollers/Buttons.c
===================================================================
diff -u -rad8ad611c910747eef92336a30b6520a83409532 -r0cb75584d8a588f5392a5c54343c4ebca5079d40
--- App/Contollers/Buttons.c	(.../Buttons.c)	(revision ad8ad611c910747eef92336a30b6520a83409532)
+++ App/Contollers/Buttons.c	(.../Buttons.c)	(revision 0cb75584d8a588f5392a5c54343c4ebca5079d40)
@@ -116,9 +116,8 @@
  *************************************************************************/
 BOOL isStopButtonPressed( void )
 {
-    BOOL result = FALSE;
+    BOOL result = stopButtonPressPending;
 
-    result = stopButtonPressPending;  // TODO - put a timeout on pending stop button, trigger s/w fault if not consumed in reasonable time
     stopButtonPressPending = FALSE;
 
     return result;
@@ -172,8 +171,6 @@
  *************************************************************************/
 void userConfirmOffButton( void )
 {
-    OP_MODE opMode = getCurrentOperationMode();
-
     if ( TRUE == isCurrentOpModeOkToTurnOff() )
     {
         offButtonPressPending = TRUE;
@@ -222,8 +219,6 @@
     {
         if ( offButtonState == BUTTON_STATE_PRESSED )
         {
-            OP_MODE opMode = getCurrentOperationMode();
-
             // if off request in a valid mode, send to UI for user confirmation
             if ( TRUE == isCurrentOpModeOkToTurnOff() )
             {
Index: App/Modes/ModeFault.c
===================================================================
diff -u -r894b734327eb6e7cfa6bf651623576bc10214195 -r0cb75584d8a588f5392a5c54343c4ebca5079d40
--- App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 894b734327eb6e7cfa6bf651623576bc10214195)
+++ App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 0cb75584d8a588f5392a5c54343c4ebca5079d40)
@@ -15,6 +15,7 @@
  *************************************************************************/
 
 #include "Common.h"
+#include "AlarmLamp.h"
 #include "OperationModes.h"
 #include "ModeFault.h"
 
@@ -46,6 +47,8 @@
  *************************************************************************/
 void transitionToFaultMode( void )
 {
+    // temporary test code - solid red alarm lamp
+    requestAlarmLampPattern( LAMP_PATTERN_FAULT );
 }
 
 /*************************************************************************
Index: App/Modes/OperationModes.c
===================================================================
diff -u -r894b734327eb6e7cfa6bf651623576bc10214195 -r0cb75584d8a588f5392a5c54343c4ebca5079d40
--- App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 894b734327eb6e7cfa6bf651623576bc10214195)
+++ App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0cb75584d8a588f5392a5c54343c4ebca5079d40)
@@ -168,6 +168,7 @@
             break;
 
         default:
+            currentMode = MODE_FAUL;
             // TODO - trigger s/w fault
             break;
     }   // end switch
Index: App/Services/WatchdogMgmt.c
===================================================================
diff -u -r0e042876ff72edbbaad7e5c9cc743c5a4a8c14b3 -r0cb75584d8a588f5392a5c54343c4ebca5079d40
--- App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 0e042876ff72edbbaad7e5c9cc743c5a4a8c14b3)
+++ App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 0cb75584d8a588f5392a5c54343c4ebca5079d40)
@@ -62,7 +62,7 @@
  *************************************************************************/
 void execWatchdogMgmt( void )
 {
-    BOOL allTasksCheckedIn = TRUE;
+    BOOL allTasksCheckedIn;
 
     // called by background task, so give bg task credit for checking in
     checkInWithWatchdogMgmt( TASK_BG );