Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r986147effa2865d32f37c8c4c2b8b396eda847e0 -r425de1be48f86645589caea4ac832c58655f75b2
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 986147effa2865d32f37c8c4c2b8b396eda847e0)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 425de1be48f86645589caea4ac832c58655f75b2)
@@ -30,20 +30,22 @@
 
 // ********** public definitions **********
 
-/// Enumeration of valve states
+/// Enumeration of available valve states per valve type (from SA and DG SRS documents)
 typedef enum ValveStates
 {
-    VALVE_STATE_OPEN = 0,    ///< Open valve state
-    VALVE_STATE_CLOSED,      ///< Closed valve state
-    VALVE_STATE_FILL,        ///< Fill valve state
-    VALVE_STATE_NOFILL,      ///< No Fill valve state
-    VALVE_STATE_DRAIN,       ///< Drain valve state
-    VALVE_STATE_RECIRCULATE, ///< Recirculate valve state
-    VALVE_STATE_R1_C_TO_NO,  ///< Reservoir 1 Common to Normally Open valve state
-    VALVE_STATE_R1_C_TO_NC,  ///< Reservoir 1 Common to Normally Closed valve state
-    VALVE_STATE_R2_C_TO_NO,  ///< Reservoir 2 Common to Normally Open valve state
-    VALVE_STATE_R2_C_TO_NC,  ///< Reservoir 2 Common to Normally Closed valve state
-    NUM_OF_VALVE_STATES      ///< Number of valve states
+    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_STATES_T;
 
 /// Enumeration of valves
@@ -65,18 +67,15 @@
 
 // ********** public function prototypes **********
 
-void initValves( void );                                              // Initialize the valves module
-void execValves( void );                                              // Execute the valves driver
+void initValves( void );                                              // initialize the valves driver
+void execValves( void );                                              // execute the valves driver
 
-// SELF_TEST_STATUS_T execValvesTest( void ); // TODO: Add back in for POST on DG valves
+BOOL setValveState( VALVES_T valve, VALVE_STATES_T valveState );      // set valve's state to valveState
+DATA_ARRAY_GET_PROTOTYPE( U32, getValveState, valveID );              // get valve state for given valve
 
-BOOL setValveState( VALVES_T valve, VALVE_STATES_T valveState ); // Set valve's state to valveState
-
-DATA_ARRAY_GET_PROTOTYPE( F32, getValveState, valveID );   // Get valveID's state
-
 BOOL testSetValvesStatesPublishIntervalOverride( U32 value );
 BOOL testResetValvesStatesPublishIntervalOverride( void );
-BOOL testSetValveStateOverride( U32 valve, F32 state );
+BOOL testSetValveStateOverride( U32 valve, U32 state );
 BOOL testResetValveStateOverride( U32 valveID );
 
 /**@}*/