Index: AlarmDefs.h =================================================================== diff -u -r7dc1ed31f1a5a5f471fc2f35346921fc93a29a02 -r2f870106188d9d371d550a35af881aa2d54563c6 --- AlarmDefs.h (.../AlarmDefs.h) (revision 7dc1ed31f1a5a5f471fc2f35346921fc93a29a02) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2f870106188d9d371d550a35af881aa2d54563c6) @@ -7,8 +7,8 @@ * * @file AlarmDefs.h * -* @author (last) Dara Navaei -* @date (last) 19-Sep-2023 +* @author (last) Darren Cox +* @date (last) 06-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 @@ -626,7 +626,7 @@ { 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, 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 }, @@ -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 }, @@ -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 }, @@ -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 },