Index: firmware/App/Controllers/FluidLeak.c =================================================================== diff -u -r4ddf1777acc4298a9ed034e56b66916256d22c18 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision 4ddf1777acc4298a9ed034e56b66916256d22c18) +++ firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2021-2023 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) 03-Apr-2022 +* @author (last) Sean Nash +* @date (last) 29-Mar-2023 * * @author (original) Peman Montazemi * @date (original) 09-Mar-2021 @@ -19,6 +19,7 @@ #include "FluidLeak.h" #include "FPGA.h" #include "OperationModes.h" +#include "PersistentAlarm.h" #include "SystemCommMessages.h" #include "TaskPriority.h" #include "Timers.h" @@ -33,6 +34,9 @@ #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 50 ///< Data publish counter start count. +/// Persist time (in ms) for fluid leak error condition. +static const U32 FLUID_LEAK_ERROR_PERSIST_MS = 250; + // ********** private data ********** static U32 fluidLeakStatePublicationTimerCounter; ///< Timer counter used to schedule fluid leak publication to CAN bus. @@ -59,6 +63,8 @@ fluidLeakState.ovData = FLUID_LEAK_STATE_DRY; fluidLeakState.override = OVERRIDE_RESET; fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; + + initPersistentAlarm( ALARM_ID_HD_FLUID_LEAK_DETECTED, 0, FLUID_LEAK_ERROR_PERSIST_MS ); } /*********************************************************************//** @@ -87,10 +93,14 @@ // Check state reading and act upon if ( FLUID_LEAK_STATE_WET == getFluidLeakState() ) { - activateAlarmNoData( ALARM_ID_HD_FLUID_LEAK_DETECTED ); + if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, TRUE ) ) + { + activateAlarmNoData( ALARM_ID_HD_FLUID_LEAK_DETECTED ); + } } else // FLUID_LEAK_STATE_DRY == getFluidLeakState() { + isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, FALSE ); clearAlarmCondition( ALARM_ID_HD_FLUID_LEAK_DETECTED ); } }