Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104 -r729fd5d3a3a2d38f4fd4eff8068925941731bfc0
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 729fd5d3a3a2d38f4fd4eff8068925941731bfc0)
@@ -37,16 +37,28 @@
     NUM_OF_VALVE_STATES                           ///< number of valve states
 } VALVE_STATE_NAMES_T;
 
+#define NUM_OF_DD_VALVES      ( ( LAST_DD_VALVE - FIRST_DD_VALVE ) + 1 )
+#define NUM_OF_IOFP_VALVES    ( ( LAST_FP_VALVE - FIRST_IO_VALVE ) + 1 )
+#define NUM_OF_IO_VALVES      ( ( LAST_IO_VALVE - FIRST_IO_VALVE ) + 1 )
+#define NUM_OF_FP_VALVES      ( ( LAST_FP_VALVE - FIRST_FP_VALVE ) + 1 )
+
 #pragma pack(push, 1)
 /// Valves publish structure
 typedef struct
 {
     U16 valvesStatus;                             ///< 2 way valves status.
     U08 valvesBCStatus;                           ///< Balancing chamber valves status.
-    U08 valvesUFStatus;                           ///< Ultrafiltration valves status.
-    U08 valvesSensedState[ DD_NUM_OF_VALVES ];       ///< DD valves sensed states.
+    U08 valveSPStatus;                            ///< Spare valves status.
+    U08 valvesSensedState[ LAST_DD_VALVE + 1 ];   ///< DD sensed valve states.
 } DD_VALVES_DATA_T;
 
+/// Valves publish structure
+typedef struct
+{
+    U16 valvesCmdState;                           ///< Commanded FP valve states (bits).
+    U08 valvesSensedState[ NUM_OF_IOFP_VALVES ];  ///< Sensed FP valve states (enumerations).
+} FP_VALVES_DATA_T;
+
 /// Balancing chamber valve states override structure
 typedef struct
 {
@@ -63,14 +75,17 @@
 BOOL setValveStateDelayed( DD_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs );
 VALVE_STATE_NAMES_T getValveStateName( DD_VALVES_T valveID );
 void setHydValvesStatetoClosedState( void );
-void setUFValvesStatetoClosedState( void );
 
 BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message );
 BOOL testValveStateOverride( MESSAGE_T *message );
 BOOL testBCValveStatesOverride( MESSAGE_T *message );
 BOOL testValveSensedStateOverride( MESSAGE_T *message );
 BOOL testValveOpenCloseStateOverride( MESSAGE_T *message );
 
+BOOL testIOFPValvesStatesPublishIntervalOverride( MESSAGE_T *message );
+BOOL testIOFPValveStateOverride( MESSAGE_T *message );
+BOOL testIOFPValveSensedStateOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif