Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -rc65551beea443f6fb5a50c5be5af73c97fe77cf5
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision c65551beea443f6fb5a50c5be5af73c97fe77cf5)
@@ -336,7 +336,7 @@
 
     if ( valveID < NUM_OF_VALVES )
     {
-        if ( checkValveStateName( valveID, valveStateName ) )
+        if ( TRUE == checkValveStateName( valveID, valveStateName ) )
         {
             valveStates[ valveID ].data = convertValveStateNameToValveState( valveStateName );
             result = TRUE;
@@ -426,9 +426,12 @@
 {
     // publish valve state on interval
     if ( ++valvesStatesPublicationTimerCounter >= getU32OverrideValue( &valvesStatesPublishInterval ) )
-    {
-        U16 valvesStatus = getFPGAValveStates();
-        broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&valvesStatus, sizeof( U16 ) );
+    {
+        DG_VALVES_DATA_T data;
+
+        data.valvesStatus = getFPGAValveStates();
+
+        broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_VALVES_DATA_T ) );
 
         valvesStatesPublicationTimerCounter = 0;
     }