Index: PersistentAlarm.h =================================================================== diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -r9512aac6feeb1379d6d425361fa78d58f75c86f6 --- PersistentAlarm.h (.../PersistentAlarm.h) (revision 6d80d69a210f45c733e5307859351f2cd820a8e7) +++ PersistentAlarm.h (.../PersistentAlarm.h) (revision 9512aac6feeb1379d6d425361fa78d58f75c86f6) @@ -22,8 +22,8 @@ /** * @defgroup PersistentAlarm PersistentAlarm - * @brief Persistent alarm monitor module. - * Check for persistent error and return indication on whether alarm is triggered or alarm condition is cleared. + * @brief Persistent alarms unit. + * Provides functions that add persistence to alarm criteria. * * @addtogroup PersistentAlarm * @{ @@ -53,24 +53,21 @@ /// FPGA persistent alarm groups data structure typedef enum { - FPGA_PERS_ERROR_OCCLUSION_PRESSURE_SENSOR = 0, ///< FPGA persistent error occlusion pressure sensor. - FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, ///< FPGA persistent error arterial pressure sensor. + FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR = 0, ///< FPGA persistent error arterial pressure sensor. FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, ///< FPGA persistent error venous pressure sensor. FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ///< FPGA persistent error syringe pump ADC. - NUM_OF_FPGA_SENSOR_GROUPS ///< Number of FPGA sensor groups. + NUM_OF_FPGA_SENSOR_GROUPS ///< Number of FPGA persistent error sensor groups. } FPGA_PERSISTENT_ALARMS_GROUP_T; #endif // ********** public function prototypes ********** -// Persistent period resolution is in ms void initPersistentAlarm( ALARM_ID_T alarmIndex, U32 persistentClearPeriod, U32 persistentTriggerPeriod ); - void initFPGAPersistentAlarm( FPGA_PERSISTENT_ALARMS_GROUP_T group, ALARM_ID_T alarmIndex, U32 persistentClearPeriod, U32 persistentTriggerPeriod ); BOOL isPersistentAlarmTriggered( ALARM_ID_T alarmIndex, BOOL const isErrorOccurred ); BOOL isPersistentAlarmConditionCleared( ALARM_ID_T alarmIndex, BOOL const isErrorOccurred ); -BOOL checkPersistentAlarm( ALARM_ID_T alarm, BOOL isErrorOccured, F32 data, F32 limit ); +void checkPersistentAlarm( ALARM_ID_T alarm, BOOL isErrorOccured, F32 data, F32 limit ); void resetPersistentAlarmTimer( ALARM_ID_T alarmId ); void checkFPGAPersistentAlarms( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 readCount );