Index: MsgDefs.h
===================================================================
diff -u -r76adbbf2a2c07dd63658303a4989da087a2251ff -r8bb289c0ff86932609cf9e45e71e0d624ab5b5ea
--- MsgDefs.h	(.../MsgDefs.h)	(revision 76adbbf2a2c07dd63658303a4989da087a2251ff)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 8bb289c0ff86932609cf9e45e71e0d624ab5b5ea)
@@ -64,9 +64,18 @@
     MSG_ID_DG_OP_MODE = 0x27,                                           ///< DG broadcast current operating mode.
     MSG_ID_DG_RESERVOIR_DATA = 0x28,                                    ///< DG broadcast reservoir data.
     MSG_ID_DG_SAMPLE_WATER_CMD = 0x29,                                  ///< HD request to DG to allow user to get a water sample.
+    MSG_ID_DG_VALVES_STATES = 0x2A,                                     ///< DG broadcast valve states.
+    MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0x2B,                     ///< HD request to DG to start/stop trimmer heater.
+    MSG_ID_DG_HEATERS_DATA = 0x2C,                                      ///< DG broadcast of the heaters data
+    MSG_ID_DG_TEMPERATURE_DATA = 0x2D,                                  ///< DG broadcast of the temperature sensors data
+    MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E,        ///< HD response to user selection of ultrafiltration settings change option selection.
+    MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x2F,                         ///< HD request to start or stop DG heat disinfection.
+    MSG_ID_SALINE_BOLUS_DATA = 0x30,                                    ///< HD broadcast of saline bolus data.
+#ifdef EMC_TEST_BUILD
+    MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
+#endif
 
     // service/test CAN messages
-
     MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,                               ///< First HD test message ID.
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,          ///< HD tester log-in.
     MSG_ID_HD_MESSAGE = 0x8001,                                         ///< HD message.   TODO - needed?
@@ -106,6 +115,7 @@
     MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE = 0x8023,                  ///< Dialysate outlet pump measured motor speed override request.
     MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x8024,            ///< Dialysate outlet pump measured rotor speed override request.
     MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025,                 ///< Load cell measured weight override request.
+    MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026,                        ///< HD safety shutdown override request.
 
     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.
@@ -121,6 +131,13 @@
     MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE = 0xA00B,                         ///< Drain pump set pt. override request.
     MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C,                  ///< Drain pump data broadcast interval override request.
     MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE = 0xA00D,                  ///< Load cell data broadcast interval override request.
+    MSG_ID_VALVE_STATE_OVERRIDE = 0xA00E,                               ///< Valve state override request.
+    MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA00F,            ///< Valve data broadcast interval override request.
+    MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE = 0xA010,                 ///< Temperature sensor override request.
+    MSG_ID_START_STOP_PRIMARY_HEATER = 0xA011,                          ///< Start/stop primary heaters
+    MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE = 0xA012,      ///< Temperature sensors data publish override
+    MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE = 0xA013,                 ///< Heaters data publish override
+    MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE = 0xA014,                        ///< DG safety shutdown override request.
     END_OF_MSG_IDS                                                      ///< # of system message IDs.
 };
 /// Type for message IDs enumeration.
@@ -142,6 +159,10 @@
     REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE,                     ///< Dialysate flow rate or treatment duration causes dialysate volume to exceed limit.
     REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE,                       ///< Ultrafiltration volume is out of range.
     REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE,                         ///< Ultrafiltration rate is out of range.
+    REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM,             ///< Treatment time change is less than minimum treatment time.
+    REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS,                            ///< Ultrafiltration is not currently in progress.
+    REQUEST_REJECT_REASON_UF_NOT_PAUSED,                                ///< Ultrafiltration is not currently paused.
+    REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS,                     ///< A saline bolus is in progress.
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes.
 };
 /// Type for settings change rejection reason codes enumeration.