Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rfacca88de0d4c72d943b59bad9264a9b0a031ae5 -ra57994f752662abc0aaa8c2cf5c3af47ec2c5a20
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision facca88de0d4c72d943b59bad9264a9b0a031ae5)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a57994f752662abc0aaa8c2cf5c3af47ec2c5a20)
@@ -251,8 +251,7 @@
     {
         // No need to do anything if alarm is already active, but if condition was cleared then re-trigger alarm
         if ( ( FALSE == alarmIsActive[ alarm ] ) ||
-           ( ( FALSE == alarmIsDetected[ alarm ] ) &&
-             ( FALSE == ALARM_TABLE[ alarm ].alarmConditionClearImmed ) ) )
+             ( ( FALSE == alarmIsDetected[ alarm ] ) && ( FALSE == ALARM_TABLE[ alarm ].alarmConditionClearImmed ) ) )
         {
             // If alarm status was that no alarms currently active, set this alarm as top alarm until status formally updated later
             if ( ALARM_ID_NO_ALARM == alarmStatus.alarmTop )
@@ -1407,7 +1406,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT,  SW_FAULT_ID_HD_INVALID_ALARM_AUDIO_STATE, (U32)alarmAudioSelfTestState )
             break;
     }