Index: MsgDefs.h
===================================================================
diff -u -rce24cac0414bc1f8c431dc2deb007f51364a5d9f -r61092c2225f7140aa6562a7ed79850d8adea47bc
--- MsgDefs.h	(.../MsgDefs.h)	(revision ce24cac0414bc1f8c431dc2deb007f51364a5d9f)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 61092c2225f7140aa6562a7ed79850d8adea47bc)
@@ -89,8 +89,11 @@
     MSG_ID_RO_TEMPERATURE_DATA = 0x39,                                              ///< RO temperatures data broadcast
     MSG_ID_RO_HEATER_DATA = 0x3A,                                                   ///< RO heater data broadcast
     MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x3B,                                        ///< RO Gen Permeate data broadcast
+    MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x3C,                                  ///< DD Pre-gen dialysate mode data
+    MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x3D,                                 ///< DD Post-gen dialysate mode data
+    MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x3E,                                ///< DD Pre Generate dialysate request data coming from TD.
 #ifdef __PUMPTEST__
-    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B,                                      ///< DD piston pump data
+    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
@@ -138,6 +141,7 @@
     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_TMP_PRESSURE_OVERRIDE_REQUEST = 0x802C,                               ///< TD override request for TMP pressure
 
     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
@@ -200,6 +204,12 @@
     MSG_ID_DD_ACID_DOSING_VOLUME_OVERRIDE_REQUEST = 0xA039,                         ///< DD acid dosing volume override request
     MSG_ID_DD_BICARB_DOSING_VOLUME_OVERRIDE_REQUEST = 0xA03A,                       ///< DD bicarb dosing volume override request
     MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST = 0xA03B,                            ///< DD GenD execution state override request
+    MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C,                          ///< DD heaters PWM period override request
+    MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D,                 ///< DD Pre generate dialysate mode data publish interval override request
+    MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E,                ///< DD Post generate dialysate mode data publish interval override request
+    MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F,               ///< DD start pre-gen dialysate mode override request
+    MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040,                ///< DD stop pre-gen dialysate mode override request
+    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041,                    ///< DD stop gen dialysate mode override request
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00,                   ///< DD piston pump data publish interval override request
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01,                     ///< DD piston pump start/stop override request