Index: MsgDefs.h
===================================================================
diff -u -r76adbbf2a2c07dd63658303a4989da087a2251ff -rf621fa94903b9aec06c6bba8a04a0580d891490a
--- MsgDefs.h	(.../MsgDefs.h)	(revision 76adbbf2a2c07dd63658303a4989da087a2251ff)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f621fa94903b9aec06c6bba8a04a0580d891490a)
@@ -64,9 +64,10 @@
     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.
 
     // 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?
@@ -121,6 +122,8 @@
     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.
     END_OF_MSG_IDS                                                      ///< # of system message IDs.
 };
 /// Type for message IDs enumeration.
@@ -142,6 +145,7 @@
     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.
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes.
 };
 /// Type for settings change rejection reason codes enumeration.