Index: AlarmDefs.h
===================================================================
diff -u -r6380102d74fb4621c3143e4bc0402a4dff6bb026 -r72b160dc9bedcbe238a6282db18975a960e39776
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6380102d74fb4621c3143e4bc0402a4dff6bb026)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 72b160dc9bedcbe238a6282db18975a960e39776)
@@ -90,16 +90,17 @@
     ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 64,                     ///< Inlet water temperature too high
     ALARM_ID_PRESSURE_SENSOR_FAULT = 65,                            ///< Pressure sensor fault
     ALARM_ID_INLET_WATER_LOW_PRESSURE = 66,                         ///< Inlet water pressure too low
-    ALARM_ID_HD_CRITICAL_DATA_ERROR = 67,                           ///< HD critical data integrity check failed.
-    ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 68,               ///< HD accelerometer failed POST.
-    ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 69,               ///< DG accelerometer failed POST.
-    ALARM_ID_HD_EXCESSIVE_TILT = 70,                                ///< HD tilt exceeds maximum.
-    ALARM_ID_DG_EXCESSIVE_TILT = 71,                                ///< DG tilt exceeds maximu.
-    ALARM_ID_HD_SHOCK = 72,                                         ///< HD experienced large acceleration.
-    ALARM_ID_DG_SHOCK = 73,                                         ///< DG experienced large acceleration.
+    ALARM_ID_HD_CRITICAL_DATA_ERROR = 67,                           ///< HD critical data integrity check failed
+    ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 68,               ///< HD accelerometer failed POST
+    ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 69,               ///< DG accelerometer failed POST
+    ALARM_ID_HD_EXCESSIVE_TILT = 70,                                ///< HD tilt exceeds maximum
+    ALARM_ID_DG_EXCESSIVE_TILT = 71,                                ///< DG tilt exceeds maximu
+    ALARM_ID_HD_SHOCK = 72,                                         ///< HD experienced large acceleration
+    ALARM_ID_DG_SHOCK = 73,                                         ///< DG experienced large acceleration
     ALARM_ID_HD_ACCELEROMETER_FAILURE = 74,                         ///< HD accelerometer error (no readings or FPGA reports error)
     ALARM_ID_DG_ACCELEROMETER_FAILURE = 75,                         ///< DG accelerometer error (no readings or FPGA reports error)
-    ALARM_ID_DG_CRITICAL_DATA_ERROR = 76,                           ///< DG critical data integrity check failed.
+    ALARM_ID_DG_CRITICAL_DATA_ERROR = 76,                           ///< DG critical data integrity check failed
+    ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 77,                  ///< RO rejection ratio out of range
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 
Index: HDDefs.h
===================================================================
diff -u -rca8c9e91c40af6fc49c8d7d665caf55ef34b8a59 -r72b160dc9bedcbe238a6282db18975a960e39776
--- HDDefs.h	(.../HDDefs.h)	(revision ca8c9e91c40af6fc49c8d7d665caf55ef34b8a59)
+++ HDDefs.h	(.../HDDefs.h)	(revision 72b160dc9bedcbe238a6282db18975a960e39776)
@@ -8,7 +8,7 @@
 * @file HDDefs.h
 *
 * @author (last) Sean Nash
-* @date (last) 02-Jun-2020
+* @date (last) 03-Aug-2020
 *
 * @author (original) Sean Nash
 * @date (original) 29-May-2020
Index: MsgDefs.h
===================================================================
diff -u -r6380102d74fb4621c3143e4bc0402a4dff6bb026 -r72b160dc9bedcbe238a6282db18975a960e39776
--- MsgDefs.h	(.../MsgDefs.h)	(revision 6380102d74fb4621c3143e4bc0402a4dff6bb026)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 72b160dc9bedcbe238a6282db18975a960e39776)
@@ -81,6 +81,7 @@
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37,                               ///< DG heat disinfection publish data
     MSG_ID_UI_START_TREATMENT = 0x38,                                   ///< UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39,                          ///< HD response to user request to initiate a treatment
+    MSG_ID_HD_VALVES_DATA = 0x3A,                                       ///< HD broadcast of valves
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif
@@ -164,10 +165,15 @@
     MSG_ID_RO_PUMP_SET_PWM = 0xA01B,                                    ///< RO pump set PWM for open loop
     MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C,             ///< Drain pump set delta pressure override
     MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D,           ///< Heat disinfection recirculation path duration in minutes
-    MSG_ID_HEAT_DISINFECT_RSRVR1_TO_RSRVR2_DURATION_MINS = 0xA01E,      ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes
-    MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_DURATION_MINS = 0xA01F,      ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes
+    MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E,              ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes
+    MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F,              ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes
     MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020,                 ///< Heat disinfection number of cycles to run
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021,           ///< Heat disinfection data publish interval override request
+    MSG_ID_HD_VALVES_SEND_INTERVAL_OVERRIDE = 0xA022,                   ///< HD valves data publish interval override request
+    MSG_ID_HD_HOME_VALVE = 0xA023,                                      ///< Home an HD Valve
+    MSG_ID_HD_SET_VALVE_POSITION = 0xA024,                              ///< Set an HD valve to a position in counts
+    MSG_ID_HD_SET_BLOOD_TRAP_VALVE = 0xA025,                            ///< Set the HD blood trap valve status
+    MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0xA026,                        ///< HD valves position override
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1,                                     ///< HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2,                                     ///< DG debug event text to be logged in event log