Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r1b2d508e6c5fb1aed6c538874689681ca41bf962 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 1b2d508e6c5fb1aed6c538874689681ca41bf962) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-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 AlarmMgmt.h * * @author (last) Sean Nash -* @date (last) 23-May-2023 +* @date (last) 08-Sep-2023 * * @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. @@ -182,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. @@ -196,7 +197,7 @@ 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 ); @@ -211,6 +212,7 @@ BOOL isDialysateRecircBlocked( 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 );