Index: DDDefs.h
===================================================================
diff -u -r58634d072faa47e5291179e1e12bb807f24b8fe2 -r3505e8eedae62b0a856206a768d70df8d98ade54
--- DDDefs.h	(.../DDDefs.h)	(revision 58634d072faa47e5291179e1e12bb807f24b8fe2)
+++ DDDefs.h	(.../DDDefs.h)	(revision 3505e8eedae62b0a856206a768d70df8d98ade54)
@@ -332,18 +332,75 @@
  */
 
 /// Heaters exec states
-typedef enum Heaters_Exec_States
+enum Heaters_Exec_States
 {
     HEATER_EXEC_STATE_OFF = 0,                                          ///< Heater exec state off.
     HEATER_EXEC_STATE_RAMP_TO_TARGET,                                   ///< Heater exec state ramp to target.
     HEATER_EXEC_STATE_CONTROL_TO_TARGET,                                ///< Heater exec state control to target.
     HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET,                      ///< Heater exec state control to disinfect (heat) target.
     NUM_OF_HEATERS_STATE,                                               ///< Number of heaters state.
-} HEATERS_STATE_T;
+};
 
+typedef enum Heaters_Exec_States HEATERS_STATE_T;
+
 /**@}*/
 
 /**
+ *  @addtogroup Valves
+ *  @{
+ */
+
+/// Enumeration of valves.
+enum DD_Valves
+{
+    FIRST_HYD_VALVE = 0,                          ///< Start of Hydraulics valve group
+    D14_VALV = FIRST_HYD_VALVE,                   ///< Valve Hydraulics Outlet (D14)
+    D52_VALV,                                     ///< Valve Thermal Disinfect (D52)
+    D8_VALV,                                      ///< Valve Hydraulics Bypass (D8)
+    D54_VALV,                                     ///< Valve Rinse Port (D54)
+    D53_VALV,                                     ///< Valve Drain (D53)
+    D34_VALV,                                     ///< Valve Dialyzer Bypass (D34)
+    D64_VALV,                                     ///< Valve Purge 1 (D64)
+    D31_VALV,                                     ///< Valve Pressure Test (D31)
+    D65_VALV,                                     ///< Valve DryBcarb Inlet (D65)
+    D35_VALV,                                     ///< Valve Dialyzer Inlet (D35)
+    D40_VALV,                                     ///< Valve Dialyzer Outlet (D40)
+    D47_VALV,                                     ///< Valve Dialysate Out Purge 2 (D47)
+    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)
+    D25_VALV,                                     ///< Balancing chamber Valve 3 (D25)
+    D26_VALV,                                     ///< Balancing chamber Valve 7 (D26)
+    D24_VALV,                                     ///< Balancing chamber Valve 5 (D24)
+    D20_VALV,                                     ///< Balancing chamber Valve 6 (D20)
+    D21_VALV,                                     ///< Balancing chamber Valve 4 (D21)
+    D22_VALV,                                     ///< Balancing chamber Valve 8 (D22)
+    LAST_BC_VALVE = D22_VALV,                     ///< End of Balancing Chamber valve group
+    FIRST_UF_VALVE,                               ///< Start of Ultrafiltration valve group
+    D69_VALV = FIRST_UF_VALVE,                    ///< Ultrafiltration Valve 1 Inlet (D69)
+    D71_VALV,                                     ///< Ultrafiltration Valve 2 Inlet (D71)
+    D70_VALV,                                     ///< Ultrafiltration Valve 1 Outlet (D70)
+    D72_VALV,                                     ///< Ultrafiltration Valve 2 Outlet (D72)
+    LAST_UF_VALVE = D72_VALV,                     ///< End of Ultrafiltration valve group
+    DD_NUM_OF_VALVES                              ///< Number of valves
+};
+typedef enum DD_Valves DD_VALVES_T;
+
+/**@}*/
+
+/**
  *  @addtogroup BalancingChamber
  *  @{
  */
@@ -373,4 +430,20 @@
 
 /**@}*/
 
+/**
+ *  @addtogroup Ultrafiltraion
+ *  @{
+ */
+
+/// Enumeration of ultra filtration exec states.
+enum Ultra_filtration_Exec_States
+{
+    DD_UF_PAUSED = 0,                               ///< Ultrafiltration pasued state
+    DD_UF_RUNNING,                                  ///< Ultrafiltration running state
+    NUM_OF_UF_EXEC_STATES                           ///< Number of ultrafiltration exec states
+};
+typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T;  ///< Type for ultrafiltration exec state enumeration
+
+/**@}*/
+
 #endif