Index: AlarmMapping.csv =================================================================== diff -u -rf68b226e67eb500758ee94fe015df48931240013 -recd3358b9104dfb7aef670062d343be78a0a02ba --- AlarmMapping.csv (.../AlarmMapping.csv) (revision f68b226e67eb500758ee94fe015df48931240013) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision ecd3358b9104dfb7aef670062d343be78a0a02ba) @@ -44,11 +44,11 @@ 43,"DG main primary heater FPGA fault." 44,"User interface communication timeout." 45,"HD too many bad communications CRC." - 46,"System message that required acknowledgment was not acknowledged." + 46,"HD System message that required acknowledgment was not acknowledged." 47,"Ultrafiltration rate is too high error during treatment." 48,"Ultrafiltration volume accuracy error during treatment." 49,"HD FPGA communication down for too long." - 50,"FPGA not accepting commanded valve states." + 50,"DG FPGA not accepting commanded valve states." 51,"Blood pump failed motor speed check.\nMeasured vs commanded." 52,"Dialysate inlet pump failed motor speed check.\nMeasured vs commanded." 53,"Dialysate outlet pump failed motor speed check.\nMeasured vs commanded." @@ -142,22 +142,22 @@ 141,"Air trap fill timeout during treatment." 142,"Blood pump occlusion detected." 143,"DG dialysate temperature sensors out of range." - 144,"DG RO flow sensor invalid calibration record." + 144,"DG cleaning mode inlet water conductivity out of high range." 145,"Concentrate conductivity after adding acid out of range alarm." 146,"DG RTC or timer accuracy failure." 147,"Wait for the DG to produce dialysate." - 148,"Inlet water temperature too high." + 148,"DG Cleaning mode inlet water temperature too high." 149,"HD watchdog expired." 150,"Inlet water conductivity in high range." 151,"Inlet water conductivity in low range." 152,"Inlet water pressure in low range." 153,"HD prime completed high priority alarm." - 154,"EEPROM operations (read, write, erase) failure." + 154,"DG cleaning mode inlet water conductivity out of low range." 155,"HD No reservoirs data message receive at least once every 2 seconds." 156,"HD No DG operation mode message receive at least once every 2 seconds." 157,"DG chemical disinfect prime acid line timeout." 158,"Inlet water temperature is in the low range." - 159,"Dialysate inlet pump failed flow vs motor speed check." + 159,"DG chemical disinfect flush remove acid and close the concentrate cap." 160,"Blood pump rotor speed too high." 161,"DG comm too many bad CRCs." 162,"DG FPGA clock speed check failure." @@ -232,7 +232,7 @@ 231,"HD pre-treatment mode dry pressure self-test failure." 232,"HD pre-treatment mode wet self-test LC vs LC failure." 233,"DG barometric sensor coefficients bad CRC." - 234,"RTC (i.e read time) or RAM operations failure (read or write)." + 234,"DG inlet water pressure in high range." 235,"HD in treatment stopped sub-mode after rinseback completed (no escalation)." 236,"HD needs new cartridge to be installed." 237,"HD prime saline dialyzer time out alarm." @@ -242,19 +242,19 @@ 241,"DG reservoir drain time out." 242,"DG reservoir fill time out." 243,"DG reservoir leak time out." - 244,"DG temperature sensors difference out of range." + 244,"DG cleaning mode temperature sensors difference out of range." 245,"DG heat disinfect target temperature time out (could not reach to temperature)." - 246,"DG heat disinfect inlet pressure and temperature sensors out of range." - 247,"DG heat disinfect inlet conductivity and temperature out of range." - 248,"DG chemical disinfect could not reach to target temperature." - 249,"DG chemical disinfect inlet pressure and temperature sensors out of range." - 250,"DG chemical disinfect inlet conductivity and temperature out of range." + 246,"DG cleaning mode conductivity sensors out of range." + 247,"DG heat disinfect active cool time tour." + 248,"DG chemical disinfect could not reach to target temperature out of range." + 249,"DG chemical disinfect target conductivity out of range." + 250,"DG chemical disinfect insert acid and remove the concentrate cap." 251,"HD invalid system record." 252,"HD invalid service record." 253,"DG invalid system record." 254,"DG invalid service record." 255,"HD and UI software builds are not compatible." - 256,"HD and DG software builds are not compatible." + 256,"Alarm ID available for use." 257,"DG FPGA power out timeout." 258,"HD FPGA power out timeout." 259,"HD temperatures out of range." @@ -311,4 +311,12 @@ 310,"DG CD1 conductivity sensor invalid character received." 311,"DG CD2 conductivity sensor invalid character received." 312,"HD Dialysate In flow rate to too low." - 313,"Total number of alarms." + 313,"DG cleaning mode inlet water temperature too low." + 314,"DG cleaning mode inlet water pressure too high." + 315,"DG cleaning mode inlet water pressure too low." + 316,"DG acid concentrate pump park fault." + 317,"DG bicarb concentrate pump part fault." + 318,"HD Air Pump timeout alarm." + 319,"DG chemical disinfect flush flush sample." + 320,"DG chemical disinfect flush sample timeout." + 321,"Total number of alarms." Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r713e7466ef26a246d250846a3d9cae65afe59413 -recd3358b9104dfb7aef670062d343be78a0a02ba --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 713e7466ef26a246d250846a3d9cae65afe59413) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision ecd3358b9104dfb7aef670062d343be78a0a02ba) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 04-Jan-2023 + * \date (last) 21-Jan-2023 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -192,7 +192,7 @@ /*0156*/case GuiAlarmID::ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE : { result = QObject::tr("HD No DG operation mode message receive at least once every 2 seconds." ); break; } /* 156*/ /*0157*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT : { result = QObject::tr("DG chemical disinfect prime acid line timeout." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE : { result = QObject::tr("Inlet water temperature is in the low range." ); break; } /* 158*/ -/*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check." ); break; } /* 159*/ +/*0159*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID : { result = QObject::tr("DG chemical disinfect flush remove acid and close the concentrate cap." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/ /*0161*/case GuiAlarmID::ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS : { result = QObject::tr("DG comm too many bad CRCs." ); break; } /* 161*/ /*0162*/case GuiAlarmID::ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE : { result = QObject::tr("DG FPGA clock speed check failure." ); break; } /* 162*/ @@ -277,19 +277,19 @@ /*0241*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT : { result = QObject::tr("DG reservoir drain time out." ); break; } /* 241*/ /*0242*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT : { result = QObject::tr("DG reservoir fill time out." ); break; } /* 242*/ /*0243*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT : { result = QObject::tr("DG reservoir leak time out." ); break; } /* 243*/ -/*0244*/case GuiAlarmID::ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE : { result = QObject::tr("DG temperature sensors difference out of range." ); break; } /* 244*/ +/*0244*/case GuiAlarmID::ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE : { result = QObject::tr("DG cleaning mode temperature sensors difference out of range." ); break; } /* 244*/ /*0245*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG heat disinfect target temperature time out (could not reach to temperature)." ); break; } /* 245*/ -/*0246*/case GuiAlarmID::ALARM_ID_AVAILABLE_3 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 246*/ +/*0246*/case GuiAlarmID::ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE : { result = QObject::tr("DG cleaning mode conductivity sensors out of range." ); break; } /* 246*/ /*0247*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT : { result = QObject::tr("DG heat disinfect active cool time tour." ); break; } /* 247*/ -/*0248*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG chemical disinfect could not reach to target temperature." ); break; } /* 248*/ -/*0249*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT : { result = QObject::tr("DG chemical disinfect inlet pressure and temperature sensors out of range." ); break; } /* 249*/ -/*0250*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG chemical disinfect inlet conductivity and temperature out of range." ); break; } /* 250*/ +/*0248*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE : { result = QObject::tr("DG chemical disinfect could not reach to target temperature out of range." ); break; } /* 248*/ +/*0249*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE : { result = QObject::tr("DG chemical disinfect target conductivity out of range." ); break; } /* 249*/ +/*0250*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID : { result = QObject::tr("DG chemical disinfect insert acid and remove the concentrate cap." ); break; } /* 250*/ /*0251*/case GuiAlarmID::ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("HD invalid system record." ); break; } /* 251*/ /*0252*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("HD invalid service record." ); break; } /* 252*/ /*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("DG invalid system record." ); break; } /* 253*/ /*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/ /*0255*/case GuiAlarmID::ALARM_ID_HD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("HD and UI software builds are not compatible." ); break; } /* 255*/ -/*0256*/case GuiAlarmID::ALARM_ID_HD_DG_COMPATIBILITY_ERROR : { result = QObject::tr("HD and DG software builds are not compatible." ); break; } /* 256*/ +/*0256*/case GuiAlarmID::ALARM_ID_AVAILABLE_2 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 256*/ /*0257*/case GuiAlarmID::ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT : { result = QObject::tr("DG FPGA power out timeout." ); break; } /* 257*/ /*0258*/case GuiAlarmID::ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT : { result = QObject::tr("HD FPGA power out timeout." ); break; } /* 258*/ /*0259*/case GuiAlarmID::ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE : { result = QObject::tr("HD temperatures out of range." ); break; } /* 259*/ @@ -352,7 +352,9 @@ /*0316*/case GuiAlarmID::ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT : { result = QObject::tr("DG acid concentrate pump park fault." ); break; } /* 316*/ /*0317*/case GuiAlarmID::ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT : { result = QObject::tr("DG bicarb concentrate pump part fault." ); break; } /* 317*/ /*0318*/case GuiAlarmID::ALARM_ID_HD_AIR_PUMP_TIMEOUT : { result = QObject::tr("HD Air Pump timeout alarm." ); break; } /* 318*/ -/*0319*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 319*/ +/*0319*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE : { result = QObject::tr("DG chemical disinfect flush flush sample." ); break; } /* 319*/ +/*0320*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT : { result = QObject::tr("DG chemical disinfect flush sample timeout." ); break; } /* 320*/ +/*0321*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 321*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));