Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 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 +* @file AlarmMgmt.h * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean Nash -* @date (original) 07-Nov-2019 +* @author (original) Sean Nash +* @date (original) 07-Nov-2019 * ***************************************************************************/ @@ -121,13 +121,21 @@ /// Payload record structure for the alarm info message. typedef struct { - U32 audioVolume; ///< Audio volume level (1..5) - F32 audioCurrHG; ///< Primary alarm audio current - high gain (mA) - F32 audioCurrLG; ///< Primary alarm audio current - low gain (mA) - F32 backupAudioCurr; ///< Backup alarm audio current (mA) - BOOL safetyShutdown; ///< Safety shutdown activated? (T/F) + U32 audioVolume; ///< Audio volume level (1..5) + F32 audioCurrHG; ///< Primary alarm audio current - high gain (mA) + F32 audioCurrLG; ///< Primary alarm audio current - low gain (mA) + F32 backupAudioCurr; ///< Backup alarm audio current (mA) + BOOL safetyShutdown; ///< Safety shutdown activated? (T/F) } ALARM_INFO_PAYLOAD_T; +/// Payload record structure for the alarm triggered message. +typedef struct +{ + U32 alarm; ///< ID of alarm that was triggered + ALARM_DATA_T almData1; ///< Supporting data #1 + ALARM_DATA_T almData2; ///< Supporting data #2 +} ALARM_TRIGGERED_PAYLOAD_T; + #pragma pack(pop) #pragma pack(push, 2)