Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r99cd0ebe18d1eb73b53478088ee74c44ec9091f1 -r18024aa149cd40c0abbd92fa4606970a06b5e4b1 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 99cd0ebe18d1eb73b53478088ee74c44ec9091f1) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 18024aa149cd40c0abbd92fa4606970a06b5e4b1) @@ -121,9 +121,9 @@ /*0085*/case GuiAlarmID::ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS : { result = QObject::tr("FP too many bad crcs." ); break; } /* 85*/ /*0086*/case GuiAlarmID::ALARM_ID_FP_VALVE_CONTROL_FAILURE : { result = QObject::tr("FP valve control failure." ); break; } /* 86*/ /*0087*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD balance chamber state1 fill start pressure not in range." ); break; } /* 87*/ -/*0088*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill end pressure not in range." ); break; } /* 88*/ +/*0088*/case GuiAlarmID::ALARM_ID_DD_AVAILABLE_1 : { result = QObject::tr("Available alarm ID 1." ); break; } /* 88*/ /*0089*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD balance chamber state2 fill start pressure not in range." ); break; } /* 89*/ -/*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*/ +/*0090*/case GuiAlarmID::ALARM_ID_DD_AVAILABLE_2 : { result = QObject::tr("Available alarm ID 2." ); 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_DD_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE : { result = QObject::tr("DD D79 rinse pump commanded vs measured speed out of tolerance." ); break; } /* 93*/ @@ -220,20 +220,11 @@ /*0184*/case GuiAlarmID::ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT : { result = QObject::tr("TD syringe pump prime timeout." ); break; } /* 184*/ /*0185*/case GuiAlarmID::ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("FP P9 conductivity sensor fpga fault." ); break; } /* 185*/ /*0186*/case GuiAlarmID::ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("FP P18 conductivity sensor fpga fault." ); break; } /* 186*/ -/*0187*/case GuiAlarmID::ALARM_ID_TD_INVALID_TUBE_SET : { result = QObject::tr("TD invalid tube set." ); break; } /* 187*/ -/*0188*/case GuiAlarmID::ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET : { result = QObject::tr("TD install new blood tubing set." ); break; } /* 188*/ -/*0189*/case GuiAlarmID::ALARM_ID_TD_TUBE_SET_NOT_DETECTED : { result = QObject::tr("TD no tubing set detected." ); break; } /* 189*/ -/*0190*/case GuiAlarmID::ALARM_ID_TD_TUBE_SET_AUTHENTICATION_TIMEOUT : { result = QObject::tr("TD tubing set authentication timeout." ); break; } /* 190*/ -/*0191*/case GuiAlarmID::ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO : { result = QObject::tr("TD pressure too high to zero." ); break; } /* 191*/ -/*0192*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD venous pressurization timeout." ); break; } /* 192*/ -/*0193*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_DECAY : { result = QObject::tr("TD venous pressure decay failure." ); break; } /* 193*/ -/*0194*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_LEAK : { result = QObject::tr("TD venous pressure lea." ); break; } /* 194*/ -/*0195*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_RELIEF : { result = QObject::tr("TD venous pressure relief failure." ); break; } /* 195*/ -/*0196*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD arterial pressurization timeout." ); break; } /* 196*/ -/*0197*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_DECAY : { result = QObject::tr("TD arterial pressure decay failure." ); break; } /* 197*/ -/*0198*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_LEAK : { result = QObject::tr("TD arterial pressure leak." ); break; } /* 198*/ -/*0199*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_RELIEF : { result = QObject::tr("TD arterial pressure relief failure." ); break; } /* 199*/ -/*0200*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 200*/ +/*0187*/case GuiAlarmID::ALARM_ID_TD_AUTO_LOAD_EJECT_BP_TIMEOUT : { result = QObject::tr("TD blood pump timeout during auto-load\eject operation." ); break; } /* 187*/ +/*0188*/case GuiAlarmID::ALARM_ID_TD_AUTO_EJECT_EJECTOR_TIMEOUT : { result = QObject::tr("TD ejector failed to extend or retract during auto-eject operation." ); break; } /* 188*/ +/*0189*/case GuiAlarmID::ALARM_ID_TD_EJECTOR_POST_TEST_FAILED : { result = QObject::tr("TD ejector POST homing failure." ); break; } /* 189*/ +/*0190*/case GuiAlarmID::ALARM_ID_TD_AUTO_LOAD_EJECT_HIGH_BP_TORQUE : { result = QObject::tr("TD high blood pump torque during auto-load\eject operation." ); break; } /* 190*/ +/*0191*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 191*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));