Index: AlarmDefs.h =================================================================== diff -u -r9442233d6a82266b7aaff7b584b0d80bb3c948c0 -r38d47b00123721bd9e53c92f32be709ded147a02 --- AlarmDefs.h (.../AlarmDefs.h) (revision 9442233d6a82266b7aaff7b584b0d80bb3c948c0) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 38d47b00123721bd9e53c92f32be709ded147a02) @@ -132,7 +132,7 @@ ALARM_ID____AVAILABLE_16 = 94, ///< This alarm ID is available for use ALARM_ID____AVAILABLE_17 = 95, ///< This alarm ID is available for use ALARM_ID____AVAILABLE_18 = 96, ///< This alarm ID is available for use - ALARM_ID_REPLACE_CONCENTRATE_BOTTLES = 97, ///< Replace concentrate bottles alarm + ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE = 97, ///< Fill conductivity out of range ALARM_ID_HD_BATTERY_COMM_FAULT = 98, ///< HD battery communication fault ALARM_ID_HD_SYRINGE_PUMP_STALL = 99, ///< HD syringe pump stall alarm ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100, ///< HD no cartridge self-test timeout @@ -542,7 +542,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_16, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_18, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, ALARM_ID_REPLACE_CONCENTRATE_BOTTLES, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_STALL, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To @@ -594,7 +594,7 @@ { ALARM_PRIORITY_LOW, 21, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 22, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 23, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 26, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 28, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_TEMPERATURE, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To @@ -734,8 +734,8 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING, 0, ALARM_ID_NO_ALARM }, @@ -855,7 +855,7 @@ { 3, ALARM_ID____AVAILABLE_16 }, { 3, ALARM_ID____AVAILABLE_17 }, { 3, ALARM_ID____AVAILABLE_18 }, - { 3, ALARM_ID_REPLACE_CONCENTRATE_BOTTLES }, + { 3, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BATTERY_COMM_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_STALL }, { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT },