Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r701d85786b9bfde26f6aa337d3b5d5ab8ee86ba0 -r662823b461d1d811f27de11611bbbb5875d02282 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 701d85786b9bfde26f6aa337d3b5d5ab8ee86ba0) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 662823b461d1d811f27de11611bbbb5875d02282) @@ -36,7 +36,7 @@ /*0000*/case GuiAlarmID::ALARM_ID_NO_ALARM : { result = QObject::tr("Indication for when no alarms is a possible situation." ); break; } /* 0*/ /*0001*/case GuiAlarmID::ALARM_ID_TD_SOFTWARE_FAULT : { result = QObject::tr("TD Software fault.\nSoftware found itself in an unexpected state." ); break; } /* 1*/ /*0002*/case GuiAlarmID::ALARM_ID_DD_SOFTWARE_FAULT : { result = QObject::tr("DD software fault.\nSoftware found itself in an unexpected state." ); break; } /* 2*/ -/*0003*/case GuiAlarmID::ALARM_ID_FP_SOFTWARE_FAULT : { result = QObject::tr("RO software fault.\nSoftware found itself in an unexpected state." ); break; } /* 3*/ +/*0003*/case GuiAlarmID::ALARM_ID_FP_SOFTWARE_FAULT : { result = QObject::tr("FP software fault.\nSoftware found itself in an unexpected state." ); break; } /* 3*/ /*0004*/case GuiAlarmID::ALARM_ID_TD_FPGA_POST_TEST_FAILED : { result = QObject::tr("TD FPGA POST failure." ); break; } /* 4*/ /*0005*/case GuiAlarmID::ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("TD Watchdog POST failure." ); break; } /* 5*/ /*0006*/case GuiAlarmID::ALARM_ID_TD_UI_COMM_POST_FAILED : { result = QObject::tr("TD UI communication POST failure.\nUI failed to communicate within a reasonable time after power up." ); break; } /* 6*/ @@ -52,7 +52,7 @@ /*0016*/case GuiAlarmID::ALARM_ID_TD_WATCHDOG_EXPIRED : { result = QObject::tr("TD watchdog expired." ); break; } /* 16*/ /*0017*/case GuiAlarmID::ALARM_ID_DD_WATCHDOG_EXPIRED : { result = QObject::tr("DD watchdog expired." ); break; } /* 17*/ /*0018*/case GuiAlarmID::ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS : { result = QObject::tr("DD too many bad communications CRC." ); break; } /* 18*/ -/*0019*/case GuiAlarmID::ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO : { result = QObject::tr("DD didn't get ACK on message to RO that required acknowledgment." ); break; } /* 19*/ +/*0019*/case GuiAlarmID::ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP : { result = QObject::tr("DD didn't get ACK on message to FP that required acknowledgment." ); break; } /* 19*/ /*0020*/case GuiAlarmID::ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD : { result = QObject::tr("DD didn't get ACK on message to TD that required acknowledgment." ); break; } /* 20*/ /*0021*/case GuiAlarmID::ALARM_ID_DD_FPGA_POST_TEST_FAILED : { result = QObject::tr("DD FPGA POST failure." ); break; } /* 21*/ /*0022*/case GuiAlarmID::ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE : { result = QObject::tr("DD processor clock speed checks against FPGA clock failure." ); break; } /* 22*/ @@ -116,10 +116,10 @@ /*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*/ /*0082*/case GuiAlarmID::ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT : { result = QObject::tr("TD pinch valve transition timeout." ); break; } /* 82*/ -/*0083*/case GuiAlarmID::ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD : { result = QObject::tr("RO can message not acked by DD fault." ); break; } /* 83*/ -/*0084*/case GuiAlarmID::ALARM_ID_FP_FPGA_COMM_TIMEOUT : { result = QObject::tr("RO FPGA communication timeout." ); break; } /* 84*/ -/*0085*/case GuiAlarmID::ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS : { result = QObject::tr("RO too many bad crcs." ); break; } /* 85*/ -/*0086*/case GuiAlarmID::ALARM_ID_FP_VALVE_CONTROL_FAILURE : { result = QObject::tr("RO valve control failure." ); break; } /* 86*/ +/*0083*/case GuiAlarmID::ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD : { result = QObject::tr("FP can message not acked by DD fault." ); break; } /* 83*/ +/*0084*/case GuiAlarmID::ALARM_ID_FP_FPGA_COMM_TIMEOUT : { result = QObject::tr("FP FPGA communication timeout." ); break; } /* 84*/ +/*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*/ /*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*/ @@ -131,8 +131,8 @@ /*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*/ /*0097*/case GuiAlarmID::ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("DD D74 bicarb conductivity sensor freshness/error timeout fault." ); break; } /* 97*/ -/*0098*/case GuiAlarmID::ALARM_ID_AVAILABLE_98 : { result = QObject::tr("Available alarms." ); break; } /* 98*/ -/*0099*/case GuiAlarmID::ALARM_ID_AVAILABLE_99 : { result = QObject::tr("Available alarms." ); break; } /* 99*/ +/*0098*/case GuiAlarmID::ALARM_ID_TD_BLOOD_SITTING_WARNING : { result = QObject::tr("TD blood sitting too long warning." ); break; } /* 98*/ +/*0099*/case GuiAlarmID::ALARM_ID_TD_BLOOD_SITTING_TOO_LONG : { result = QObject::tr("TD blood sitting too long alarm; no resume; no rinseback." ); break; } /* 99*/ /*0100*/case GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT : { result = QObject::tr("TD communication timeout." ); break; } /* 100*/ /*0101*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_OS_VERSION : { result = QObject::tr("UI POST OS version compatibility failure." ); break; } /* 101*/ /*0102*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SHASUM : { result = QObject::tr("UI POST Application Integrity (Sha256Sum) failure." ); break; } /* 102*/ @@ -168,25 +168,27 @@ /*0132*/case GuiAlarmID::ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP : { result = QObject::tr("DD dialysate temperature above safety." ); break; } /* 132*/ /*0133*/case GuiAlarmID::ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP : { result = QObject::tr("DD dialysate temperature high." ); break; } /* 133*/ /*0134*/case GuiAlarmID::ALARM_ID_DD_DIALYSATE_TEMP_BELOW_TARGET_TEMP : { result = QObject::tr("DD dialysate temperature low." ); break; } /* 134*/ -/*0135*/case GuiAlarmID::ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE : { result = QObject::tr("RO Pressure relief valve low." ); break; } /* 135*/ -/*0136*/case GuiAlarmID::ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE : { result = QObject::tr("RO Pressure relief valve high." ); break; } /* 136*/ -/*0137*/case GuiAlarmID::ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE : { result = QObject::tr("RO Power budget exceeded." ); break; } /* 137*/ -/*0138*/case GuiAlarmID::ALARM_ID_FP_FLOW_RATE_LOW_RANGE : { result = QObject::tr("RO flow rate low." ); break; } /* 138*/ -/*0139*/case GuiAlarmID::ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE : { result = QObject::tr("RO inlet water temperature low." ); break; } /* 139*/ -/*0140*/case GuiAlarmID::ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE : { result = QObject::tr("RO inlet water temperature high." ); break; } /* 140*/ -/*0141*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE : { result = QObject::tr("RO inlet pressure low." ); break; } /* 141*/ -/*0142*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE : { result = QObject::tr("RO inlet pressure high." ); break; } /* 142*/ -/*0143*/case GuiAlarmID::ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE : { result = QObject::tr("RO inlet conductivity high." ); break; } /* 143*/ -/*0144*/case GuiAlarmID::ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE : { result = QObject::tr("RO inlet conductivty low." ); break; } /* 144*/ +/*0135*/case GuiAlarmID::ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE : { result = QObject::tr("FP Pressure relief valve low." ); break; } /* 135*/ +/*0136*/case GuiAlarmID::ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE : { result = QObject::tr("FP Pressure relief valve high." ); break; } /* 136*/ +/*0137*/case GuiAlarmID::ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE : { result = QObject::tr("FP Power budget exceeded." ); break; } /* 137*/ +/*0138*/case GuiAlarmID::ALARM_ID_FP_FLOW_RATE_LOW_RANGE : { result = QObject::tr("FP flow rate low." ); break; } /* 138*/ +/*0139*/case GuiAlarmID::ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE : { result = QObject::tr("FP inlet water temperature low." ); break; } /* 139*/ +/*0140*/case GuiAlarmID::ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE : { result = QObject::tr("FP inlet water temperature high." ); break; } /* 140*/ +/*0141*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE : { result = QObject::tr("FP inlet pressure low." ); break; } /* 141*/ +/*0142*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE : { result = QObject::tr("FP inlet pressure high." ); break; } /* 142*/ +/*0143*/case GuiAlarmID::ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE : { result = QObject::tr("FP inlet conductivity high." ); break; } /* 143*/ +/*0144*/case GuiAlarmID::ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE : { result = QObject::tr("FP inlet conductivty low." ); break; } /* 144*/ /*0145*/case GuiAlarmID::ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE : { result = QObject::tr("RO pump inlet pressure high." ); break; } /* 145*/ -/*0146*/case GuiAlarmID::ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE : { result = QObject::tr("RO pump outlet conductivity high." ); break; } /* 146*/ -/*0147*/case GuiAlarmID::ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE : { result = QObject::tr("RO pump inlet conductivity high." ); break; } /* 147*/ -/*0148*/case GuiAlarmID::ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE : { result = QObject::tr("RO rejection ratio low." ); break; } /* 148*/ -/*0149*/case GuiAlarmID::ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE : { result = QObject::tr("RO inlet pressure regulator out of range." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("RO filter health pressure out of range." ); break; } /* 150*/ -/*0151*/case GuiAlarmID::ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT : { result = QObject::tr("RO membrane flush timeout." ); break; } /* 151*/ -/*0152*/case GuiAlarmID::ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE : { result = QObject::tr("RO membrane flush integrated out of range." ); break; } /* 152*/ -/*0153*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 153*/ +/*0146*/case GuiAlarmID::ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE : { result = QObject::tr("FP pump outlet conductivity high." ); break; } /* 146*/ +/*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_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("FP filter health pressure out of range." ); 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_VOLUME_OUT_OF_RANGE : { result = QObject::tr("FP membrane flush integrated out of range." ); break; } /* 152*/ +/*0153*/case GuiAlarmID::ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT : { result = QObject::tr("FP tank full time out alarm." ); break; } /* 153*/ +/*0154*/case GuiAlarmID::ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE: { result = QObject::tr("DD dialysate temperature sensors out of range." ); break; } /* 154*/ +/*0155*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 155*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));