Index: AlarmDefs.h =================================================================== diff -u -r332637491b7c39fcf5275a8587cd3f32e6b2dbbe -re9dd51d41fb34a23dce908557ad34799b857d241 --- AlarmDefs.h (.../AlarmDefs.h) (revision 332637491b7c39fcf5275a8587cd3f32e6b2dbbe) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e9dd51d41fb34a23dce908557ad34799b857d241) @@ -152,10 +152,10 @@ ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114, ///< HD venous air bubble detector self-test failure ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115, ///< DG temperature sensor out of range ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116, ///< DG temperature sensor ADC out of range - ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117, ///< DG primary heater internal temperature out of range // TODO remove when DEN-11750 was merged - ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118, ///< DG primary heater cold junction temperature out of range // TODO remove when DEN-11750 was merged - ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119, ///< DG trimmer heater internal temperature out of range // TODO remove when DEN-11750 was merged - ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120, ///< DG trimmer heater cold junction temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID____AVAILABLE_28 = 117, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_29 = 118, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_30 = 119, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_31 = 120, ///< This alarm ID is available for use ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 121, ///< DG main primary heater voltage out of range ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 122, ///< DG small primary heater voltage out of range ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE = 123, ///< DG trimmer heater voltage out of range @@ -391,14 +391,14 @@ ALARM_STATE_FLAG_BIT_POS_NO_RESUME = 3, ///< The "resume" user recovery option is disabled ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK = 4, ///< The "rinseback" user recovery option is disabled ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT = 5, ///< The "end treatment" user recovery option is disabled - ALARM_STATE_FLAG_BIT_POS____AVAILABLE = 6, ///< Not used - available for use + ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 6, ///< Reserved ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY = 7, ///< The "ok" user recovery option is enabled ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE = 8, ///< One or more active alarms will escalate in time ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED = 9, ///< Alarms have been temporarily silenced by user ALARM_STATE_FLAG_BIT_POS_LAMP_ON = 10, ///< Alarm lamp is currently on (for syncing to UI) - ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 11, ///< Reserved - ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 12, ///< Reserved - ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 13, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 11, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 12, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC = 13, ///< Dialysate recirculation is diabled ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE = 14, ///< Prevent user from minimizing alarm window ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION = 15, ///< The top alarm's condition is still being detected NUM_OF_ALARM_STATE_FLAG_BIT_POS = 16 ///< The number of alarm state flag bit positions @@ -563,10 +563,10 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_28, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_29, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_30, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_31, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -638,7 +638,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP1_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP2_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DRAIN_PUMP_OFF_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -694,12 +694,12 @@ { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_BICARB_CONDUCTIVITY_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_DG_RESERVOIR_DRAIN_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 3, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoRcr ClrOnly TxLog ID Escalate In Escalate To @@ -875,10 +875,10 @@ { 3, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE }, + { 3, ALARM_ID____AVAILABLE_28 }, + { 3, ALARM_ID____AVAILABLE_29 }, + { 3, ALARM_ID____AVAILABLE_30 }, + { 3, ALARM_ID____AVAILABLE_31 }, { 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 }, @@ -907,6 +907,9 @@ { 3, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, { 3, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE }, { 3, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT }, + { 3, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -970,7 +973,6 @@ { 799, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT }, { 799, ALARM_ID_CP1_SPEED_CONTROL_ERROR }, { 799, ALARM_ID_CP2_SPEED_CONTROL_ERROR }, - { 799, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, { 799, ALARM_ID_DRAIN_PUMP_OFF_FAULT }, { 799, ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE }, { 799, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE }, @@ -991,7 +993,6 @@ { 799, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT }, - { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 799, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, @@ -1030,7 +1031,6 @@ { 999, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT }, { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, { 999, ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT }, - { 999, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, { 999, ALARM_ID_UI_POST_FAILURE_WIFI }, { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET },