Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb1c2d54d3d029ab1340d91193a7a4c81db8ba29d -r4f4050a451d88043f170814d9929ff497dc43030
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b1c2d54d3d029ab1340d91193a7a4c81db8ba29d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4f4050a451d88043f170814d9929ff497dc43030)
@@ -1149,7 +1149,7 @@
 }
 
 // TODO remove this function
-BOOL broadcastFastTempHDValves()
+BOOL broadcastFastTempHDValves( HD_VALVE_FAST_DATA_T *fastDataRemoveLater )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -2447,8 +2447,28 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestHDValvesBroadcastIntervalOverrideRequest, testSetValvesDataPublishInterval, testResetValvesDataPublishInterval )
+void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = 0;
 
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesDataPublishInterval( (BOOL)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetValvesDataPublishInterval();
+        }
+    }
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleSetBloodValve function handles a request to set the HD air
@@ -2491,11 +2511,12 @@
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = 0;
-    /* verify payload length */
+
+    // verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetValvesPositionOverride( payload.index, (BOOL)(payload.state.u32) );
         }
@@ -2504,7 +2525,7 @@
             result = testResetValvesPositionOverride( payload.index );
         }
     }
-    /* respond to request */
+    // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }