Index: DDDefs.h
===================================================================
diff -u -r66713c0645b236b64774d067036d1734cec85c65 -r5d3157a74b67aa246ecb6eb0f250f194c2206454
--- DDDefs.h	(.../DDDefs.h)	(revision 66713c0645b236b64774d067036d1734cec85c65)
+++ DDDefs.h	(.../DDDefs.h)	(revision 5d3157a74b67aa246ecb6eb0f250f194c2206454)
@@ -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
 };
@@ -556,6 +559,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
 {