Index: AlarmDefs.h =================================================================== diff -u -r3a95214d67349e6742d95e5abac78ffd08d5cb17 -rc49914cf15bbcd3cebf46e34e28cd4e7b974cdd3 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3a95214d67349e6742d95e5abac78ffd08d5cb17) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c49914cf15bbcd3cebf46e34e28cd4e7b974cdd3) @@ -7,8 +7,8 @@ * * @file AlarmDefs.h * -* @author (last) Dara Navaei -* @date (last) 19-Sep-2023 +* @author (last) Darren Cox +* @date (last) 04-Oct-2023 * * @author (original) Sean * @date (original) 11-Feb-2020 @@ -390,11 +390,11 @@ /// Enumeration of alarm silence commands. enum Alarm_Silence_Commands { - ALARM_SILENCE_CMD_CANCEL = 0, ///< Indicates not an alarm or no alarms active at this time - ALARM_SILENCE_CMD_START = 1, ///< Low priority alarm - NUM_OF_ALARM_SILENCE_CMDS ///< Total number of alarm priorities + ALARM_SILENCE_CMD_CANCEL = 0, ///< Cancel alarm silence command. + ALARM_SILENCE_CMD_START = 1, ///< Start alarm silence command. + NUM_OF_ALARM_SILENCE_CMDS ///< Total number of alarm silence commands. }; -typedef enum Alarm_Silence_Commands ALARM_SILENCE_CMD_T; ///< Type for alarm priorities enumeration +typedef enum Alarm_Silence_Commands ALARM_SILENCE_CMD_T; ///< Type for alarm silence commands /// Enumeration of alarm sources. enum Alarm_Sources @@ -611,22 +611,22 @@ { ALARM_PRIORITY_HIGH, 11, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_HIGH, 150, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , ALARM_ID_HD_BLOOD_LEAK_DETECTED }, { ALARM_PRIORITY_HIGH, 200, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_LOW }, - { ALARM_PRIORITY_HIGH, 12, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_VENOUS_BUBBLE_DETECTED, }, + { ALARM_PRIORITY_HIGH, 12, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_VENOUS_BUBBLE_DETECTED, }, { ALARM_PRIORITY_MEDIUM, 301, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, { ALARM_PRIORITY_HIGH, 201, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_HIGH }, { ALARM_PRIORITY_HIGH, 202, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_LOW }, { ALARM_PRIORITY_HIGH, 203, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_FLUID_LEAK_DETECTED }, { ALARM_PRIORITY_HIGH, 208, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_FLUID_LEAK_DETECTED }, - { ALARM_PRIORITY_HIGH, 210, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SHOCK }, + { ALARM_PRIORITY_HIGH, 220, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SHOCK }, { ALARM_PRIORITY_MEDIUM, 440, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_SHOCK }, - { ALARM_PRIORITY_HIGH, 211, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_EXCESSIVE_TILT }, + { ALARM_PRIORITY_HIGH, 221, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_EXCESSIVE_TILT }, { ALARM_PRIORITY_MEDIUM, 441, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_EXCESSIVE_TILT }, { ALARM_PRIORITY_LOW , 852, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_AC_POWER_LOST }, - { ALARM_PRIORITY_HIGH, 111, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_HD_DG_COMM_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 111, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_HD_DG_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 13, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AIR_TRAP_FILL_DURING_TREATMENT }, { ALARM_PRIORITY_HIGH, 206, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_OCCLUSION_BLOOD_PUMP }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, { ALARM_PRIORITY_MEDIUM, 603, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH }, { ALARM_PRIORITY_MEDIUM, 410, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE }, @@ -651,7 +651,7 @@ { ALARM_PRIORITY_MEDIUM, 442, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM }, { ALARM_PRIORITY_HIGH, 11, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM }, { ALARM_PRIORITY_HIGH, 200, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, ALARM_ID_TEST_ALARM_NO_BLOOD_RECIRC_CLR_TOP_ONLY }, - { ALARM_PRIORITY_HIGH, 209, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CARTRIDGE_DOOR_OPENED }, + { ALARM_PRIORITY_HIGH, 210, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CARTRIDGE_DOOR_OPENED }, { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, ALARM_ID_TEST_ALARM_NO_DIAL_RECIRC_CLR_TOP_ONLY }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE }, { ALARM_PRIORITY_LOW, 730, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, @@ -702,7 +702,7 @@ { ALARM_PRIORITY_MEDIUM, 590, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_PRIME_COMPLETED_MEDIUM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_30 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_31 }, - { ALARM_PRIORITY_HIGH, 291, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM }, + { ALARM_PRIORITY_HIGH, 291, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_32 }, { ALARM_PRIORITY_LOW, 745, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED }, { ALARM_PRIORITY_HIGH, 207, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, @@ -767,7 +767,7 @@ { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, + { ALARM_PRIORITY_MEDIUM, 421, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID }, { ALARM_PRIORITY_MEDIUM, 412, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME }, @@ -813,7 +813,7 @@ { ALARM_PRIORITY_LOW, 752, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR }, - // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID + // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID @@ -975,7 +975,6 @@ { 110, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE }, { 110, ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE }, { 110, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, - { 110, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { 110, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, { 110, ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID }, { 110, ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC }, @@ -1036,9 +1035,9 @@ { 207, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 208, ALARM_ID_HD_FLUID_LEAK_DETECTED }, { 209, ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED }, - { 209, ALARM_ID_HD_CARTRIDGE_DOOR_OPENED }, - { 210, ALARM_ID_HD_SHOCK }, - { 211, ALARM_ID_HD_EXCESSIVE_TILT }, + { 210, ALARM_ID_HD_CARTRIDGE_DOOR_OPENED }, + { 220, ALARM_ID_HD_SHOCK }, + { 221, ALARM_ID_HD_EXCESSIVE_TILT }, { 290, ALARM_ID_HD_BLOOD_SITTING_WARNING }, { 290, ALARM_ID_HD_END_OF_TREATMENT_ALARM }, { 291, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM }, @@ -1055,6 +1054,7 @@ { 413, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME }, { 420, ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, + { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { 421, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT }, { 430, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE }, { 431, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE },