Index: AlarmDefs.h =================================================================== diff -u -r993dd779e717a537c5f3256bc83af5ab2c052f9a -r8d22c5ff9fd71b446e6b482325cee2db9efabc6c --- AlarmDefs.h (.../AlarmDefs.h) (revision 993dd779e717a537c5f3256bc83af5ab2c052f9a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 8d22c5ff9fd71b446e6b482325cee2db9efabc6c) @@ -315,6 +315,9 @@ ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range. ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE = 278, ///< HD DPi occlusion sensor is reading out of range. ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE = 279, ///< HD DPo occlusion sensor is reading out of range. + ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 280, ///< Acid concentration bottle low volume alarm + ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 281, ///< Bicarbonate concentration bottle low volume alarm + NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -713,6 +716,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 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. @@ -927,7 +932,6 @@ { 799, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION }, { 799, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE }, { 799, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, - { 799, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE }, { 799, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT }, { 799, ALARM_ID_CP1_SPEED_CONTROL_ERROR }, { 799, ALARM_ID_CP2_SPEED_CONTROL_ERROR }, @@ -953,7 +957,6 @@ { 799, ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT }, { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, - { 799, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, @@ -976,6 +979,8 @@ { 909, ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT }, { 910, ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE }, { 910, ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE }, + { 999, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE }, + { 999, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE }, { 999, ALARM_ID_RTC_BATTERY_LOW }, { 999, ALARM_ID_RTC_RAM_OPS_ERROR }, { 999, ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK }, @@ -997,6 +1002,8 @@ { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET }, { 999, ALARM_ID_UI_POST_FAILURE_SOUND }, + { 999, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME }, + { 999, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME }, { 999, ALARM_ID_NO_ALARM }, };