Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -33,13 +33,17 @@
 /// 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_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
+    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
@@ -60,9 +64,11 @@
     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)
+    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;