Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r4aa825df0b7a7b93c6a7f1d4408d02844f4213f0 -r27a68f930508638f2eb6265ebb381c8918cbc37b --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 4aa825df0b7a7b93c6a7f1d4408d02844f4213f0) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 27a68f930508638f2eb6265ebb381c8918cbc37b) @@ -74,7 +74,7 @@ BOOL noDialRecirc; ///< No dialysate re-circulation allowed at this time 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 lampOn; ///< The alarm lamp is on } COMP_ALARM_STATUS_T; /// Record structure for unsigned integer alarm data. @@ -135,6 +135,9 @@ U32 almData1; ///< Supporting data #1 U32 almDataType2; ///< Supporting data type #2 U32 almData2; ///< Supporting data #2 + U32 almPriority; ///< Alarm priority + U32 almRank; ///< Alarm rank + BOOL almClrTopOnly; ///< Alarm clear (when on top) should only clear top alarm } ALARM_TRIGGERED_PAYLOAD_T; #pragma pack(pop) @@ -149,8 +152,14 @@ U32 silenceExpiresIn; ///< Silencing of alarms expires in this many seconds U16 alarmsFlags; ///< Bit flags: 1 = true, 0 = false for each bit flag } ALARM_COMP_STATUS_PAYLOAD_T; -#pragma pack(pop) +#pragma pack(pop) +/// Alarm name data publish +typedef struct +{ + U32 alarmName; ///< Alarm name. +} ALARM_NAME_DATA_T; + // ********** public function prototypes ********** void initAlarmMgmt( void );