Index: AlarmDefs.h =================================================================== diff -u -r5fdde680f5cdbaa6b63de80ac0fbe1b511375480 -rbffe88639295cf011420a49a9470563e67e598a5 --- AlarmDefs.h (.../AlarmDefs.h) (revision 5fdde680f5cdbaa6b63de80ac0fbe1b511375480) +++ AlarmDefs.h (.../AlarmDefs.h) (revision bffe88639295cf011420a49a9470563e67e598a5) @@ -338,7 +338,7 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_EXPIRED { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RTC_COMM_ERROR { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RTC_CONFIG_ERROR - { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DG_COMM_TIMEOUT + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DG_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE }, // ALARM_ID_COMM_TOO_MANY_BAD_CRCS { ALARM_PRIORITY_LOW, 31, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE }, // ALARM_ID_TREATMENT_STOPPED_BY_USER @@ -434,22 +434,22 @@ { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RO_PUMP_OFF_FAULT { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT - { ALARM_PRIORITY_LOW, 999, ALM_ESC_90_MIN, ALARM_PRIME_DONE_MED, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY - { ALARM_PRIORITY_MEDIUM, 999, ALM_ESC_30_MIN, ALARM_PRIME_DONE_HIGH, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY + { ALARM_PRIORITY_LOW, 999, ALM_ESC_90_MIN, ALARM_PRIME_DONE_MED, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY + { ALARM_PRIORITY_MEDIUM, 999, ALM_ESC_30_MIN, ALARM_PRIME_DONE_HIGH, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY { ALARM_PRIORITY_LOW, 35, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_OUT_OF_TIME - { ALARM_PRIORITY_LOW, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_DOOR_OPENED { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE - { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE - { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE - { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_END_TREATMENT_TIMEOUT_ALARM { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE { ALARM_PRIORITY_HIGH, 28, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH @@ -475,7 +475,7 @@ { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR { ALARM_PRIORITY_HIGH, 6, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE }, // ALARM_ID_HD_BLOOD_LEAK_DETECTED - { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_REMOVAL_FAILURE + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_REMOVAL_FAILURE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT