Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7 -r51c6a24b30643c8ce296ebfe1d703f289ffafe97
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
@@ -20,7 +20,6 @@
 #include "AlarmLamp.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
-#include "AlarmMgmt.h"
 
 // ********** private definitions **********
 
@@ -177,7 +176,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 15, alarm )
     }
 }
 
@@ -204,7 +203,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 16, alarm )
     }
 }
 
@@ -232,7 +231,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 17, alarm )
     }
 }
 
@@ -266,11 +265,28 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 18, alarm )
     }
 }
 
 /*************************************************************************
+ * @brief isAlarmActive
+ * The isAlarmActive function determines whether a given alarm is currently \n
+ * active.
+ * @details
+ * Inputs : alarmIsActive[]
+ * Outputs : none
+ * @param alarmID : ID of alarm to check
+ * @return TRUE if given alarm is active, FALSE if not
+ *************************************************************************/
+BOOL isAlarmActive( ALARM_ID_T alarm )
+{
+    BOOL result = getAlarmActive( alarm );
+
+    return result;
+}
+
+/*************************************************************************
  * @brief getAlarmActive
  * The getAlarmActive function gets the active state of a given alarm.
  * @details
@@ -373,7 +389,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 19, alarmStatus.alarmsState )
             break;
     }
 }