Index: DDDefs.h
===================================================================
diff -u -r7028b30a24a23e2c3ca252e4e535fccdd2c852ac -raebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc
--- DDDefs.h	(.../DDDefs.h)	(revision 7028b30a24a23e2c3ca252e4e535fccdd2c852ac)
+++ DDDefs.h	(.../DDDefs.h)	(revision aebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc)
@@ -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
  *  @{
  */
@@ -124,13 +142,10 @@
 enum DD_GenD_Mode_States
 {
     DD_GEND_STATE_START = 0,                                    ///< Gen dialysate start state
-    DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE,                ///< Gen dialysate Hydraulic chamber water inlet check state
-    DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE,                   ///< Gen dialysate Hydraulic chamber pressure check state
-    DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE,               ///< Gen dialysate fresh dialysate pressure check state
-    DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE,               ///< Gen dialysate spent dialysate pressure check state
-    DD_GEND_PRODUCE_DIALYSATE_STATE,                            ///< Gen dialysate - produce dialysate state
+    DD_GEND_DIALYSATE_BYPASS_STATE,                             ///< Gen dialysate - Bypass dialysate state
     DD_GEND_DIALYSATE_DELIVERY_STATE,                           ///< Gen dialysate - deliver dialysate state
     DD_GEND_DIALYSATE_DELIVERY_PAUSE,                           ///< Gen dialysate - dialysate delivery pause state
+    DD_GEND_ISOLATED_UF_STATE,                                  ///< Gen dialysate - Isolated ultrafiltration state
     NUM_OF_DD_GEND_MODE_STATES                                  ///< Number of gen dialysate states
 };
 typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T;          ///< Type for DD gen dialysate mode states enumeration
@@ -156,6 +171,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
  *  @{
  */