Index: DDDefs.h
===================================================================
diff -u -r3505e8eedae62b0a856206a768d70df8d98ade54 -r7fc2917f51b089d21122bfd4869039df8a13386f
--- DDDefs.h	(.../DDDefs.h)	(revision 3505e8eedae62b0a856206a768d70df8d98ade54)
+++ DDDefs.h	(.../DDDefs.h)	(revision 7fc2917f51b089d21122bfd4869039df8a13386f)
@@ -173,8 +173,10 @@
     DD_GEND_STATE_START = 0,                                    ///< Gen dialysate start 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
+    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
     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
@@ -320,6 +322,10 @@
     DD_EVENT_D46_LEVL_CHANGE,                                           ///< DD spent dialysate air seperation level change event
     DD_EVENT_TD_COMMUNICATION_LOSS,                                     ///< DD TD communication loss
     DD_EVENT_TEMPERATURE_DRIFT,                                         ///< DD dialysate temperature drift
+    DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST,                                ///< DD blood leak zeroing request
+    DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED,                               ///< DD blood leak zeroing required
+    DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES,                ///< DD blood leak number of setpoint check failures
+    DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT,                               ///< DD blood leak self test result
     NUM_OF_DD_EVENT_IDS                                                 ///< Total number of DD events
 };
 typedef enum DD_Event_List DD_EVENT_ID_T;                               ///< Type for DD event list enumeration
@@ -369,15 +375,9 @@
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
     // For standalone DD system, may need to control IO valve.
     DD_M4_VALV,                                   ///< Valve Water Inlet (M4)
-#ifdef __PUMPTEST__
-    UF1,                                          ///< UF1 valve
-    UF2,                                          ///< UF2 valve
-    LAST_HYD_VALVE = UF2,                         ///< End of Hydraulics valve of group
-#else
     LAST_HYD_VALVE = DD_M4_VALV,                  ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
-#endif
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)
     D19_VALV,                                     ///< Balancing chamber Valve 2 (D19)
@@ -411,9 +411,11 @@
     BAL_CHAMBER_STATE_START = 0,                            ///< Initial state of balancing chamber
     BAL_CHAMBER_STATE1_FILL_START,                          ///< Balancing chamber state 1 fill start state
     BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL,            ///< Balancing Chamber state 1 Bicarb and acid dosing control state
+    BAL_CHAMBER_STATE1_VALVES_CLOSE,                        ///< Balancing Chamber state 1 valves close state
     BAL_CHAMBER_STATE1_FILL_END,                            ///< Balancing Chamber state 1 fill end state
     BAL_CHAMBER_STATE2_FILL_START,                          ///< Balancing chamber state 2 fill start state
     BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL,            ///< Balancing Chamber state 2 Bicarb and acid dosing control state
+    BAL_CHAMBER_STATE2_VALVES_CLOSE,                        ///< Balancing Chamber state 2 valves close state
     BAL_CHAMBER_STATE2_FILL_END,                            ///< Balancing Chamber state 2 fill end state
     NUM_OF_BAL_CHAMBER_EXEC_STATES                          ///< Number of balancing chamber states
 };
@@ -446,4 +448,25 @@
 
 /**@}*/
 
+/**
+ *  @addtogroup SpentChamberFill
+ *  @{
+ */
+
+/// Enumeration of Spent chamber fill exec states.
+enum Spent_Chamber_Fill_Exec_States
+{
+    SPENT_CHAMBER_FILL_STATE_START = 0,                            ///< Initial state of spent chamber fill
+    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
+    SPENT_CHAMBER_FILL_STATE2_FILL_START,                          ///< Spent chamber fill state 2 fill start state
+    SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL,                        ///< Spent chamber fill state 2 dosing control
+    SPENT_CHAMBER_FILL_STATE2_FILL_END,                            ///< Spent chamber fill state 2 fill end state
+    NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES                          ///< Number of spent chamber fill states
+};
+typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for spent chamber fill exec state enumeration
+
+/**@}*/
+
 #endif