Index: AlarmDefs.h =================================================================== diff -u -r1e0754aa1ec7a213924c8b52828c87db95f63f95 -re9902c5a31a6e9e902000996d1f7746146e31b95 --- AlarmDefs.h (.../AlarmDefs.h) (revision 1e0754aa1ec7a213924c8b52828c87db95f63f95) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e9902c5a31a6e9e902000996d1f7746146e31b95) @@ -288,8 +288,10 @@ ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 250, ///< DG chemical disinfect inlet conductivity and temperature out of range ALARM_ID_HD_INVALID_SYSTEM_RECORD = 251, ///< HD invalid system record ALARM_ID_HD_INVALID_SERVICE_RECORD = 252, ///< HD invalid service record - ALARM_ID_DG_INVALID_SYSTEM_RECORD = 253, ///< DG invalid sytem record + ALARM_ID_DG_INVALID_SYSTEM_RECORD = 253, ///< DG invalid system record ALARM_ID_DG_INVALID_SERVICE_RECORD = 254, ///< DG invalid service record + ALARM_ID_HD_UI_COMPATIBILITY_ERROR = 255, ///< HD and UI software builds are not compatible + ALARM_ID_HD_DG_COMPATIBILITY_ERROR = 256, ///< HD and DG software builds are not compatible NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -434,10 +436,10 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_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_ACCELEROMETERS_INVALID_CAL_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_BLOOD_FLOW_INVALID_CAL_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_DIALYSATE_FLOW_INVALID_CAL_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_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SOFTWARE_FAULT, 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_MC_CURRENT_CHECK, 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_OFF_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -663,6 +665,8 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_HD_INVALID_SERVICE_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_INVALID_SYSTEM_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_INVALID_SERVICE_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DG_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -795,6 +799,8 @@ { 3, ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE }, + { 3, ALARM_ID_HD_UI_COMPATIBILITY_ERROR }, + { 3, ALARM_ID_HD_DG_COMPATIBILITY_ERROR }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED },