Index: MsgDefs.h
===================================================================
diff -u -r20715ecef1276ccdb303fa9603d75722df8df700 -re37fda69662dfc63ba0209529d322b3d78403b0d
--- MsgDefs.h	(.../MsgDefs.h)	(revision 20715ecef1276ccdb303fa9603d75722df8df700)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision e37fda69662dfc63ba0209529d322b3d78403b0d)
@@ -86,7 +86,11 @@
     MSG_ID_RO_FLOW_DATA = 0x36,                                                     ///< RO broadcast flow data
     MSG_ID_RO_CONDUCTIVITY_DATA = 0x37,                                             ///< RO broadcast conductivity data
     MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38,                                     ///< DD requests RO to start/stop delivering the purified water.
-
+    MSG_ID_RO_TEMPERATURE_DATA = 0x39,                                              ///< RO temperatures data broadcast
+    MSG_ID_RO_HEATER_DATA = 0x3A,                                                   ///< RO heater data broadcast
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B,                                      ///< DD piston pump data
+#endif
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in
@@ -133,7 +137,6 @@
     MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST = 0x8029,            ///< TD override request for blood pump measured motor speed
     MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST = 0x802A,            ///< TD override request for blood pump measured rotor speed
     MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST = 0x802B,                     ///< TD override request for blood pump rotor count
-    MSG_ID_TD_PERISTALTIC_PUMP_SET_SPEED_REQUEST = 0x802C,                          ///< TD set peristaltic pump set speed request
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                                        ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,                ///< DD tester log-in
@@ -185,6 +188,17 @@
     MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST = 0xA02E,                         ///< DD Heaters start override request
     MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F,                    ///< DD Valves open/close state override request
     MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030,                    ///< DD RO CAN Communication status override request
+    MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA031,                   ///< DD balance chamber data publish interval override request
+    MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST = 0xA032,                    ///< DD balance chamber switching frequency override request
+    MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST = 0xA033,                  ///< DD dialysate delivery in progress override request
+    MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST = 0xA034,              ///< DD dialysate delivery good to deliver override request
+    MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST = 0xA035,                 ///< DD heaters target temperature override request
+    MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST = 0xA036,                            ///< DD balancing chamber valve states override request
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA037,                   ///< DD piston pump data publish interval override request
+    MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA038,                     ///< DD piston pump start/stop override request
+#endif
+    MSG_ID_DD_BC_SWITCH_ONLY_START_STOP_OVERRIDE_REQUEST = 0xA039,                  ///< DD balancing chamber switch only start/stop override request
 
     MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000,                                        ///< First RO test message ID
     MSG_ID_RO_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_RO_TESTER_MESSAGE,                ///< RO tester log-in
@@ -212,6 +226,9 @@
     MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016,                          ///< RO conductivity sensor temperature override request
     MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017,                    ///< RO conductivity sensor read count override request
     MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018,                   ///< RO conductivity sensor error count override request
+    MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST = 0xB019,                                ///< RO temperature override request
+    MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A,                         ///< RO override request for filtered flow rate (mL/min)
+    MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B,                         ///< RO override request for filtered flow temperature (deg C)
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log