Index: AlarmDefs.h =================================================================== diff -u -rf64f3f0b5d3a015a41d7c784b549d9b46667e70b -r5c75b8c0b97cc94a707d785009fa5525c9488fde --- AlarmDefs.h (.../AlarmDefs.h) (revision f64f3f0b5d3a015a41d7c784b549d9b46667e70b) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 5c75b8c0b97cc94a707d785009fa5525c9488fde) @@ -334,11 +334,11 @@ ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT = 296, ///< DG TDi sensors FPGA fault ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT = 297, ///< DG TRo sensors FPGA fault ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT = 298, ///< DG baro sensor FPGA fault - ALARM_ID_DG_DISINFECT_HAS_BEEN_EXPIRED = 299, ///< DG disinfect has been expired - ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED = 300, ///< DG service time interval has elapsed + ALARM_ID__AVAILABLE_2 = 299, ///< Alarm ID available for use + ALARM_ID__AVAILABLE_3 = 300, ///< Alarm ID available for use ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE = 301, ///< DG primary heater power voltage out of range ALARM_ID_DG_CPU_RAM_ERROR = 302, ///< DG processor RAM error - ALARM_ID_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED = 303, ///< HD service time interval has elapsed + ALARM_ID__AVAILABLE_4 = 303, ///< Alarm ID available for use ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record NUM_OF_ALARM_IDS ///< Total number of alarms }; @@ -769,11 +769,11 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DISINFECT_HAS_BEEN_EXPIRED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4, 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_CRC, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To @@ -1049,9 +1049,9 @@ { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 }, - { 899, ALARM_ID_DG_DISINFECT_HAS_BEEN_EXPIRED }, - { 899, ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED }, - { 899, ALARM_ID_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED }, + { 899, ALARM_ID__AVAILABLE_2 }, + { 899, ALARM_ID__AVAILABLE_3 }, + { 899, ALARM_ID__AVAILABLE_4 }, { 900, ALARM_ID_EMPTY_SALINE_BAG }, { 901, ALARM_ID_DIALYSATE_TEMPERATURE_HIGH }, { 902, ALARM_ID_DIALYSATE_TEMPERATURE_LOW },