Index: AlarmDefs.h =================================================================== diff -u -r2cba28edf78819089253a6d7cf4f42a01c17db57 -ra8b49fcd8e5ba69d3aafdba430164af8c074e775 --- AlarmDefs.h (.../AlarmDefs.h) (revision 2cba28edf78819089253a6d7cf4f42a01c17db57) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a8b49fcd8e5ba69d3aafdba430164af8c074e775) @@ -244,6 +244,18 @@ }; typedef enum Alarm_Priorities ALARM_PRIORITY_T; ///< Type for alarm priorities enumeration +/// Alarm data types list. +enum Alarm_Data_Types +{ + ALARM_DATA_TYPE_NONE = 0, ///< No data given. + ALARM_DATA_TYPE_U32 = 1, ///< Alarm data is unsigned 32-bit integer type. + ALARM_DATA_TYPE_S32 = 2, ///< Alarm data is signed 32-bit integer type. + ALARM_DATA_TYPE_F32 = 3, ///< Alarm data is 32-bit floating point type. + ALARM_DATA_TYPE_BOOL = 4, ///< Alarm data is 32-bit boolean type. + NUM_OF_ALARM_DATA_TYPES ///< Total number of alarm data types. +}; +typedef enum Alarm_Data_Types ALARM_DATA_TYPES_T; ///< Type for data type of triggered alarm. + /// Enumeration of alarm silence commands. enum Alarm_Silence_Commands { @@ -525,7 +537,7 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_FAULT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR - { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM + { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck