Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -r986abcfcf047822cad1a10c1ee0924a80dd5f512 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 986abcfcf047822cad1a10c1ee0924a80dd5f512)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 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    FluidLeak.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      09-Nov-2021
+* @author  (last)      Sean Nash
+* @date    (last)      22-Sep-2023
 *
 * @author  (original)  Peman Montazemi
 * @date    (original)  09-Mar-2021
@@ -20,6 +20,7 @@
 #include "FPGA.h"
 #include "MessageSupport.h"
 #include "OperationModes.h"
+#include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
 #include "TaskPriority.h"
 #include "Timers.h"
@@ -33,6 +34,7 @@
 
 #define FLUID_LEAK_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )         ///< Interval (ms/task time) at which the fluid leak data is published on the CAN bus.
 #define DATA_PUBLISH_COUNTER_START_COUNT  80                                                 ///< Data publish counter start count.
+#define FLUID_LEAK_ALARM_TIMEOUT_MS       250                                                ///< Fluid leak alarm persistent timeout in milliseconds.
 
 // ********** private data **********
 
@@ -60,6 +62,8 @@
     fluidLeakState.ovInitData             = FLUID_LEAK_STATE_DRY;
     fluidLeakState.override               = OVERRIDE_RESET;
     fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+
+    initPersistentAlarm( ALARM_ID_DG_FLUID_LEAK_DETECTED, 0, FLUID_LEAK_ALARM_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -73,7 +77,6 @@
 {
     BOOL noFluidLeakDetected = noFPGAFluidLeakDetected();
 
-
     if ( getCurrentOperationMode() != DG_MODE_INIT )
     {
         // Get latest state reading
@@ -87,13 +90,16 @@
         }
 
         // Check state reading and act upon
-        if ( FLUID_LEAK_STATE_WET == getFluidLeakState() )
+        if ( FLUID_LEAK_STATE_DRY == getFluidLeakState() )
         {
-            activateAlarmNoData( ALARM_ID_DG_FLUID_LEAK_DETECTED );
+            clearAlarmCondition( ALARM_ID_DG_FLUID_LEAK_DETECTED );
         }
-        else // FLUID_LEAK_STATE_DRY == getFluidLeakState()
+        else
         {
-            clearAlarmCondition( ALARM_ID_DG_FLUID_LEAK_DETECTED );
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_FLUID_LEAK_DETECTED, TRUE ) )
+            {
+                activateAlarmNoData( ALARM_ID_DG_FLUID_LEAK_DETECTED );
+            }
         }
     }
 
@@ -107,7 +113,6 @@
  * leak detector.
  * @details Inputs: fluidLeakState
  * @details Outputs: none
- * @param none
  * @return the current fluid leak state.
  *************************************************************************/
 FLUID_LEAK_STATES_T getFluidLeakState( void )
@@ -134,9 +139,11 @@
     // Publish fluid leak state on interval
     if ( ++fluidLeakStatePublicationTimerCounter >= getU32OverrideValue( &fluidLeakStatePublishInterval ) )
     {
-        U32 state = (U32)getFluidLeakState();
+        FLUID_LEAK_DATA_T data;
 
-        broadcastData( MSG_ID_DG_FLUID_LEAK_STATE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&state, sizeof( U32 ) );
+        data.fluidLeakState = (U32)getFluidLeakState();
+
+        broadcastData( MSG_ID_DG_FLUID_LEAK_STATE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLUID_LEAK_DATA_T ) );
         fluidLeakStatePublicationTimerCounter = 0;
     }
 }
@@ -200,7 +207,6 @@
  * of the fluid leak detector.
  * @details Inputs: none
  * @details Outputs: fluidLeakState
- * @param none
  * @param state override fluid leak detector with this
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -227,7 +233,6 @@
  * fluid leak detector.
  * @details Inputs: none
  * @details Outputs: fluidLeakState
- * @param none
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetFluidLeakStateOverride( void )