Index: MsgDefs.h
===================================================================
diff -u -r76e6f436a35a226c91f5040c81a23f0417d1bd66 -r9401af3edc8505f0936961a664a0e768811a0f43
--- MsgDefs.h	(.../MsgDefs.h)	(revision 76e6f436a35a226c91f5040c81a23f0417d1bd66)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 9401af3edc8505f0936961a664a0e768811a0f43)
@@ -55,19 +55,20 @@
     MSG_ID_DG_VERSION = 0x1E,                                           ///< DG f/w version.
     MSG_ID_RO_PUMP_DATA = 0x1F,                                         ///< DG broadcast of RO pump data.
     MSG_ID_DG_PRESSURES_DATA = 0x20,                                    ///< DG broadcast of pressure sensors data.
-    MSG_ID_DG_SWITCH_RESERVOIR = 0x21,                                  ///< HD request to DG to switch reservoirs (A->B or B->A).
-    MSG_ID_DG_FILL = 0x22,                                              ///< HD request to DG to fill inactive reservoir.
-    MSG_ID_DG_DRAIN = 0x23,                                             ///< HD request to DG to drain inactive reservoir.
+    MSG_ID_DG_SWITCH_RESERVOIR_CMD = 0x21,                              ///< HD request to DG to switch reservoirs (A->B or B->A).
+    MSG_ID_DG_FILL_CMD = 0x22,                                          ///< HD request to DG to fill inactive reservoir.
+    MSG_ID_DG_DRAIN_CMD = 0x23,                                         ///< HD request to DG to drain inactive reservoir.
     MSG_ID_DRAIN_PUMP_DATA = 0x24,                                      ///< DG broadcast of drain pump data.
     MSG_ID_HD_OP_MODE = 0x25,                                           ///< HD broadcast current operating mode.
-    MSG_ID_STARTING_STOPPING_TREATMENT = 0x26,                          ///< HD request to DG to move in/out of standby mode due to treatment start/stop.
+    MSG_ID_STARTING_STOPPING_TREATMENT_CMD = 0x26,                      ///< HD request to DG to move in/out of standby mode due to treatment start/stop.
     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.
 
     // 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,          ///< Tester log-in.
+    MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,          ///< HD tester log-in.
     MSG_ID_HD_MESSAGE = 0x8001,                                         ///< HD message.   TODO - needed?
     MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002,                          ///< Off button override request.
     MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003,                         ///< Stop button override request.
@@ -106,15 +107,19 @@
     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_FIRST_DG_TESTER_MESSAGE = 0xA000,
-    MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,
-    MSG_ID_DG_MESSAGE = 0xA001,
-    MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002,
-    MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004,
-    MSG_ID_LOAD_CELL_OVERRIDE = 0xA005,
-    MSG_ID_PRESSURE_OVERRIDE = 0xA006,
-    MSG_ID_RO_PUMP_SET_PT_OVERRIDE = 0xA007,
-    MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE = 0xA008,
+    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.
+    MSG_ID_DG_MESSAGE = 0xA001,                                         ///< DG message.  TODO - needed?
+    MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002,                  ///< Watchdog check-in override request.
+    MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004,                               ///< DG RTC set date/time.
+    MSG_ID_LOAD_CELL_OVERRIDE = 0xA005,                                 ///< Load cell sensor override request.
+    MSG_ID_PRESSURE_OVERRIDE = 0xA006,                                  ///< Pressure sensor override request.
+    MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007,                    ///< Pressure data broadcast interval override request.
+    MSG_ID_RO_PUMP_SET_PT_OVERRIDE = 0xA008,                            ///< RO pump set pt. override request.
+    MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009,                          ///< RO measured flow rate override request.
+    MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A,                     ///< RO pump data broadcast interval override request.
+    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.
     END_OF_MSG_IDS                                                      ///< # of system message IDs.
 } MSG_ID_T;