Index: MsgDefs.h
===================================================================
diff -u -rda175684273b1709b2ea70334cb7af7c3698d558 -rf1bf9b68e5b701c465e1adc3e00097a6ddc976c5
--- MsgDefs.h	(.../MsgDefs.h)	(revision da175684273b1709b2ea70334cb7af7c3698d558)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f1bf9b68e5b701c465e1adc3e00097a6ddc976c5)
@@ -103,8 +103,11 @@
     MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47,                                       ///< UI ultrafiltration pause/resume request
     MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48,                                      ///< TD response to ultrafiltration pause/resume request
     MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x49,                                        ///< RO Gen Permeate data broadcast
+    MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A,                                  ///< DD Pre-gen dialysate mode data
+    MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B,                                 ///< DD Post-gen dialysate mode data
+    MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C,                                ///< 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
@@ -220,6 +223,11 @@
     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