Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r44c257839ef1aea98cb14c3583640ab0ae27c532 -r933a18d740285e70be9d00696ed0f5a5381bc8e4
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 44c257839ef1aea98cb14c3583640ab0ae27c532)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
@@ -8,7 +8,7 @@
 * @file AlarmMgmt.h
 *
 * @author (last) Sean Nash
-* @date (last) 10-Sep-2020
+* @date (last) 14-Oct-2020
 *
 * @author (original) Sean Nash
 * @date (original) 07-Nov-2019
@@ -45,7 +45,7 @@
     NUM_OF_ALARM_DATA_TYPES                                         ///< Total number of alarm data types.
 } ALARM_DATA_TYPES_T;
 
-#pragma pack(push,4)
+#pragma pack(push, 4)
 /// Record structure for detailing the properties of the current composite alarm status.
 typedef struct
 {
@@ -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.
@@ -107,7 +108,7 @@
 } ALARM_DATA_T;
 #pragma pack(pop)
 
-#pragma pack(push,2)
+#pragma pack(push, 2)
 /// Payload record structure for an alarm status message.
 typedef struct
 {
@@ -205,6 +206,15 @@
     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
+    SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -217,8 +227,9 @@
 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 isAlarmRecoverable( ALARM_ID_T alarm );
+BOOL isAlarmActive( ALARM_ID_T alarm );
+ALARM_PRIORITY_T getCurrentAlarmStatePriority( void );
+BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 
 BOOL testSetAlarmStatusPublishIntervalOverride( U32 value );
 BOOL testResetAlarmStatusPublishIntervalOverride( void );