Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r2b9d10664884e9b20d391cc3178d3c85347cdf2c -rcff72ec53660ec3ff6775c0508e3c721240ffba2
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 2b9d10664884e9b20d391cc3178d3c85347cdf2c)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision cff72ec53660ec3ff6775c0508e3c721240ffba2)
@@ -46,16 +46,16 @@
 static U32 pendingValveStateChangeCountDowns[ NUM_OF_VALVES ];                                                      ///< Delayed (pending) valve state change count down timers (in task intervals).
 
 static OVERRIDE_U32_T valveStates[ NUM_OF_VALVES ];                                                                 ///< Currently commanded valves states.
-static OVERRIDE_U32_T valveSensedStates[ NUM_OF_VALVES ];                                                           ///< Valve sensed state override.
+static OVERRIDE_U32_T valveSensedStates[ NUM_OF_VALVES ];                                                           ///< Valve sensed states override.
 static OVERRIDE_U32_T valvesStatesPublishInterval = { VALVES_STATE_PUB_INTERVAL, VALVES_STATE_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms/task interval) at which to publish valves state to CAN bus.
 
 // ********** private function prototypes **********
 
 static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveStateName );
-static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveStateName);
+static U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName );
 static U16 fromU32ArrayToU16( void );
 static void publishValvesStates( void );
-static U32 getValveState( U32 valveID );
+static U32 getValveState( U32 valveID );
 
 /*********************************************************************//**
  * @brief
@@ -82,7 +82,7 @@
         valveSensedStates[ i ].data            = DEENERGIZED;
         valveSensedStates[ i ].ovInitData      = DEENERGIZED;
         valveSensedStates[ i ].ovData          = DEENERGIZED;
-        valveSensedStates[ i ].override        = OVERRIDE_RESET;
+        valveSensedStates[ i ].override        = OVERRIDE_RESET;
     }
 
     valveStateMismatchCounter = 0;
@@ -134,8 +134,8 @@
 
     // Set valves states (via FPGA) to currently commanded states
     commandedValvesStates = fromU32ArrayToU16();
-    setFPGAValveStates( commandedValvesStates );
-
+    setFPGAValveStates( commandedValvesStates );
+
     // Publish valve states on interval
     publishValvesStates();
 }
@@ -454,15 +454,6 @@
             case VRF:
                 name = ( DEENERGIZED == valveState ? VALVE_STATE_R2_C_TO_NO : VALVE_STATE_R1_C_TO_NC );
                 break;
-        }
-
-        if ( OVERRIDE_KEY == valveSensedStates[ valveID ].override )
-        {
-            valveSensedStates[ valveID ].ovData = (U32)name;
-        }
-        else
-        {
-            valveSensedStates[ valveID ].data = (U32)name;
         }
     }
     else
@@ -492,7 +483,7 @@
 
         for ( i = 0; i < NUM_OF_VALVES; i++ )
         {
-            data.valvesSensedState[ i ] = getU32OverrideValue( &valveSensedStates[ i ] );
+            data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i );
         }
 
         broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_VALVES_DATA_T ) );
@@ -523,7 +514,7 @@
     }
 
     return valveState;
-}
+}
 
 
 /*************************************************************************