Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r9e2a4a80080b685c1afc6283a0ed2b58dd5bd94a -r014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 9e2a4a80080b685c1afc6283a0ed2b58dd5bd94a)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db)
@@ -19,6 +19,7 @@
 #define __VALVES_H__
 
 #include "FPCommon.h"
+#include "FPDefs.h"
 
 /**
  *  @defgroup Valves Valves
@@ -28,23 +29,6 @@
  *  @{
  */
 
-/// Enumeration of valves.
-typedef enum Valves
-{
-    M4_VALV = 0,                                  ///< Valve (M4)
-    FIRST_VALVE = M4_VALV,                        ///< First valve
-    P39_VALV,                                     ///< Valve (P39)
-    P6_VALV,                                      ///< Valve (P6)
-    P11_VALV,                                     ///< Valve (P11)
-    P33_VALV,                                     ///< Valve (P33)
-    P34_VALV,                                     ///< Valve (P34)
-    P37_VALV,                                     ///< Valve (P37)
-    M7_VALV,                                      ///< Valve (M7)
-    P20_VALV,                                     ///< Valve (P20)
-    P43_VALV,                                     ///< Valve (P43)
-    NUM_OF_VALVES                                 ///< Number of valves
-} VALVES_T;
-
 /// Enumeration of available valve state names per valve type (from SA and DG SRS documents).
 typedef enum ValveStateNames
 {
@@ -58,7 +42,7 @@
 typedef struct
 {
     U16 valvesCmdState;                           ///< Commanded RO valve states (bits).
-    U08 valvesSensedState[ NUM_OF_VALVES ];       ///< Sensed RO valve states.
+    U08 valvesSensedState[ FP_NUM_OF_VALVES ];    ///< Sensed RO valve states.
 } RO_VALVES_DATA_T;
 #pragma pack(pop)
 
@@ -67,9 +51,9 @@
 void initValves( void );
 void execValves( void );
 
-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 );
+BOOL setValveState( FP_VALVES_T valve, VALVE_STATE_NAMES_T valveState );
+BOOL setValveStateDelayed( FP_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs );
+VALVE_STATE_NAMES_T getValveStateName( FP_VALVES_T valveID );
 
 BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message );
 BOOL testValveStateOverride( MESSAGE_T *message );