Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r847478dd75aac2edfe27df454ac5a644b6f30040
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 847478dd75aac2edfe27df454ac5a644b6f30040)
@@ -30,43 +30,49 @@
 
 // ********** public definitions **********
 
-/// Enumeration of available valve state names per valve type (from SA and DG SRS documents).
-typedef enum ValveStateNames
-{
-    VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, and VSP
-    VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, and VSP
-    VALVE_STATE_OPEN_C_TO_NO,   ///< Open Common to Normally Open valve state, used only for VPd
-    VALVE_STATE_DRAIN_C_TO_NC,  ///< Drain Common to Normally Closed valve state, used only for VPd
-    VALVE_STATE_NOFILL_C_TO_NO, ///< No Fill Common to Normally Open valve state, used only for VPo
-    VALVE_STATE_FILL_C_TO_NC,   ///< Fill Common to Normally Closed valve state, used only for VPo
-    VALVE_STATE_DRAIN_C_TO_NO,  ///< Drain Common to Normally Open valve state, used only for VDr and VRc
-    VALVE_STATE_RECIRC_C_TO_NC, ///< Recirculate Common to Normally Closed valve state, used only for VDr and VRc
-    VALVE_STATE_R1_C_TO_NO,     ///< Reservoir 1 Common to Normally Open valve state, used only for VRo and VRi
-    VALVE_STATE_R1_C_TO_NC,     ///< Reservoir 1 Common to Normally Closed valve state, used only for VRd and VRf
-    VALVE_STATE_R2_C_TO_NO,     ///< Reservoir 2 Common to Normally Open valve state, used only for VRd and VRf
-    VALVE_STATE_R2_C_TO_NC,     ///< Reservoir 2 Common to Normally Closed valve state, used only for VRo and VRi
-    NUM_OF_VALVE_STATES         ///< number of valve states
-} VALVE_STATE_NAMES_T;
+/// Enumeration of available valve state names per valve type (from SA and DG SRS documents).
+typedef enum ValveStateNames
+{
+    VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
+    VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
+#ifndef V_2_SYSTEM
+    VALVE_STATE_OPEN_C_TO_NC,   ///< Open Common to Normally Closed valve state, used only for VPd
+#else
+    VALVE_STATE_OPEN_C_TO_NO,   ///< Open Common to Normally Open valve state, used only for VPd
+    VALVE_STATE_DRAIN_C_TO_NC,  ///< Drain Common to Normally Closed valve state, used only for VPd
+#endif
+    VALVE_STATE_NOFILL_C_TO_NO, ///< No Fill Common to Normally Open valve state, used only for VPo
+    VALVE_STATE_FILL_C_TO_NC,   ///< Fill Common to Normally Closed valve state, used only for VPo
+    VALVE_STATE_DRAIN_C_TO_NO,  ///< Drain Common to Normally Open valve state, used only for VDr and VRc. It is also used for VPd in V3
+    VALVE_STATE_RECIRC_C_TO_NC, ///< Recirculate Common to Normally Closed valve state, used only for VDr and VRc
+    VALVE_STATE_R1_C_TO_NO,     ///< Reservoir 1 Common to Normally Open valve state, used only for VRo and VRi
+    VALVE_STATE_R1_C_TO_NC,     ///< Reservoir 1 Common to Normally Closed valve state, used only for VRd and VRf
+    VALVE_STATE_R2_C_TO_NO,     ///< Reservoir 2 Common to Normally Open valve state, used only for VRd and VRf
+    VALVE_STATE_R2_C_TO_NC,     ///< Reservoir 2 Common to Normally Closed valve state, used only for VRo and VRi
+    NUM_OF_VALVE_STATES         ///< number of valve states
+} VALVE_STATE_NAMES_T;
+
+/// Enumeration of valves.
+typedef enum Valves
+{
+    VRF = 0,          ///< Valve Reservoir Fill
+    VRI,              ///< Valve Reservoir Inlet
+    VRD,              ///< Valve Reservoir Drain
+    VRO,              ///< Valve Reservoir Outlet
+    VPO,              ///< Valve Pressure Outlet
+    VBF,              ///< Valve Bypass Filter
+    VRC,              ///< Valve Recirculate
+    VDR,              ///< Valve Drain
+    VPI,              ///< Valve Pressure Inlet
+    VSP,              ///< Valve Sampling Port
+#ifndef V_2_SYSTEM
+    VRD1,             ///< Valve Reservoir 1 Drain
+    VRD2,             ///< Valve Reservoir 2 Drain
+#endif
+    VPD,              ///< Valve Production Drain
+    NUM_OF_VALVES     ///< Number of valves
+} VALVES_T;
 
-/// Enumeration of valves.
-typedef enum Valves
-{
-    VRF = 0,          ///< Valve Reservoir Fill
-    VRI,              ///< Valve Reservoir Inlet
-    VRD,              ///< Valve Reservoir Drain
-    VRO,              ///< Valve Reservoir Outlet
-    VPO,              ///< Valve Pressure Outlet
-    VBF,              ///< Valve Bypass Filter
-    VRC,              ///< Valve Recirculate
-    VDR,              ///< Valve Drain
-    VPI,              ///< Valve Pressure Inlet
-    VSP,              ///< Valve Sampling Port
-    VR1,              ///< Valve Reservoir 1 (spare for now including DG FPGA, as valve is of passive air relief type)
-    VR2,              ///< Valve Reservoir 2 (spare for now including DG FPGA, as valve is of passive air relief type)
-    VPD,              ///< Valve Production Drain
-    NUM_OF_VALVES     ///< Number of valves
-} VALVES_T;
-
 // ********** public function prototypes **********
 
 void initValves( void );