Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r4504a56cb0265c075d7ec6f38f2a7c7dcdccb630 -refd5f3144ddaaa697621e0cd08446aa501534a1f
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 4504a56cb0265c075d7ec6f38f2a7c7dcdccb630)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision efd5f3144ddaaa697621e0cd08446aa501534a1f)
@@ -212,7 +212,7 @@
     // flag IOFP valves that are currently commanded to be energized
     for ( i = FIRST_IO_VALVE; i <= LAST_FP_VALVE; i++ )
     {
-        commandedIOFPValveStates |= ( getValveState( i ) == ENERGIZED ? 0x01 << ( i - FIRST_IO_VALVE ) : 0 );
+        commandedIOFPValveStates |= ( getValveState( i ) == ENERGIZED ? 0x0001 << ( i - FIRST_IO_VALVE ) : 0 );
     }
 }
 
@@ -424,7 +424,7 @@
     DD_VALVES_T valve;
 
     // Set all Hydraulics valves to closed state
-    for ( valve = FIRST_HYD_VALVE; valve < LAST_HYD_VALVE; valve++ )
+    for ( valve = FIRST_HYD_VALVE; valve <= LAST_HYD_VALVE; valve++ )
     {
         setValveState( valve, VALVE_STATE_CLOSED );
     }
@@ -449,7 +449,7 @@
         data.valvesStatus       = commandedValvesStates;
         data.valvesBCStatus     = commandedBCValveStates;
 
-        for ( i = 0; i < LAST_DD_VALVE; i++ )
+        for ( i = 0; i <= LAST_DD_VALVE; i++ )
         {
             data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i );
         }
@@ -466,9 +466,9 @@
         U32 i;
 
         data.valvesCmdState       = commandedIOFPValveStates;
-        for ( i = FIRST_IO_VALVE; i < LAST_FP_VALVE; i++ )
+        for ( i = FIRST_IO_VALVE; i <= LAST_FP_VALVE; i++ )
         {
-            data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i );
+            data.valvesSensedState[ i - FIRST_IO_VALVE ] = (U08)getValveStateName( (DD_VALVES_T)i );
         }
 
         broadcastData( MSG_ID_FP_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( FP_VALVES_DATA_T ) );