Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -rd1377c677d8a9fc576f941f413ae3b6af6f50776 -r3284125031072078a4b61a83d36bff419a770918
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision d1377c677d8a9fc576f941f413ae3b6af6f50776)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 3284125031072078a4b61a83d36bff419a770918)
@@ -63,19 +63,26 @@
     DD_STANDBY_MODE_STATE_PAUSE = 1                             # Pause state
     NUM_OF_DD_STANDBY_MODE_STATES = 2                           # Number of standby mode states
 
+@unique
+class DDPreGenDialysateStates(DialinEnum):
+    DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0,            # DD Pre-Gen Dialysate hyrochamber fill check
+    DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND = 1                      # DD Pre-Gen Dialysate Wait for Gen Dialysate state transition
+    NUM_OF_DD_PRE_GEN_DIALYSATE_STATES = 2                      # Number of Pre-Gen Dialysate mode states
 
 @unique
 class DDGenDialysateModeStates(DialinEnum):
     DD_GEND_STATE_START = 0                                     # Gen dialysate start state
-    DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE = 1             # Gen dialysate Hydraulic chamber water inlet check state
-    DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE = 2                # Gen dialysate Hydraulic chamber pressure check state
-    DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE = 3            # Gen dialysate fresh dialysate pressure check state
-    DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE = 4            # Gen dialysate spent dialysate pressure check state
-    DD_GEND_PRODUCE_DIALYSATE_STATE = 5                         # Gen dialysate - produce dialysate state
-    DD_GEND_DIALYSATE_DELIVERY_STATE = 6                        # Gen dialysate - deliver dialysate state
-    DD_GEND_DIALYSATE_DELIVERY_PAUSE = 7                        # Gen dialysate - dialysate delivery pause state
-    NUM_OF_DD_GEND_MODE_STATES = 8                              # Number of gen dialysate states
+    DD_GEND_DIALYSATE_BYPASS_STATE = 1                          # Gen dialysate - Bypass dialysate state
+    DD_GEND_DIALYSATE_DELIVERY_STATE = 2                        # Gen dialysate - deliver dialysate state
+    DD_GEND_DIALYSATE_DELIVERY_PAUSE = 3                        # Gen dialysate - dialysate delivery pause state
+    DD_GEND_ISOLATED_UF_STATE = 4                               # Gen dialysate - Isolated ultrafiltration state
+    NUM_OF_DD_GEND_MODE_STATES = 5                              # Number of gen dialysate states
 
+@unique
+class DDPostGenDialysateState(DialinEnum):
+    DD_POST_GEN_DIALYSATE_STATE_START = 0                      # DD Post-Gen Dialysate state start
+    DD_POST_GEN_DIALYSATE_STATE_COMPLETE = 1                   # DD Post-Gen Dialysate complete state
+    NUM_OF_DD_POST_GEN_DIALYSATE_STATES = 2                    # Number of Post-Gen Dialysate mode states
 
 @unique
 class DDEventList(DialinEnum):