Index: AlarmDefs.h =================================================================== diff -u -r09329f31ad0d34162ea5cd6d37472d615169591f -r02e26efb12ec803606530358ceca7d08209893f7 --- AlarmDefs.h (.../AlarmDefs.h) (revision 09329f31ad0d34162ea5cd6d37472d615169591f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 02e26efb12ec803606530358ceca7d08209893f7) @@ -470,23 +470,23 @@ { 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, 10, 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, TRUE , 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 }, { ALARM_PRIORITY_MEDIUM, 435, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, { ALARM_PRIORITY_MEDIUM, 436, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, { ALARM_PRIORITY_MEDIUM, 437, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 10, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_PRESSURE_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_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, 10, 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, 10, 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, 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 }, // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID - { ALARM_PRIORITY_HIGH, 10, 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, 10, 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, 10, 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, 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 , 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 }, @@ -542,14 +542,6 @@ { 10, ALARM_ID_TD_VALVE_HOMING_FAILED }, { 10, ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT }, { 10, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, - { 10, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { 10, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, - { 10, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, - { 10, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, - { 10, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, - { 10, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, - { 10, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, - { 10, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, { 11, ALARM_ID_TD_BLOOD_SITTING_TOO_LONG }, { 12, ALARM_ID_TD_VENOUS_BUBBLE_DETECTED }, { 13, ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT }, @@ -604,11 +596,19 @@ { 110, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { 110, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, + { 110, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, + { 110, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, { 110, ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE }, { 110, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, { 110, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, { 110, ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE }, { 110, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, + { 110, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { 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 }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD },