Index: DDDefs.h
===================================================================
diff -u -r78128d9126978673733e2e1b24e88ac72f6a3571 -r216279e6c972c98e198c0c3a0069fac0114ee89f
--- DDDefs.h	(.../DDDefs.h)	(revision 78128d9126978673733e2e1b24e88ac72f6a3571)
+++ DDDefs.h	(.../DDDefs.h)	(revision 216279e6c972c98e198c0c3a0069fac0114ee89f)
@@ -150,9 +150,12 @@
 /// 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_WET_SELF_TEST,                               ///< DD Pre-Gen WetSelf Test
+    DD_PRE_GEN_WAIT_FOR_FP_GEN = 0,                         ///< DD Pre-Gen wait for FP state.
+    DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK,            ///< DD Pre-Gen Dialysate hyrochamber fill check
     DD_PRE_GEN_DRY_BICART_INITIAL_FILL,                     ///< DD Pre-Gen DryBicart Initial Fill
+    DD_PRE_GEN_FILL_CHAMBER_F,                              ///< DD Pre-Gen Prime Chamber F
+    DD_PRE_GEN_PRIME_BICARB_LINE,                           ///< DD Pre-Gen Prime Bicarb line
+    DD_PRE_GEN_PRIME_ACID_LINE,                             ///< DD Pre-Gen Prime acid line
     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
 };
@@ -193,6 +196,8 @@
     DD_GEND_SPENT_CHAMBER_FILL_STATE,                           ///< Gen dialysate - spent chamber fill state
     DD_GEND_BICARB_CHAMBER_FILL_STATE,                          ///< Gen dialysate - bicarb chamber fill state
     DD_GEND_DIALYSATE_DELIVERY_PAUSE,                           ///< Gen dialysate - dialysate delivery pause state
+    DD_GEND_SPENT_CHAMBER_VALV_OPEN_STATE,                      ///< Gen dialysate - spent chamber vent open state
+    DD_GEND_PRIME_FLUID_DISCARD_STATE,                          ///< Gen dialysate - prime fluid discard 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
@@ -344,7 +349,8 @@
     DD_EVENT_SERVICE_RECORD_UPDATE,                                     ///< DD NVM Service Record Change Event
     DD_EVENT_INSTITUTIONAL_RECORD_UPDATE,                               ///< DD NVM Institutional Record Change Event
     DD_EVENT_USAGE_INFO_RECORD_UPDATE,                                  ///< DD NVM Usage Info Record Change Event
-    DD_EVENT_LAST = DD_EVENT_USAGE_INFO_RECORD_UPDATE,                  ///< DD last event in list
+    DD_EVENT_PRE_GEN_CHANGE,                                            ///< DD Pre Gen state change
+    DD_EVENT_LAST = DD_EVENT_PRE_GEN_CHANGE,                            ///< DD last event in list
     FP_EVENT_STARTUP,                                                   ///< FP startup event
     FP_EVENT_FIRST = FP_EVENT_STARTUP,                                  ///< FP first event in list
     FP_EVENT_OP_MODE_CHANGE,                                            ///< FP Op mode change event
@@ -491,6 +497,7 @@
 enum Spent_Chamber_Fill_Exec_States
 {
     SPENT_CHAMBER_FILL_STATE_START = 0,                            ///< Initial state of spent chamber fill
+    SPENT_CHAMBER_FILL_WAIT_PRESSURE_STABILIZE_STATE,              ///< Pressure Stabilization Wait state
     SPENT_CHAMBER_FILL_STATE1_FILL_START,                          ///< Spent chamber fill state 1 fill start state
     SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL,                        ///< Spent chamber fill state 1 dosing control
     SPENT_CHAMBER_FILL_STATE1_FILL_END,                            ///< Spent chamber fill state 1 fill end state
@@ -557,6 +564,20 @@
 };
 typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T;    ///< Type for dry bicart depressurize exec state enumeration
 
+/// Enumeration of Bicarb chamber pre gen fill exec states.
+enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States
+{
+    PRE_GEN_BICARB_CHAMBER_START_STATE = 0,                                  ///< Initial state of Chamber F fill
+    PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_START_STATE,                         ///< Dry bicart fill water start state while dialysate delivery
+    PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_END_STATE,                           ///< Dry bicart fill water end state while dialysate delivery
+    PRE_GEN_BICARB_CHAMBER_SUPPLY_STATE,                                     ///< Bicarb Chamber fill start state
+    PRE_GEN_BICARB_CHAMBER_PRESSURE_CHECK_STATE,                             ///< Bicarb Chamber pressure check start state
+    PRE_GEN_BICARB_SUPPLY_VENT_START_STATE,                                  ///< Bicarb Chamber supply vent cartridge and Chamber F start state
+    PRE_GEN_BICARB_SUPPLY_VENT_END_STATE,                                    ///< Bicarb Chamber supply vent cartridge and Chamber F end state
+    NUM_OF_PRE_GEN_BICARB_CHAMBER_FILL_EXEC_STATES                           ///< Number of Bicarb chamber fill state
+};
+typedef enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States BICARB_CHAMBER_PRE_GEN_FILL_EXEC_STATE_T;  ///< Type for bicarb chamber fill exec state enumeration
+
 /// Enumeration of conductivity sensors.
 enum Conductivity_Sensors
 {