Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r51c6a24b30643c8ce296ebfe1d703f289ffafe97
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
@@ -230,7 +230,7 @@
 
         default:
             result = SELF_TEST_STATUS_FAILED;
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 6, buttonSelfTestState )
             break;
     }
 
@@ -336,7 +336,7 @@
         // if stop button not consumed within a reasonable time, s/w fault
         if ( TRUE == didTimeout( stopButtonPendingTimer, STOP_BUTTON_PENDING_TIMEOUT ) )
         {
-            // TODO - s/w fault
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 7 )
         }
     }
 }