Index: AlarmDefs.h =================================================================== diff -u -ra34269da0845ea2365fda021d8bb9c43a8075ef7 -r3fcc5834db4f4e9fd15b490cecfc05c7f4942e18 --- AlarmDefs.h (.../AlarmDefs.h) (revision a34269da0845ea2365fda021d8bb9c43a8075ef7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3fcc5834db4f4e9fd15b490cecfc05c7f4942e18) @@ -484,15 +484,15 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_USAGE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, @@ -572,7 +572,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 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 }, @@ -629,15 +629,15 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM }, @@ -716,7 +716,7 @@ { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_INSTALL_NEW_CARTRIDGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT, 0, ALARM_ID_NO_ALARM }, @@ -1076,23 +1076,21 @@ { 799, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT }, { 799, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE }, { 799, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE }, - { 799, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, - { 799, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, { 799, ALARM_ID_UI_POST_FAILURE_WIFI }, { 799, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 799, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC }, { 799, ALARM_ID_UI_POST_FAILURE_ETHERNET }, { 799, ALARM_ID_UI_POST_FAILURE_SOUND }, + { 799, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE }, + { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE }, + { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE }, + { 799, ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE }, + { 799, ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE }, + { 799, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, { 803, ALARM_ID_TREATMENT_STOPPED_BY_USER }, - { 899, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE }, - { 899, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE }, - { 899, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE }, - { 899, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE }, - { 899, ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE }, - { 899, ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE }, { 899, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID }, { 899, ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID }, { 899, ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE }, @@ -1121,6 +1119,8 @@ { 999, ALARM_ID_NO_CARTRIDGE_LOADED }, { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE }, { 999, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, + { 999, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, + { 999, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, { 999, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME }, { 999, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME }, { 999, ALARM_ID_HD_DISINFECT_FLUSH },