Index: AlarmDefs.h =================================================================== diff -u -rcec7e930a0ffbb0eaba62593a7cd4fa847377fe8 -r32af7aed11118fec67c95588a14bc5e6da9ee35b --- AlarmDefs.h (.../AlarmDefs.h) (revision cec7e930a0ffbb0eaba62593a7cd4fa847377fe8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 32af7aed11118fec67c95588a14bc5e6da9ee35b) @@ -120,15 +120,14 @@ ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE = 89, ///< DD balance chamber state2 fill start pressure not in range ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE = 90, ///< DD balance chamber state2 fill end pressure not in range ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE = 91, ///< DD generate dialysate hydraulics chamber ngative pressure out of range - ALARM_ID_FP_PRE_GEN_LOW_REJECTION_RATIO = 91, ///< Available alarms - ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 92, ///< Available alarms - ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 93, ///< Available alarms + ALARM_ID_AVAILABLE_92 = 92, ///< Available alarms + ALARM_ID_AVAILABLE_93 = 93, ///< Available alarms ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE = 94, ///< DD balance chamber state1 fill initiated and pressure drop is not in range ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE = 95, ///< DD balance chamber state2 fill initiated and pressure drop is not in range ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96, ///< TD treatment paused by user ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 97, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault - ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_HIGH_RANGE = 98, ///< Available alarms - ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE = 99, ///< Available alarms + ALARM_ID_AVAILABLE_98 = 98, ///< Available alarms + ALARM_ID_AVAILABLE_99 = 99, ///< Available alarms // Added 30 TD-UI Alarms +1 TD only from 100 to 130 with some reserved IDs ALARM_ID_TD_COMM_TIMEOUT = 100, ///< TD communication timeout ALARM_ID_UI_POST_FAILURE_OS_VERSION = 101, ///< UI POST OS version compatibility failure @@ -162,20 +161,24 @@ ALARM_ID_UI_RESERVED_129 = 129, ///< UI Reserved failure ALARM_ID_UI_RESERVED_130 = 130, ///< UI Reserved failure ALARM_ID_BATTERY_LOW = 131, ///< TD Battery Low warning - ALARM_ID_FP_INLET_PRESSURE_OUT_OF_RANGE = 131, - ALARM_ID_FP_PRESSURE_RELIEF_OUT_OF_RANGE = 132, - ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE = 133, - ALARM_ID_FP_FLOW_RATE_LOW_RANGE = 134, - ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE = 135, - ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE = 136, - ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE = 137, - ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE = 138, - ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE = 139, - ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE = 140, - ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE = 141, - ALARM_ID_FP_INLET_BOOST_PRESSURE_OUT_LOW_RANGE = 142, - ALARM_ID_FP_INLET_BOOST_PRESSURE_OUT_HIGH_RANGE = 143, - ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE = 144, + ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE = 132, + ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE = 133, + ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE = 134, + ALARM_ID_FP_FLOW_RATE_LOW_RANGE = 135, + ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE = 136, + ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE = 137, + ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE = 138, + ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE = 139, + ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE = 140, + ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE = 141, + ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE = 142, + ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE = 143, + ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE = 144, + ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE = 145, ///< Available alarms + ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 146, ///< Available alarms + ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 147, ///< Available alarms + ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT = 148, ///< Available alarms + ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE = 149, ///< Available alarms NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -449,6 +452,24 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_129 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_130 }, { ALARM_PRIORITY_LOW, 850, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_BATTERY_LOW }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -585,6 +606,24 @@ { 999, ALARM_ID_UI_RESERVED_128 }, { 999, ALARM_ID_UI_RESERVED_129 }, { 999, ALARM_ID_UI_RESERVED_130 }, + { 999, ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE }, + { 999, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, + { 999, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, + { 999, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, + { 999, ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, + { 999, ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, + { 999, ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, + { 999, ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, + { 999, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, + { 999, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, + { 999, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, + { 999, ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE }, + { 999, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, + { 999, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, + { 999, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { 999, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, + { 999, ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { 999, ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE }, { 999, ALARM_ID_NO_ALARM }, };