Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -reb9e7f219b519e0ce02d00296ceb986f642b38fe -r24b2fe72608344e67ef37234085d15ad5e4fcc37
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file BloodLeak.c
+* @file    BloodLeak.c
 *
-* @author (last) Peman Montazemi
-* @date (last) 18-Mar-2021
+* @author  (last)      Sean Nash
+* @date    (last)      12-Nov-2021
 *
-* @author (original) Peman Montazemi
-* @date (original) 18-Mar-2021
+* @author  (original)  Peman Montazemi
+* @date    (original)  18-Mar-2021
 *
 ***************************************************************************/
 
@@ -65,7 +65,6 @@
 static BLOOD_LEAK_STATES_T handleBloodLeakNormalState( void );
 
 static void publishBloodLeakData( void );
-static U32  getPublishBloodLeakDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -318,26 +317,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishBloodLeakDataInterval function gets the blood leak data
- * publication interval.
- * @details Inputs: bloodLeakDataPublishInterval
- * @details Outputs: none
- * @return the current blood leak data publication interval (in task intervals).
- *************************************************************************/
-static U32  getPublishBloodLeakDataInterval( void )
-{
-    U32 result = bloodLeakDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == bloodLeakDataPublishInterval.override )
-    {
-        result = bloodLeakDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishBloodLeakData function publishes blood leak data at the set interval.
  * @details Inputs: bloodLeakStatus, bloodLeakState
  * @details Outputs: if broadcast is due, send blood leak data
@@ -346,11 +325,13 @@
 static void publishBloodLeakData( void )
 {
     // Publish blood leak data on interval
-    if ( ++bloodLeakDataPublicationTimerCounter >= getPublishBloodLeakDataInterval() )
+    if ( ++bloodLeakDataPublicationTimerCounter >= getU32OverrideValue( &bloodLeakDataPublishInterval ) )
     {
-        BLOOD_LEAK_STATUS_T status = getBloodLeakStatus();
+        BLOOD_LEAK_DATA_T bloodLeakData;
 
-        broadcastBloodLeakData( status, (U32)bloodLeakState );
+        bloodLeakData.bloodLeakStatus = (U32)getBloodLeakStatus();
+        bloodLeakData.bloodLeakState  = (U32)bloodLeakState;
+        broadcastData( MSG_ID_HD_BLOOD_LEAK_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&bloodLeakData, sizeof( BLOOD_LEAK_DATA_T ) );
         bloodLeakDataPublicationTimerCounter = 0;
     }
 }