Index: AlarmMapping.csv =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rdaad774fa7aece882a72d6e579a7cb87988fd6a5 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision daad774fa7aece882a72d6e579a7cb87988fd6a5) @@ -64,7 +64,7 @@ 63,"FPGA reports failure reading arterial pressure sensor." 64,"FPGA reports failure reading venous pressure sensor." 65,"HD requests DG command with invalid parameter fault." - 66,"DG/HD NV data management overall group record CRC invalid." + 66,"DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 67,"HD blood pump occlusion self-test failure alarm." 68,"HD dialysate inlet pump occlusion self-test failure alarm." 69,"HD dialysate outlet pump occlusion self-test failure alarm." @@ -101,10 +101,10 @@ 100,"HD no cartridge self-test timeout." 101,"HD dry self-test timeout." 102,"Real-time clock communication error." - 103,"Manufacturing record CRC failure." + 103,"HD non-volatile calibration group invalid record CRC." 104,"Air trap level sensors reporting illegal combination of air/fluid." - 105,"DG/HD NV data management individual record CRC invalid." - 106,"DG/HD NV data management individual record time invalid." + 105,"DG non-volatile system group invalid record CRC." + 106,"DG non-volatile service group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 107,"HD reports DG restarted fault." 108,"HD syringe pump ADC error." 109,"HD syringe pump volume check error." @@ -153,16 +153,16 @@ 152,"Inlet water pressure too low." 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." - 155,"Service record CRC failure." + 155,"DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." - 157,"Calibration record CRC failure." + 157,"Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 158,"Blood pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." 159,"Dialysate inlet pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." 160,"Blood pump rotor speed too high." 161,"Blood flow sensor signal strength too low." 162,"Dialysate flow sensor signal strength too low." 163,"HD sees primary load cell for reservoir 1 change too much too fast." - 164,"HD sees primary load cell for reservoir 1 change too much too fast." + 164,"HD sees primary load cell for reservoir 2 change too much too fast." 165,"HD in treatment rinseback operation timeout." 166,"HD in treatment re-circ sub-mode for too long." 167,"HD cartridge door opened alarm." @@ -268,4 +268,19 @@ 267,"UI POST Bluetooth failure." 268,"UI POST Ethernet failure." 269,"UI POST Sound failure." - 270,"Total number of alarms." + 270,"HD Watchdog POST failure." + 271,"HD Watchdog POST failure." + 272,"HD Fan RPM out of range." + 273,"HD measured blood pump flow rate is out of range." + 274,"HD measured dialysate inlet pump flow rate is out of range." + 275,"HD arterial pressure sensor is reading out of range." + 276,"HD venous pressure sensor is reading out of range." + 277,"HD BP occlusion sensor is reading out of range." + 278,"HD DPi occlusion sensor is reading out of range." + 279,"HD DPo occlusion sensor is reading out of range." + 280,"HD arterial pressure sensor read timeout error." + 281,"Acid concentration bottle low volume alarm." + 282,"Bicarbonate concentration bottle low volume alarm." + 283,"DG load cells weight out of range." + 284,"DG load cells primary/back up drift out of range." + 285,"Total number of alarms." Index: denali.pro.user =================================================================== diff -u -r936ed882bee8169edec9fe24cbd4e49ccca667d9 -rdaad774fa7aece882a72d6e579a7cb87988fd6a5 --- denali.pro.user (.../denali.pro.user) (revision 936ed882bee8169edec9fe24cbd4e49ccca667d9) +++ denali.pro.user (.../denali.pro.user) (revision daad774fa7aece882a72d6e579a7cb87988fd6a5) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/run.sh =================================================================== diff -u -r936ed882bee8169edec9fe24cbd4e49ccca667d9 -rdaad774fa7aece882a72d6e579a7cb87988fd6a5 --- scripts/run.sh (.../run.sh) (revision 936ed882bee8169edec9fe24cbd4e49ccca667d9) +++ scripts/run.sh (.../run.sh) (revision daad774fa7aece882a72d6e579a7cb87988fd6a5) @@ -101,7 +101,7 @@ #test the RTC ----------------------------- RTC #may not be an accurate test but sufficient for now -#and couldn't find a way to get the rtc clock with the higher resolusion +#and could not find a way to get the rtc clock with the higher resolusion #it should not be confused with date command which is system date/time and not hwclock hwclock -r # if there is any issue with rtc hwclock will show errors if [ $? -eq 0 ]; then Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -rdaad774fa7aece882a72d6e579a7cb87988fd6a5 --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision daad774fa7aece882a72d6e579a7cb87988fd6a5) @@ -40,15 +40,15 @@ labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.systolic, 3) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + label: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) extra: Variables.unitTextBloodPressure } TextRect { id: _heartBeat labelHeight: 40 labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.heartRate) + label: Variables.notSetVariable(vTreatmentVitals.heartRate, 2) extra: Variables.unitTextHeartBeat } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rc305f85cf9b2689f609db29b5a7288ce8bf1b046 -rdaad774fa7aece882a72d6e579a7cb87988fd6a5 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision c305f85cf9b2689f609db29b5a7288ce8bf1b046) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision daad774fa7aece882a72d6e579a7cb87988fd6a5) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 10-Aug-2021 + * \date (last) 16-Aug-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -93,7 +93,7 @@ /*0063*/case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading arterial pressure sensor." ); break; } /* 63*/ /*0064*/case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading venous pressure sensor." ); break; } /* 64*/ /*0065*/case GuiAlarmID::ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT : { result = QObject::tr("HD requests DG command with invalid parameter fault." ); break; } /* 65*/ -/*0066*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG/HD NV data management overall group record CRC invalid." ); break; } /* 66*/ +/*0066*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 66*/ /*0067*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD blood pump occlusion self-test failure alarm." ); break; } /* 67*/ /*0068*/case GuiAlarmID::ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD dialysate inlet pump occlusion self-test failure alarm." ); break; } /* 68*/ /*0069*/case GuiAlarmID::ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD dialysate outlet pump occlusion self-test failure alarm." ); break; } /* 69*/ @@ -130,10 +130,10 @@ /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT : { result = QObject::tr("HD no cartridge self-test timeout." ); break; } /* 100*/ /*0101*/case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT : { result = QObject::tr("HD dry self-test timeout." ); break; } /* 101*/ /*0102*/case GuiAlarmID::ALARM_ID_RTC_COMM_ERROR : { result = QObject::tr("Real-time clock communication error." ); break; } /* 102*/ -/*0103*/case GuiAlarmID::ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR : { result = QObject::tr("Manufacturing record CRC failure." ); break; } /* 103*/ +/*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD non-volatile calibration group invalid record CRC." ); break; } /* 103*/ /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid." ); break; } /* 104*/ -/*0105*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID : { result = QObject::tr("DG/HD NV data management individual record CRC invalid." ); break; } /* 105*/ -/*0106*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID : { result = QObject::tr("DG/HD NV data management individual record time invalid." ); break; } /* 106*/ +/*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile system group invalid record CRC." ); break; } /* 105*/ +/*0106*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile service group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 106*/ /*0107*/case GuiAlarmID::ALARM_ID_DG_RESTARTED_FAULT : { result = QObject::tr("HD reports DG restarted fault." ); break; } /* 107*/ /*0108*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR : { result = QObject::tr("HD syringe pump ADC error." ); break; } /* 108*/ /*0109*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR : { result = QObject::tr("HD syringe pump volume check error." ); break; } /* 109*/ @@ -182,9 +182,9 @@ /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE : { result = QObject::tr("Inlet water pressure too low." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ -/*0155*/case GuiAlarmID::ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR : { result = QObject::tr("Service record CRC failure." ); break; } /* 155*/ +/*0155*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR : { result = QObject::tr("DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 155*/ /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ -/*0157*/case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR : { result = QObject::tr("Calibration record CRC failure." ); break; } /* 157*/ +/*0157*/case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR : { result = QObject::tr("Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Blood pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." ); 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.\nMismatch with flow rate and rate implied by motor speed." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/ @@ -278,10 +278,10 @@ /*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*/ -/*0251*/case GuiAlarmID::ALARM_ID_HD_INVALID_SYSTEM_RECORD : { result = QObject::tr("HD invalid system record." ); break; } /* 251*/ -/*0252*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERVICE_RECORD : { result = QObject::tr("HD invalid service record." ); break; } /* 252*/ -/*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD : { result = QObject::tr("DG invalid system record." ); break; } /* 253*/ -/*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/ +/*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*/ /*0257*/case GuiAlarmID::ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT : { result = QObject::tr("DG FPGA power out timeout." ); break; } /* 257*/ @@ -310,7 +310,9 @@ /*0280*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD arterial pressure sensor read timeout error." ); break; } /* 280*/ /*0281*/case GuiAlarmID::ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME : { result = QObject::tr("Acid concentration bottle low volume alarm." ); break; } /* 281*/ /*0282*/case GuiAlarmID::ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME : { result = QObject::tr("Bicarbonate concentration bottle low volume alarm." ); break; } /* 282*/ -/*0283*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 283*/ +/*0283*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("DG load cells weight out of range." ); break; } /* 283*/ +/*0284*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE : { result = QObject::tr("DG load cells primary/back up drift out of range." ); break; } /* 284*/ +/*0285*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 285*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));