Index: MsgDefs.h
===================================================================
diff -u -r56402afe56a74fe27f40abe9531b309d13722c91 -r7f3c0b0c74d490a43b4ba34edfb263bf2986e45d
--- MsgDefs.h	(.../MsgDefs.h)	(revision 56402afe56a74fe27f40abe9531b309d13722c91)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 7f3c0b0c74d490a43b4ba34edfb263bf2986e45d)
@@ -83,6 +83,8 @@
     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
     MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B,                     ///< UI user confirmation of treatment parameters
+
+    MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER = 0x6D,                     ///< TODO REMOVE
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif
@@ -136,6 +138,9 @@
     MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B,                      ///< Blood flow set calibration factors request
     MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C,                  ///< Dialysate flow set calibration factors request
     MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D,               ///< Set a treatment parameter (will change actual setting, not an override)
+    MSG_ID_HD_VALVES_HOME = 0x802E,                                     ///< Home an HD Valve
+    MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F,                        ///< Set an HD valve to a position in counts
+    MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE = 0x8030,                     ///< Set the HD blood trap valve status
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,    ///< DG tester log-in
@@ -171,11 +176,6 @@
     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