Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3 -r51c6a24b30643c8ce296ebfe1d703f289ffafe97
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
@@ -156,7 +156,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 1, lampPattern )
     }
 }
 
@@ -228,8 +228,8 @@
             break;
 
         default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 2, alarmLampSelfTestState )
             result = SELF_TEST_STATUS_FAILED;
-            // TODO - s/w fault
             break;
     }