Index: PersistentAlarm.c
===================================================================
diff -u -r1769b411012a895229985ef76feb64a1dedc3b96 -r59871c9964559b5137781af9c2eeed6bab18ef73
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 1769b411012a895229985ef76feb64a1dedc3b96)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 59871c9964559b5137781af9c2eeed6bab18ef73)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-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    PersistentAlarm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Sean Nash
+* @date    (last)      11-Aug-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  17-Aug-2020
@@ -46,6 +46,7 @@
     U32  persistentTriggerPeriod;                                                              ///< Persistent count limit before trigger alarm.
     U32  errorClearedStartTime;                                                                ///< Error cleared start time.
     U32  errorOccurredStartTime;                                                               ///< Error occurred start time.
+    BOOL alarmActive;                                                                          ///< State of alarm last time alarm checked.
 } PERSISTENT_ALARM_DATA_T;
 
 /// FPGA persistent alarm data structure
@@ -94,6 +95,7 @@
        persistentAlarms[ alarmId ].persistentTriggerPeriod = persistentTriggerPeriod;
        persistentAlarms[ alarmId ].errorClearedStartTime   = 0U;
        persistentAlarms[ alarmId ].errorOccurredStartTime  = 0U;
+       persistentAlarms[ alarmId ].alarmActive             = FALSE;
    }
    else
    {
@@ -154,6 +156,15 @@
 
     if ( alarmId < NUM_OF_ALARM_IDS )
     {
+        BOOL alarmIsActive = isAlarmActive( alarmId );
+
+        // Reset persistence if alarm was just cleared
+        if ( ( FALSE == alarmIsActive ) && ( TRUE == persistentAlarms[ alarmId ].alarmActive ) )
+        {
+            persistentAlarms[ alarmId ].errorOccurredStartTime = 0;
+        }
+        persistentAlarms[ alarmId ].alarmActive = alarmIsActive; // remember latest alarm state for next time
+
         // Update start time when error occurs for the first time
         if ( ( TRUE == isErrorOccurred ) && ( 0 == persistentAlarms[ alarmId ].errorOccurredStartTime ) )
         {
@@ -215,10 +226,11 @@
     else
     {
 #ifdef _DG_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
-#else
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId )
 #endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX, alarmId )
+#endif
     }
 
     return isErrorConditionCleared;
@@ -277,40 +289,61 @@
  * @details Outputs: fpgaPersistentAlarmGroup
  * @param alarmGroup which is the alarm group of the persistent alarm
  * (i.e. 2-wire temperature sensor)
- * @param errorCount which is the FPGA error count of the sensor group
  * @param readCount which is the FPGA read count of the sensor group
  * @return none
  *************************************************************************/
-void checkFPGAPersistentAlarms( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 errorCount, U32 readCount )
+void checkFPGAPersistentAlarms( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 readCount )
 {
     if ( group < NUM_OF_FPGA_SENSOR_GROUPS )
     {
-        FPGA_ERROR_TYPE_T type = NUM_OF_FPGA_ERROR_TYPES;
-        BOOL isReadPersTrgrd   = isFPGAPersistentAlarmTriggered( &fpgaPersistentAlarmGroup[ group ], readCount, FPGA_READ_ERROR );
-        BOOL isErroPersTrgrd   = isFPGAPersistentAlarmTriggered( &fpgaPersistentAlarmGroup[ group ], errorCount, FPGA_ERROR_ERROR );
+        FPGA_ERROR_TYPE_T type = FPGA_READ_ERROR;
+        BOOL isReadPersTrgrd   = isFPGAPersistentAlarmTriggered( &fpgaPersistentAlarmGroup[ group ], readCount, type );
 
-        if ( TRUE == isReadPersTrgrd  )
+        if ( TRUE == isReadPersTrgrd )
         {
-            type = FPGA_READ_ERROR;
+            SET_ALARM_WITH_2_U32_DATA( fpgaPersistentAlarmGroup[ group ].fpgaAlarm, type, group )
         }
+    }
+    else
+    {
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
+#endif
+    }
+}
 
-        if ( TRUE == isErroPersTrgrd )
-        {
-            type = FPGA_ERROR_ERROR;
-        }
+/*********************************************************************//**
+ * @brief
+ * The checkFPGAPersistentErrorCountAlarm function checks the FPGA persistent
+ * error count alarm status of the provided FPGA persistent alarm group.
+ * @details Inputs: fpgaPersistentAlarmGroup
+ * @details Outputs: none
+ * @param alarmGroup which is the alarm group of the persistent alarm
+ * (i.e. 2-wire temperature sensor)
+ * @param errorCount which is the FPGA error count of the sensor group
+ * @return none
+ *************************************************************************/
+void checkFPGAPersistentErrorCountAlarm( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 errorCount )
+{
+    if ( group < NUM_OF_FPGA_SENSOR_GROUPS )
+    {
+        BOOL isErrorPersTrgrd = isFPGAPersistentAlarmTriggered( &fpgaPersistentAlarmGroup[ group ], errorCount, FPGA_ERROR_ERROR );
 
-        if ( ( TRUE == isReadPersTrgrd ) || ( TRUE == isErroPersTrgrd ) )
+        if ( TRUE == isErrorPersTrgrd )
         {
-            SET_ALARM_WITH_2_U32_DATA( fpgaPersistentAlarmGroup[ group ].fpgaAlarm, type, group );
+            SET_ALARM_WITH_2_U32_DATA( fpgaPersistentAlarmGroup[ group ].fpgaAlarm, FPGA_ERROR_ERROR, group )
         }
     }
     else
     {
 #ifdef _DG_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
 #endif
 #ifdef _HD_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group )
 #endif
     }
 }