Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r395b6a6a9df782ebf1d331c43dc2d26a3fa59a03 -r30f049651877229042e3f8700c8596e5b9a1e0f4 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 395b6a6a9df782ebf1d331c43dc2d26a3fa59a03) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 30f049651877229042e3f8700c8596e5b9a1e0f4) @@ -67,23 +67,23 @@ /// Record structure for detailing the properties of the current composite alarm status. typedef struct { - ALARM_PRIORITY_T alarmsState; ///< current alarm priority level - BOOL alarmsSilenced; ///< alarms are currently silenced? - U32 alarmsSilenceStart; ///< time stamp for when alarms were silenced (ms) - U32 alarmsSilenceExpiresIn; ///< time until alarm silence expires (seconds) - BOOL alarmsToEscalate; ///< are any active alarms due to escalate (should UI show count down timer?) - U32 alarmsEscalatesIn; ///< time until alarm will escalate (seconds) + ALARM_PRIORITY_T alarmsState; ///< Current alarm priority level + BOOL alarmsSilenced; ///< Alarms are currently silenced? + U32 alarmsSilenceStart; ///< Time stamp for when alarms were silenced (ms) + U32 alarmsSilenceExpiresIn; ///< Time until alarm silence expires (seconds) + BOOL alarmsToEscalate; ///< Are any active alarms due to escalate (should UI show count down timer?) + U32 alarmsEscalatesIn; ///< Time until alarm will escalate (seconds) ALARM_ID_T alarmTop; ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now - BOOL topAlarmConditionnDetected; ///< condition for top alarm is still being detected - BOOL systemFault; ///< a system fault is active? - BOOL stop; ///< we should be in controlled stop right now - BOOL noClear; ///< no recovery will be possible - BOOL noResume; ///< treatment may not be resumed at this time - BOOL noRinseback; ///< rinseback may not be initiated at this time - BOOL noEndTreatment; ///< ending the treatment is not an option at this time - BOOL noNewTreatment; ///< no new treatments may be started even if current treatment is ended - BOOL usrACKRequired; ///< the user must acknowledge top alarm - BOOL lampOn; ///< the alarm lamp is on + BOOL topAlarmConditionnDetected; ///< Condition for top alarm is still being detected + BOOL systemFault; ///< A system fault is active? + BOOL stop; ///< We should be in controlled stop right now + BOOL noClear; ///< No recovery will be possible + BOOL noResume; ///< Treatment may not be resumed at this time + BOOL noRinseback; ///< Rinseback may not be initiated at this time + BOOL noEndTreatment; ///< Ending the treatment is not an option at this time + BOOL noNewTreatment; ///< No new treatments may be started even if current treatment is ended + BOOL usrACKRequired; ///< The user must acknowledge top alarm + BOOL lampOn; ///< The alarm lamp is on } COMP_ALARM_STATUS_T; /// Record structure for unsigned integer alarm data. @@ -135,7 +135,7 @@ U32 alarmTop; ///< ID of top active alarm U32 escalatesIn; ///< Top active alarm escalates in this many seconds U32 silenceExpiresIn; ///< Silencing of alarms expires in this many seconds - U16 alarmsFlags; ///< bit flags: 1 = true, 0 = false for each bit flag + U16 alarmsFlags; ///< Bit flags: 1 = true, 0 = false for each bit flag } ALARM_COMP_STATUS_PAYLOAD_T; #pragma pack(pop)