Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -re13152777df58456a873789fbfc3f889813109c9
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision e13152777df58456a873789fbfc3f889813109c9)
@@ -7,8 +7,8 @@
 *
 * @file AlarmMgmt.h
 *
-* @author (last) Sean Nash
-* @date (last) 10-Sep-2020
+* @author (last) Dara Navaei
+* @date (last) 30-Sep-2020
 *
 * @author (original) Sean Nash
 * @date (original) 07-Nov-2019
@@ -63,7 +63,8 @@
     BOOL                noRinseback;                                ///< rinseback may not be initiated at this time
     BOOL                noEndTreatment;                             ///< ending the treatment is not an option at this time
     BOOL                noNewTreatment;                             ///< no new treatments may be started even if current treatment is ended
-    BOOL                bypassDialyzer;                             ///< the dialyzer should be bypassed at this time
+    BOOL                bypassDialyzer;                             ///< the dialyzer should be bypassed at this time
+    BOOL                lampOn;                                     ///< the alarm lamp is on
 } COMP_ALARM_STATUS_T;
 
 /// Record structure for unsigned integer alarm data.
@@ -193,6 +194,14 @@
     SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_S32_PARAM,            // 80
     SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_F32_PARAM,
     SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX,
+    SW_FAULT_ID_HD_VALVES_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_HD_VALVES_INVALID_EXEC_STATE,
+    SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED,                       // 85
+    SW_FAULT_ID_HD_VALVES_INVALID_AIR_TRAP_REQUEST,
+    SW_FAULT_ID_HD_VALVES_INVALID_CONTROL_MODE_SELECTED,
+    SW_FAULT_ID_HD_VAVLES_INVALID_POSITION_SELECTED,
+    SW_FAULT_ID_AIR_TRAP_INVALID_STATE,
+    SW_FAULT_ID_AIR_TRAP_INVALID_LEVEL_SENSOR,                          // 90
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -205,7 +214,8 @@
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData );
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 );
 void clearAlarm( ALARM_ID_T alarm );
-BOOL isAlarmActive( ALARM_ID_T alarm );
+BOOL isAlarmActive( ALARM_ID_T alarm );
+BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 
 BOOL testSetAlarmStatusPublishIntervalOverride( U32 value );
 BOOL testResetAlarmStatusPublishIntervalOverride( void );