Index: AlarmDefs.h =================================================================== diff -u -rffeda8679037e682f50ba4eb83ed7f93613695b8 -r6aac2df66cef38fbb6722289c5575af2d92e66e3 --- AlarmDefs.h (.../AlarmDefs.h) (revision ffeda8679037e682f50ba4eb83ed7f93613695b8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6aac2df66cef38fbb6722289c5575af2d92e66e3) @@ -42,10 +42,10 @@ ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED = 4, ///< HD Watchdog POST failure ALARM_ID_DG_WATCHDOG_POST_TEST_FAILED = 5, ///< DG Watchdog POST failure ALARM_ID_UI_COMM_POST_FAILED = 6, ///< UI communication POST failure. UI failed to communicate within a reasonable time after power up - ALARM_ID_RTC_CONFIG_ERROR = 7, ///< Real-time clock configuration error + ALARM_ID_RTC_CONFIG_ERROR = 7, // TODO remove when DEN-12224 merged ///< Real-time clock configuration error ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 8, ///< HD accelerometer failed POST ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 9, ///< DG accelerometer failed POST - ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 10, ///< RTC or MCU timer inaccurate + ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 10, // TODO remove when DEN-12224 merged ///< RTC or MCU timer inaccurate ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE = 11, ///< DG heaters failed POST ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed @@ -78,9 +78,9 @@ ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 40, ///< Dialysis outlet pump failed motor off check. Measured speed while commanded off ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 41, ///< Dialysis outlet pump failed motor direction check. Measured vs. commanded ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 42, ///< Dialysis outlet pump failed rotor speed check. Mismatch with rotor and motor speeds - ALARM_ID_WATCHDOG_EXPIRED = 43, ///< Watchdog expired error. Watchdog was not "pet" within the appropriate time + ALARM_ID_WATCHDOG_EXPIRED = 43, // TODO remove when DEN-12224 merged ///< Watchdog expired error. Watchdog was not "pet" within the appropriate time ALARM_ID_UI_COMM_TIMEOUT = 44, ///< User interface communication timeout - ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 45, ///< Too many bad CRCs detected on received system messages + ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 45, // TODO remove when DEN-12224 merged ///< Too many bad CRCs detected on received system messages ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46, ///< System message that required acknowledgment was not acknowledged ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 47, ///< Ultrafiltration rate is too high error during treatment ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 48, ///< Ultrafiltration volume accuracy error during treatment @@ -137,7 +137,7 @@ 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 ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 101, ///< HD dry self-test timeout - ALARM_ID_RTC_COMM_ERROR = 102, ///< Real-time clock communication error + ALARM_ID____AVAILABLE_36 = 102, ///< This alarm ID is available ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD non-volatile calibration group invalid record CRC ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104, ///< Air trap level sensors reporting illegal combination of air/fluid ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG non-volatile system group invalid record CRC @@ -268,7 +268,7 @@ ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 230, ///< HD prime dialysate bypass time out alarm ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 231, ///< HD pre-treatment mode dry self-tests failure ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 232, ///< HD pre-treatment mode wet self-tests failure - ALARM_ID_RTC_BATTERY_LOW = 233, ///< RTC battery low + ALARM_ID_RTC_BATTERY_LOW = 233, // TODO remove when DEN-12224 merged ///< RTC battery low ALARM_ID_RTC_RAM_OPS_ERROR = 234, ///< RTC (i.e read time) or RAM operations failure (read or write) ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 235, ///< HD in treatment stopped sub-mode after rinseback completed (no escalation) ALARM_ID_INSTALL_NEW_CARTRIDGE = 236, ///< HD needs new cartridge to be installed @@ -548,7 +548,7 @@ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RTC_COMM_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_36, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, @@ -652,7 +652,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEATERS_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_29, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_35, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_35, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRESSURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -863,7 +863,7 @@ { 3, ALARM_ID_HD_SYRINGE_PUMP_STALL }, { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT }, { 3, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT }, - { 3, ALARM_ID_RTC_COMM_ERROR }, + { 3, ALARM_ID____AVAILABLE_36 }, { 3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS }, { 3, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY },