Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r24bf8d1d7a248f907a5c60496a764ae1ef9876f6 -ra570e1827563618b8d26082eb63994f9f65adc17
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 24bf8d1d7a248f907a5c60496a764ae1ef9876f6)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision a570e1827563618b8d26082eb63994f9f65adc17)
@@ -22,42 +22,50 @@
 
 /**
  *  @defgroup Valves Valves
- *  @brief Valves driver module. Controls valves.
+ *  @brief Valves driver module. Controls all hydraulics valves, balancing chamber and
+ *  ultrafiltration valves through FPGA Interface.
  *
  *  @addtogroup Valves
  *  @{
- */
+ */
+
 /// Enumeration of valves.
 typedef enum Valves
 {
-    VDR = 0,                                      ///< Valve Drain
-    VTD,                                          ///< Valve IO direct Inlet
+    FIRST_HYD_VALVE = 0,                          ///< Start of Hydraulics valve group
+    VDR = FIRST_HYD_VALVE,                        ///< Valve Drain
+    VTD,                                          ///< Valve Thermal Disinfect
     VHB,                                          ///< Valve Hydraulics Bypass
-    VRP,                                          ///< Valve concentrate Shunt
+    VRP,                                          ///< Valve Rinse Port
     VHO,                                          ///< Valve Hydraulics Outlet
     VDB1,                                         ///< Valve DryBcarb Inlet
-    VP1,                                          ///< Valve BC Gas Chamber Vent
-    VPT,                                          ///< Valve Dialysate Sample
-    VDB2,                                         ///< Valve Dialysate Bypass
-    VDI,                                          ///< Valve Dialysate Inlet
-    VDO,                                          ///< Valve Dialysate Outlet
-    VP2,                                          ///< Valve Balance Air Separation Vent
+    VP1,                                          ///< Valve Purge 1
+    VPT,                                          ///< Valve Pressure Test
+    VDB2,                                         ///< Valve Dialyzer Bypass
+    VDI,                                          ///< Valve Dialyzer Inlet
+    VDO,                                          ///< Valve Dialyzer Outlet
+    VP2,                                          ///< Valve Dialysate Out Purge 2
     VHI,                                          ///< Valve Hydraulics Inlet
+    LAST_HYD_VALVE = VHI,                         ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
     RSRVD_SPACE3,                                 ///< This space has been reserved
-    BCV1,                                         ///< Balancing chamber Valve 1
+    FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
+    BCV1 = FIRST_BC_VALVE,                        ///< Balancing chamber Valve 1
     BCV2,                                         ///< Balancing chamber Valve 2
     BCV3,                                         ///< Balancing chamber Valve 3
     BCV4,                                         ///< Balancing chamber Valve 4
     BCV5,                                         ///< Balancing chamber Valve 5
     BCV6,                                         ///< Balancing chamber Valve 6
     BCV7,                                         ///< Balancing chamber Valve 7
     BCV8,                                         ///< Balancing chamber Valve 8
-    UFI1,                                         ///< Ultrafiltration Valve 1 Inlet
+    LAST_BC_VALVE = BCV8,                         ///< End of Balancing Chamber valve group
+    FIRST_UF_VALVE,                               ///< Start of Ultrafiltration valve group
+    UFI1 = FIRST_UF_VALVE,                        ///< Ultrafiltration Valve 1 Inlet
     UFI2,                                         ///< Ultrafiltration Valve 2 Inlet
     UFO1,                                         ///< Ultrafiltration Valve 1 Outlet
-    UFO2,                                         ///< Ultrafiltration Valve 2 Outlet
+    UFO2,                                         ///< Ultrafiltration Valve 2 Outlet
+    LAST_UF_VALVE = UFO2,                         ///< End of Ultrafiltration valve group
     NUM_OF_VALVES                                 ///< Number of valves
 } VALVES_T;
 
@@ -89,12 +97,9 @@
 BOOL setValveStateDelayed( VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs );
 VALVE_STATE_NAMES_T getValveStateName( VALVES_T valveID );
 
-BOOL testSetValvesStatesPublishIntervalOverride( U32 value );
-BOOL testResetValvesStatesPublishIntervalOverride( void );
-BOOL testSetValveStateOverride( U32 valve, U32 state );
-BOOL testResetValveStateOverride( U32 valveID );
-BOOL testSetValveSensedStateOverride( U32 valve, U32 status );
-BOOL testResetValveSensedStateOverride( U32 valve );
+BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message );
+BOOL testValveStateOverride( MESSAGE_T *message );
+BOOL testValveSensedStateOverride( MESSAGE_T *message );
 
 /**@}*/