Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -r701916b565680f1d5a6e85f25a72d4cc17dbc402 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 701916b565680f1d5a6e85f25a72d4cc17dbc402) @@ -61,9 +61,9 @@ /*0025*/case GuiAlarmID::ALARM_ID_DD_VALVE_CONTROL_FAILURE : { result = QObject::tr("DD FPGA not accepting commanded valve states." ); break; } /* 25*/ /*0026*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT : { result = QObject::tr("TD arterial pressure sensor freshness/error timeout fault." ); break; } /* 26*/ /*0027*/case GuiAlarmID::ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT : { result = QObject::tr("TD venous pressure sensor freshness/error timeout fault." ); break; } /* 27*/ -/*0028*/case GuiAlarmID::ALARM_ID_AVAILABLE_28 : { result = QObject::tr("Available alarms." ); break; } /* 28*/ -/*0029*/case GuiAlarmID::ALARM_ID_AVAILABLE_29 : { result = QObject::tr("Available alarms." ); break; } /* 29*/ -/*0030*/case GuiAlarmID::ALARM_ID_AVAILABLE_30 : { result = QObject::tr("Available alarms." ); break; } /* 30*/ +/*0028*/case GuiAlarmID::ALARM_ID_TD_TMP_PRESSURE_LOW : { result = QObject::tr("TD TMP pressure low." ); break; } /* 28*/ +/*0029*/case GuiAlarmID::ALARM_ID_TD_TMP_PRESSURE_HIGH : { result = QObject::tr("TD TMP pressure high." ); break; } /* 29*/ +/*0030*/case GuiAlarmID::ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE : { result = QObject::tr("TD venous bubble self-test failure." ); break; } /* 30*/ /*0031*/case GuiAlarmID::ALARM_ID_AVAILABLE_31 : { result = QObject::tr("Available alarms." ); break; } /* 31*/ /*0032*/case GuiAlarmID::ALARM_ID_AVAILABLE_32 : { result = QObject::tr("Available alarms." ); break; } /* 32*/ /*0033*/case GuiAlarmID::ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE : { result = QObject::tr("TD voltage out of range fault." ); break; } /* 33*/ @@ -91,7 +91,7 @@ /*0055*/case GuiAlarmID::ALARM_ID_DD_CONCENTRATE_PUMP_FAULT : { result = QObject::tr("DD concentrate pump fault." ); break; } /* 55*/ /*0056*/case GuiAlarmID::ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DD temperature sensor out of range." ); break; } /* 56*/ /*0057*/case GuiAlarmID::ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT : { result = QObject::tr("DD temperature sensors freshness timeout fault." ); break; } /* 57*/ -/*0058*/case GuiAlarmID::ALARM_ID_AVAILABLE_58 : { result = QObject::tr("DD Available alarms." ); break; } /* 58*/ +/*0058*/case GuiAlarmID::ALARM_ID_DD_BC_FILL_TIMEOUT_FAULT : { result = QObject::tr("DD balancing chamber fill timeout fault." ); break; } /* 58*/ /*0059*/case GuiAlarmID::ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC : { result = QObject::tr("DD barometric sensor coefficients bad CRC." ); break; } /* 59*/ /*0060*/case GuiAlarmID::ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DD fresh dialysate pump RPM out of range." ); break; } /* 60*/ /*0061*/case GuiAlarmID::ALARM_ID_DD_D12_PUMP_OFF_FAULT : { result = QObject::tr("DD fresh dialysate pump running when it is not commanded to run." ); break; } /* 61*/ @@ -111,7 +111,7 @@ /*0075*/case GuiAlarmID::ALARM_ID_DD_SC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD spent chamber state 1 fill pressure out of range." ); break; } /* 75*/ /*0076*/case GuiAlarmID::ALARM_ID_DD_SC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD spent chamber state 2 fill pressure out of range." ); break; } /* 76*/ /*0077*/case GuiAlarmID::ALARM_ID_DD_SC_FILL_TIMEOUT_FAULT : { result = QObject::tr("DD spent chamber fill timeout fault." ); break; } /* 77*/ -/*0078*/case GuiAlarmID::ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT : { result = QObject::tr("TD air trap fill timeout alarm during treatment." ); break; } /* 78*/ +/*0078*/case GuiAlarmID::ALARM_ID_TD_AIR_TRAP_FILL_TIMEOUT : { result = QObject::tr("TD air trap fill timeout." ); break; } /* 78*/ /*0079*/case GuiAlarmID::ALARM_ID_TD_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("TD air trap illegal levels." ); break; } /* 79*/ /*0080*/case GuiAlarmID::ALARM_ID_TD_PINCH_VALVE_FAULT : { result = QObject::tr("TD pinch valve fault." ); break; } /* 80*/ /*0081*/case GuiAlarmID::ALARM_ID_TD_VALVE_HOMING_FAILED : { result = QObject::tr("TD pinch valve homing fault." ); break; } /* 81*/ @@ -126,7 +126,7 @@ /*0090*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state2 fill end pressure not in range." ); break; } /* 90*/ /*0091*/case GuiAlarmID::ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE : { result = QObject::tr("DD generate dialysate hydraulics chamber ngative pressure out of range." ); break; } /* 91*/ /*0092*/case GuiAlarmID::ALARM_ID_DD_BICARB_FILL_TIMEOUT_FAULT : { result = QObject::tr("DD spent chamber fill timeout fault." ); break; } /* 92*/ -/*0093*/case GuiAlarmID::ALARM_ID_AVAILABLE_93 : { result = QObject::tr("Available alarms." ); break; } /* 93*/ +/*0093*/case GuiAlarmID::ALARM_ID_DD_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE : { result = QObject::tr("DD D79 rinse pump commanded vs measured speed out of tolerance." ); break; } /* 93*/ /*0094*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill initiated and pressure drop is not in range." ); break; } /* 94*/ /*0095*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state2 fill initiated and pressure drop is not in range." ); break; } /* 95*/ /*0096*/case GuiAlarmID::ALARM_ID_TD_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("TD treatment paused by user." ); break; } /* 96*/ @@ -183,7 +183,7 @@ /*0147*/case GuiAlarmID::ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE : { result = QObject::tr("FP pump inlet conductivity high." ); break; } /* 147*/ /*0148*/case GuiAlarmID::ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE : { result = QObject::tr("FP rejection ratio low." ); break; } /* 148*/ /*0149*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE : { result = QObject::tr("FP inlet pressure regulator out of range." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_RATE_BELOW_TARGET : { result = QObject::tr("FP flow rate below 75% of target flow." ); break; } /* 150*/ +/*0150*/case GuiAlarmID::ALARM_ID_FP_INLET_TEMPERATURE_OUT_CRITICAL_RANGE : { result = QObject::tr("FP inlet temperature above 40C during filters flush." ); break; } /* 150*/ /*0151*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT : { result = QObject::tr("FP membrane flush timeout." ); break; } /* 151*/ /*0152*/case GuiAlarmID::ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT : { result = QObject::tr("FP concentrate flush tank full timeout." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT : { result = QObject::tr("FP tank full time out alarm." ); break; } /* 153*/ @@ -197,7 +197,9 @@ /*0161*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_CRITICAL_OUT_RANGE : { result = QObject::tr("FP inlet pressure high fault." ); break; } /* 161*/ /*0162*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE : { result = QObject::tr("FP permeate flow high fault." ); break; } /* 162*/ /*0163*/case GuiAlarmID::ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE : { result = QObject::tr("FP permeate flow low fault." ); break; } /* 163*/ -/*0164*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 164*/ +/*0164*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE : { result = QObject::tr("FP inlet pressure low fault." ); break; } /* 164*/ +/*0165*/case GuiAlarmID::ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT : { result = QObject::tr("TD air trap lower timeout." ); break; } /* 165*/ +/*0166*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 166*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));