Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r322747d530c1b8205be257557e53dcfe9caad50a -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 322747d530c1b8205be257557e53dcfe9caad50a)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104)
@@ -29,52 +29,6 @@
  *  @{
  */
 
-/// Enumeration of valves.
-typedef enum 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)
-    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 = 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
-    NUM_OF_VALVES                                 ///< Number of valves
-} VALVES_T;
-
 /// Enumeration of available valve state names per valve type (from SA and DD SRS documents).
 typedef enum ValveStateNames
 {
@@ -90,7 +44,7 @@
     U16 valvesStatus;                             ///< 2 way valves status.
     U08 valvesBCStatus;                           ///< Balancing chamber valves status.
     U08 valvesUFStatus;                           ///< Ultrafiltration valves status.
-    U08 valvesSensedState[ NUM_OF_VALVES ];       ///< DD valves sensed states.
+    U08 valvesSensedState[ DD_NUM_OF_VALVES ];       ///< DD valves sensed states.
 } DD_VALVES_DATA_T;
 
 /// Balancing chamber valve states override structure
@@ -105,9 +59,9 @@
 void initValves( void );
 void execValves( void );
 
-BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState );
-BOOL setValveStateDelayed( VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs );
-VALVE_STATE_NAMES_T getValveStateName( VALVES_T valveID );
+BOOL setValveState( DD_VALVES_T valve, VALVE_STATE_NAMES_T valveState );
+BOOL setValveStateDelayed( DD_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs );
+VALVE_STATE_NAMES_T getValveStateName( DD_VALVES_T valveID );
 void setHydValvesStatetoClosedState( void );
 void setUFValvesStatetoClosedState( void );