Index: firmware/App/Services/AlarmMgmtTD.h =================================================================== diff -u -r395522dffef1348e176564925656012f529c1910 -r6b9b882169f108f9a5072dc60cdabbc1687aafcc --- firmware/App/Services/AlarmMgmtTD.h (.../AlarmMgmtTD.h) (revision 395522dffef1348e176564925656012f529c1910) +++ firmware/App/Services/AlarmMgmtTD.h (.../AlarmMgmtTD.h) (revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc) @@ -14,10 +14,10 @@ * @date (original) 01-Aug-2024 * ***************************************************************************/ - -#ifndef __ALARM_MGMT_TD_H__ -#define __ALARM_MGMT_TD_H__ - + +#ifndef __ALARM_MGMT_TD_H__ +#define __ALARM_MGMT_TD_H__ + #include "TDCommon.h" #include "AlarmDefs.h" #include "AlarmAudio.h" @@ -50,30 +50,30 @@ NUMBER_OF_ALARM_ACTIONS ///< Number of alarm actions } ALARM_ACTION_T; -#pragma pack(push, 4) -/// 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) +#pragma pack(push, 4) +/// 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) ALARM_ID_T alarmTop; ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now - BOOL topAlarmConditionDetected; ///< 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 topAlarmConditionDetected; ///< 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 noBloodRecirc; ///< No blood re-circulation allowed at this time - BOOL noDialRecirc; ///< No dialysate re-circulation allowed at this time + 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 unused; ///< Flag not used - available -} COMP_ALARM_STATUS_T; - +} COMP_ALARM_STATUS_T; + #pragma pack(pop) /// Enumeration of alarm button blockers. @@ -125,18 +125,18 @@ U32 activeAlarmList[ MAX_ALARM_LIST_SIZE ]; ///< Active Alarm List array. } ACTIVE_ALARM_LIST_RESPONSE_PAYLOAD_T; -// ********** public function prototypes ********** - -void initAlarmMgmtTD( void ); +// ********** public function prototypes ********** + +void initAlarmMgmtTD( void ); void execAlarmMgmt( void ); void clearAlarmTD( ALARM_ID_T alarm ); -void activateAlarmNoData( ALARM_ID_T alarm ); -void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData ); +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, BOOL outside ); - + void setAlarmUserActionEnabled( ALARM_USER_ACTION_T action, BOOL enabled ); - + void signalAlarmSilence( ALARM_SILENCE_CMD_T cmd ); void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action ); @@ -153,14 +153,14 @@ BOOL handleAlarmConditionCleared( MESSAGE_T *message ); BOOL handleAlarmUserAction( MESSAGE_T *message ); BOOL handleActiveAlarmListRequest( MESSAGE_T *message ); -void handleResendActiveAlarmsRequest( void ); +void handleResendActiveAlarmsRequest( void ); void handleAutoResumeAlarm( ALARM_ID_T alarm ); BOOL testSetAlarmStartTimeOverride( MESSAGE_T *message ); BOOL testClearAllAlarms( MESSAGE_T *message ); BOOL testAlarmStatusPublishIntervalOverride( MESSAGE_T *message ); BOOL testAlarmInfoPublishIntervalOverride( MESSAGE_T *message ); - + /**@}*/ -#endif +#endif