Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r335c721d795f22c6dc4a24f5180dee3ba095a2b2 -r9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 335c721d795f22c6dc4a24f5180dee3ba095a2b2)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 9d21272d8c5c0b5f1d72bd5f0e9ef4e4ee41e764)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2025 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    AlarmMgmt.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      04-May-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      25-Mar-2025
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
@@ -38,9 +38,9 @@
 /// Interval (in ms) at which alarm lamp and audio control will be executed.
 #define ALARM_LAMP_AND_AUDIO_CONTROL_INTERVAL_MS        250
 
-#define MAX_ALARM_VOLUME_LEVEL                          5
-#define MAX_ALARM_VOLUME_ATTENUATION                    4
-#define MIN_ALARM_VOLUME_ATTENUATION                    0
+#define MAX_ALARM_VOLUME_LEVEL                          5           ///< Maximum alarm audio level.
+#define MAX_ALARM_VOLUME_ATTENUATION                    4           ///< Maximum alarm audio attenuation.
+#define MIN_ALARM_VOLUME_ATTENUATION                    0           ///< Minimum alarm audio attenuation.
 #define MAX_ALARM_LIST_SIZE                             10          ///< Maximum number of active alarms inside alarm list.
 
 /// Enumeration of alarm actions.
@@ -77,6 +77,7 @@
     BOOL                ok;                                         ///< Display OK button instead of other options
     BOOL                noMinimize;                                 ///< Prevent user from minimizing the alarm window
     BOOL                lampOn;                                     ///< The alarm lamp is on
+    BOOL                noReTrigger;                                ///< Alarm flag to block re-trigger is set
 } COMP_ALARM_STATUS_T;
 
 /// Record structure for unsigned integer alarm data.
@@ -181,6 +182,7 @@
     U32 alarmID;                                ///< Alarm ID.
 } ALARM_ID_DATA_PUBLISH_T;
 
+/// Alarm list request response payload record structure.
 typedef struct
 {
     BOOL accepted;                              ///< Accepted/Rejected.
@@ -195,9 +197,11 @@
 
 void activateAlarmNoData( ALARM_ID_T alarm );
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData );
-void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 );
+void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2, BOOL outside );
 void clearAlarm( ALARM_ID_T alarm );
 void clearAlarmCondition( ALARM_ID_T alarm );
+void clearNoRetriggerFlag( void );
+BOOL getNoRetriggerFlag( void );
 void setAlarmUserActionEnabled( ALARM_USER_ACTION_T action, BOOL enabled );
 void signalAlarmSilence( ALARM_SILENCE_CMD_T cmd );
 void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action );
@@ -207,8 +211,10 @@
 BOOL isAnyAlarmActive( void );
 BOOL isBloodRecircBlocked( void );
 BOOL isDialysateRecircBlocked( void );
+BOOL isRinseBackBlocked( void );
 BOOL doesAlarmStatusIndicateStop( void );
 BOOL doesAlarmIndicateNoResume( void );
+BOOL doesAlarmStatusIndicateEndTxOnly( void );
 ALARM_PRIORITY_T getCurrentAlarmStatePriority( void );
 BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 void setAlarmAudioVolume( U32 volumeLevel );