Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -rd9d085cdca67200ecddbdfbc75c489e704b23081
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision d9d085cdca67200ecddbdfbc75c489e704b23081)
@@ -30,7 +30,7 @@
 
 // ********** private definitions **********
 
-#define ALARM_STATUS_PUBLISH_INTERVAL           (500/TASK_GENERAL_INTERVAL)         ///< Default interval to publish alarm status data.
+#define ALARM_STATUS_PUBLISH_INTERVAL           (250/TASK_GENERAL_INTERVAL)         ///< Default interval to publish alarm status data.
 
 #define ALARM_SILENCE_EXPIRES_IN_SECS           (60)                                ///< Alarm silence expiration time in seconds.
 
@@ -58,7 +58,7 @@
 #pragma pack(pop)
 
 /// Table of alarms and their static properties.
-const ALARM_T alarmTable[ NUM_OF_ALARM_IDS ] =
+const ALARM_T alarmTable[] =
 { //     Priority            Escalate In        Escalate To                                Fault  Stops  NoClr  NoRes  NoRin  NoEnd  NoNew  Bypass
     { ALARM_PRIORITY_NONE,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NO_ALARM
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SOFTWARE_FAULT
@@ -139,8 +139,16 @@
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CRITICAL_DATA_ERROR
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_PRESSURE_FAULT
-};
-
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VALVE_HOMING_FAILED
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VALVE_NOT_FUNCTIONAL
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VALVE_POSITION_OUT_OF_TARGET
+};
+
+// *** This declaration will cause a compiler error if alarmTable does not have same # of alarms as the Alarm_List enumeration.
+U08 alarmTableSizeAssertion[ ( ( sizeof( alarmTable ) / sizeof( ALARM_T ) ) == NUM_OF_ALARM_IDS ? 1 : -1 ) ];
+
 /// A blank alarm data record for alarms that do not include alarm data when triggered.
 const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };
 
@@ -570,7 +578,12 @@
                 requestAlarmLampPattern( LAMP_PATTERN_FAULT );
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE, alarmStatus.alarmsState )
                 break;
-        }
+        }
+        alarmStatus.lampOn = getAlarmLampOn();
+    }
+    else
+    {
+        alarmStatus.lampOn = FALSE;
     }
 
     if ( TRUE == alarmStatus.alarmsSilenced )