Index: AlarmDefs.h =================================================================== diff -u -r0e370fdc6311bff28444ea697981f3724fba27b3 -ree80fd961fdd87917f21ab23893a6af353965520 --- AlarmDefs.h (.../AlarmDefs.h) (revision 0e370fdc6311bff28444ea697981f3724fba27b3) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ee80fd961fdd87917f21ab23893a6af353965520) @@ -144,7 +144,15 @@ ALARM_ID_HD_BLOOD_LEAK_FAULT, ///< HD blood leak detector fault ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE, ///< HD arterial air bubble detector self-test failure ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE, ///< HD venous air bubble detector self-test failure - ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, ///< DG temperature sensor out of range fault + ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, ///< DG temperature sensor out of range + ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, ///< DG temperature sensor ADC out of range + ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, ///< DG primary heater internal temperature out of range + ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE, ///< DG primary heater cold junction temperature out of range + ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, ///< DG trimmer heater internal temperature out of range + ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, ///< DG trimmer heater cold junction temperature out of range + ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, ///< DG main primary heater voltage out of range + ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, ///< DG small primary heater voltage out of range + ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, ///< DG trimmer heater voltage out of range ALARM_ID_END_OF_TREATMENT_HIGH, ///< HD end of treatment alarm (high priority - user still not acting to end treatment) ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK, ///< Blood sitting too long after treatment stopped by user alarm (>10 min) ALARM_ID_HD_BLOOD_LEAK_DETECTED, ///< HD blood leak detected alarm @@ -229,8 +237,6 @@ ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, ///< Conductivity sensor fault ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME, ///< DG dialysate fill runs out of time ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, ///< DG flow meter check failure alarm - ALARM_ID_DG_PRIMARY_HEATERS_INTERNAL_TEMP_OUT_OF_RANGE, ///< DG primary heaters internal temperature out of range - ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, ///< DG trimmer heater internal temperature out of range ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT, ///< DG heaters on with no flow time out ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT, ///< DG drain circulation line timeout ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED, ///< HD battery pack detected an error @@ -496,6 +502,14 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, // Ranked high priority alarms { ALARM_PRIORITY_HIGH, 4, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_END_OF_TREATMENT_HIGH, 0, ALARM_ID_NO_ALARM }, @@ -584,8 +598,6 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_PRIMARY_HEATERS_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED, 0, ALARM_ID_NO_ALARM },