Index: DDDefs.h
===================================================================
diff -u -r7028b30a24a23e2c3ca252e4e535fccdd2c852ac -r874231cdcb60d39c066329611f4e5cf287809221
--- DDDefs.h	(.../DDDefs.h)	(revision 7028b30a24a23e2c3ca252e4e535fccdd2c852ac)
+++ DDDefs.h	(.../DDDefs.h)	(revision 874231cdcb60d39c066329611f4e5cf287809221)
@@ -32,7 +32,9 @@
     DD_MODE_SERV,                       ///< Service mode
     DD_MODE_INIT,                       ///< Initialization & POST mode
     DD_MODE_STAN,                       ///< Standby mode
+    DD_MODE_PREG,                       ///< Dialysate Pre-Generation mode
     DD_MODE_GEND,                       ///< Generate Dialysate mode
+    DD_MODE_POSG,                       ///< Post Dialysate Generation mode
     DD_MODE_HEAT,                       ///< Heat Disinfect mode
     DD_MODE_HCOL,                       ///< Heat Disinfect cooling mode
     DD_MODE_ROPS,                       ///< RO permeate sample mode
@@ -116,6 +118,22 @@
 /**@}*/
 
 /**
+ *  @addtogroup DDPreGenDialysateMode
+ *  @{
+ */
+
+/// Enumeration of Pre-Gen Dialysate mode states.
+enum DD_Pre_Gen_Dialysate_States
+{
+    DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0,        ///< DD Pre-Gen Dialysate hyrochamber fill check
+    DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND,                     ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition
+    NUM_OF_DD_PRE_GEN_DIALYSATE_STATES                      ///< Number of Pre-Gen Dialysate mode states
+};
+typedef enum DD_Pre_Gen_Dialysate_States DD_PRE_GEN_DAILYSATE_STATE_T;  ///< Type for DD Pre-Gen Dialysate states enumeration
+
+/**@}*/
+
+/**
  *  @addtogroup DDGenDialysateMode
  *  @{
  */
@@ -156,6 +174,22 @@
 /**@}*/
 
 /**
+ *  @addtogroup DDPostGenDialysateMode
+ *  @{
+ */
+
+/// Enumeration of Post Gen Dialysate mode states.
+enum DD_Post_Gen_Dialysate_States
+{
+    DD_POST_GEN_DIALYSATE_STATE_START = 0,                  ///< DD Post-Gen Dialysate state start
+    DD_POST_GEN_DIALYSATE_STATE_COMPLETE,                   ///< DD Post-Gen Dialysate complete state
+    NUM_OF_DD_POST_GEN_DIALYSATE_STATES                     ///< Number of Post-Gen Dialysate mode states
+};
+typedef enum DD_Post_Gen_Dialysate_States DD_POST_GEN_DAILYSATE_STATE_T;  ///< Type for DD Post-Gen Dialysate states enumeration
+
+/**@}*/
+
+/**
  *  @addtogroup DDHeatDisinfectMode
  *  @{
  */
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