Index: AlarmDefs.h =================================================================== diff -u -r02e26efb12ec803606530358ceca7d08209893f7 -r41ed2b2a3a11c2f44edf2de9878980e91fb8c35a --- AlarmDefs.h (.../AlarmDefs.h) (revision 02e26efb12ec803606530358ceca7d08209893f7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 41ed2b2a3a11c2f44edf2de9878980e91fb8c35a) @@ -470,7 +470,7 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, { ALARM_PRIORITY_MEDIUM, 432, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, { ALARM_PRIORITY_MEDIUM, 433, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, { ALARM_PRIORITY_MEDIUM, 434, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, @@ -481,19 +481,19 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID - { ALARM_PRIORITY_HIGH, 110, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 110, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, TRUE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 150, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DD_BLOOD_LEAK_DETECTED }, { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD }, { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE }, { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE }, { ALARM_PRIORITY_MEDIUM, 698, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, - { ALARM_PRIORITY_HIGH, 10, TRUE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -541,7 +541,6 @@ { 10, ALARM_ID_TD_PINCH_VALVE_FAULT }, { 10, ALARM_ID_TD_VALVE_HOMING_FAILED }, { 10, ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT }, - { 10, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, { 11, ALARM_ID_TD_BLOOD_SITTING_TOO_LONG }, { 12, ALARM_ID_TD_VENOUS_BUBBLE_DETECTED }, { 13, ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT }, @@ -610,6 +609,7 @@ { 110, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, { 110, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, { 110, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP },