Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r48c75a394c56b82886760e9a136b638edecf7572 -rbce6e6d1cfb6e8a0b186419416460ead3a44e5e1
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 48c75a394c56b82886760e9a136b638edecf7572)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision bce6e6d1cfb6e8a0b186419416460ead3a44e5e1)
@@ -33,38 +33,38 @@
 typedef enum Valves
 {
     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 Rinse Port
-    VHO,                                          ///< Valve Hydraulics Outlet
-    VDB1,                                         ///< Valve DryBcarb Inlet
-    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
-    VWI,                                          ///< Valve Water Inlet
+    VDR = FIRST_HYD_VALVE,                        ///< Valve Drain (D53)
+    VTD,                                          ///< Valve Thermal Disinfect (D52)
+    VHB,                                          ///< Valve Hydraulics Bypass (D8)
+    VRP,                                          ///< Valve Rinse Port (D54)
+    VHO,                                          ///< Valve Hydraulics Outlet (D14)
+    VDB1,                                         ///< Valve DryBcarb Inlet (D65)
+    VP1,                                          ///< Valve Purge 1 (D64)
+    VPT,                                          ///< Valve Pressure Test (D31)
+    VDB2,                                         ///< Valve Dialyzer Bypass (D34)
+    VDI,                                          ///< Valve Dialyzer Inlet (D35)
+    VDO,                                          ///< Valve Dialyzer Outlet (D40)
+    VP2,                                          ///< Valve Dialysate Out Purge 2 (D47)
+    VHI,                                          ///< Valve Hydraulics Inlet (D3)
+    VWI,                                          ///< Valve Water Inlet (M4)
     LAST_HYD_VALVE = VWI,                         ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
     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
+    BCV1 = FIRST_BC_VALVE,                        ///< Balancing chamber Valve 1 (D23)
+    BCV2,                                         ///< Balancing chamber Valve 2 (D19)
+    BCV3,                                         ///< Balancing chamber Valve 3 (D25)
+    BCV4,                                         ///< Balancing chamber Valve 4 (D21)
+    BCV5,                                         ///< Balancing chamber Valve 5 (D24)
+    BCV6,                                         ///< Balancing chamber Valve 6 (D20)
+    BCV7,                                         ///< Balancing chamber Valve 7 (D26)
+    BCV8,                                         ///< Balancing chamber Valve 8 (D22)
     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
+    UFI1 = FIRST_UF_VALVE,                        ///< Ultrafiltration Valve 1 Inlet (D69)
+    UFI2,                                         ///< Ultrafiltration Valve 2 Inlet (D71)
+    UFO1,                                         ///< Ultrafiltration Valve 1 Outlet (D70)
+    UFO2,                                         ///< Ultrafiltration Valve 2 Outlet (D72)
     LAST_UF_VALVE = UFO2,                         ///< End of Ultrafiltration valve group
     NUM_OF_VALVES                                 ///< Number of valves
 } VALVES_T;
@@ -96,10 +96,13 @@
 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 );
+void setHydValvesStatetoClosedState( void );
+void setUFValvesStatetoClosedState( void );
 
 BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message );
 BOOL testValveStateOverride( MESSAGE_T *message );
 BOOL testValveSensedStateOverride( MESSAGE_T *message );
+BOOL testValveOpenCloseStateOverride( MESSAGE_T *message );
 
 /**@}*/