Index: MsgDefs.h
===================================================================
diff -u -r126eafbc531912f6e2e537ea7631ae98d413e670 -r874231cdcb60d39c066329611f4e5cf287809221
--- MsgDefs.h	(.../MsgDefs.h)	(revision 126eafbc531912f6e2e537ea7631ae98d413e670)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 874231cdcb60d39c066329611f4e5cf287809221)
@@ -89,8 +89,10 @@
     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
 #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
@@ -202,6 +204,8 @@
     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
 #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