Index: AlarmMapping.csv =================================================================== diff -u -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -201,7 +201,7 @@ 200,"DG thermistors/sensors temperature out of range." 201,"HD pre-treatment mode wet self-test lc vs FMD failure." 202,"HD pre-treatment mode dry pressure normal self-test failure." - 203,"Available for use." + 203,"DG fill conductivities acid/bicarb invalid calibration record." 204,"DG RO rejection ratio out of range." 205,"DG conductivity sensor fault." 206,"DG dialysate fill runs out of time." @@ -304,7 +304,7 @@ 303,"DG drain pump direction FPGA fault." 304,"HD invalid usage record." 305,"HD processor RAM error." - 306,"DG CD1 CD2 check fault." + 306,"Alarm ID available." 307,"HD AC power lost second alarm." 308,"DG CPi conductivity sensor invalid character received." 309,"DG CPo conductivity sensor invalid character received." Index: denali.pro =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- denali.pro (.../denali.pro) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ denali.pro (.../denali.pro) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -120,7 +120,6 @@ sources/device/DeviceController.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ - sources/view/settings/VAdjustmentInstitutionalRecord.h \ sources/wifi/WifiInterface.h \ sources/bluetooth/BluetoothInterface.h \ sources/cloudsync/CloudSyncController.h \ @@ -148,6 +147,7 @@ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ + sources/view/settings/VAdjustmentInstitutionalRecord.h \ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ @@ -400,7 +400,6 @@ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ sources/view/hd/data/post/VHDPOSTData.cpp \ - sources/view/settings/VAdjustmentInstitutionalRecord.cpp \ sources/wifi/WifiInterface.cpp \ sources/bluetooth/BluetoothInterface.cpp \ sources/cloudsync/CloudSyncController.cpp \ @@ -426,6 +425,7 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ + sources/view/settings/VAdjustmentInstitutionalRecord.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -41,8 +41,8 @@ _data.mMaxVenAsymPressLimitMMHG .value, _data.mMinUltrafiltrationVolumeL .value, _data.mMaxUltrafiltrationVolumeL .value, - _data.mMinHepDispRateMLPM .value, - _data.mMaxHepDispRateMLPM .value, + _data.mMinHepDispRateMLPHR .value, + _data.mMaxHepDispRateMLPHR .value, _data.mMinHepBolVolumeML .value, _data.mMaxHepBolVolumeML .value, }; @@ -72,8 +72,8 @@ if (GetValue(vByteArray, index, _data.mMaxVenAsymPressLimitMMHG )) if (GetValue(vByteArray, index, _data.mMinUltrafiltrationVolumeL )) if (GetValue(vByteArray, index, _data.mMaxUltrafiltrationVolumeL )) - if (GetValue(vByteArray, index, _data.mMinHepDispRateMLPM )) - if (GetValue(vByteArray, index, _data.mMaxHepDispRateMLPM )) + if (GetValue(vByteArray, index, _data.mMinHepDispRateMLPHR )) + if (GetValue(vByteArray, index, _data.mMaxHepDispRateMLPHR )) if (GetValue(vByteArray, index, _data.mMinHepBolVolumeML )) if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML )) return true ; @@ -134,8 +134,8 @@ data.mMaxVenAsymPressLimitMMHG = _data.mMaxVenAsymPressLimitMMHG .value; data.mMinUltrafiltrationVolumeL = _data.mMinUltrafiltrationVolumeL .value; data.mMaxUltrafiltrationVolumeL = _data.mMaxUltrafiltrationVolumeL .value; - data.mMinHepDispRateMLPM = _data.mMinHepDispRateMLPM .value; - data.mMaxHepDispRateMLPM = _data.mMaxHepDispRateMLPM .value; + data.mMinHepDispRateMLPM = _data.mMinHepDispRateMLPHR .value; + data.mMaxHepDispRateMLPM = _data.mMaxHepDispRateMLPHR .value; data.mMinHepBolVolumeML = _data.mMinHepBolVolumeML .value; data.mMaxHepBolVolumeML = _data.mMaxHepBolVolumeML .value; return data; Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -20,10 +20,34 @@ * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| * |0xB100| 0x020 | Rsp | Y | HD | UI | Service Mode | * - * | Payload || - * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::mReason | + * | Payload || + * | || + * | #1: (U32) | \ref Data::mMaxHepBolVolumeML | + * | #2: (U32) | \ref Data::mMinHepBolVolumeML | + * | #3: (U32) | \ref Data::mMaxHepDispRateMLPHR | + * | #4: (U32) | \ref Data::mMinHepDispRateMLPHR | + * | #5: (U32) | \ref Data::mMaxUltrafiltrationVolumeL | + * | #6: (U32) | \ref Data::mMinUltrafiltrationVolumeL | + * | #7: (U32) | \ref Data::mMaxVenAsymPressLimitMMHG | + * | #8: (U32) | \ref Data::mMinVenAsymPressLimitMMHG | + * | #9: (U32) | \ref Data::mMaxVenPressLimitWindowMMHG | + * | #10:(U32) | \ref Data::mMinVenPressLimitWindowMMHG | + * | #11:(U32) | \ref Data::mMaxArtPressLimitWindowMMHG | + * | #12:(U32) | \ref Data::mMinArtPressLimitWindowMMHG | + * | #13:(F32) | \ref Data::mMaxDialysateTempC | + * | #14:(F32) | \ref Data::mMinDialysateTempC | + * | #15:(S32) | \ref Data::mMaxSalineBolVolumeML | + * | #16:(S32) | \ref Data::mMinSalineBolVolumeML | + * | #17:(S32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN | + * | #18:(S32) | \ref Data::mMinStopHepDispBeforeTxEndMIN | + * | #19:(S32) | \ref Data::mMaxTxDurationMIN | + * | #20:(S32) | \ref Data::mMinTxDurationMIN | + * | #21:(F32) | \ref Data::mMaxDialysateFlowMLPM | + * | #22:(F32) | \ref Data::mMinDialysateFlowMLPM | + * | #23:(F32) | \ref Data::mMaxBloodFlowMLPM | + * | #24:(F32) | \ref Data::mMinBloodFlowMLPM | + * | #25:(F32) | \ref Data::mReason | + * | #26:(F32) | \ref Data::mAccepted | * * \sa Data * @@ -65,8 +89,8 @@ Types::S32 mMaxVenAsymPressLimitMMHG ; Types::F32 mMinUltrafiltrationVolumeL ; Types::F32 mMaxUltrafiltrationVolumeL ; - Types::F32 mMinHepDispRateMLPM ; - Types::F32 mMaxHepDispRateMLPM ; + Types::F32 mMinHepDispRateMLPHR ; + Types::F32 mMaxHepDispRateMLPHR ; Types::F32 mMinHepBolVolumeML ; Types::F32 mMaxHepBolVolumeML ; } _data; Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rcf700f1c8511c69f2c356b81cf2f76298e141808 -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision cf700f1c8511c69f2c356b81cf2f76298e141808) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 06-Mar-2024 + * \date (last) 07-Mar-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -236,7 +236,7 @@ /*0200*/case GuiAlarmID::ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("DG thermistors/sensors temperature out of range." ); break; } /* 200*/ /*0201*/case GuiAlarmID::ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode wet self-test lc vs FMD failure." ); break; } /* 201*/ /*0202*/case GuiAlarmID::ALARM_ID_HD_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode dry pressure normal self-test failure." ); break; } /* 202*/ -/*0203*/case GuiAlarmID::ALARM_ID_AVAILABLE_6 : { result = QObject::tr("Available for use." ); break; } /* 203*/ +/*0203*/case GuiAlarmID::ALARM_ID_DG_FILL_CONDUCTIVITIES_INVALID_CAL_RECORD : { result = QObject::tr("DG fill conductivities acid/bicarb invalid calibration record." ); break; } /* 203*/ /*0204*/case GuiAlarmID::ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE : { result = QObject::tr("DG RO rejection ratio out of range." ); break; } /* 204*/ /*0205*/case GuiAlarmID::ALARM_ID_DG_CONDUCTIVITY_SENSOR_FAULT : { result = QObject::tr("DG conductivity sensor fault." ); break; } /* 205*/ /*0206*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME : { result = QObject::tr("DG dialysate fill runs out of time." ); break; } /* 206*/ @@ -339,7 +339,7 @@ /*0303*/case GuiAlarmID::ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT : { result = QObject::tr("DG drain pump direction FPGA fault." ); break; } /* 303*/ /*0304*/case GuiAlarmID::ALARM_ID_HD_INVALID_USAGE_RECORD_CRC : { result = QObject::tr("HD invalid usage record." ); break; } /* 304*/ /*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR : { result = QObject::tr("HD processor RAM error." ); break; } /* 305*/ -/*0306*/case GuiAlarmID::ALARM_ID_DG_CD1_CD2_CHECK_FAULT : { result = QObject::tr("DG CD1 CD2 check fault." ); break; } /* 306*/ +/*0306*/case GuiAlarmID::ALARM_ID_AVAILABLE_50 : { result = QObject::tr("Alarm ID available." ); break; } /* 306*/ /*0307*/case GuiAlarmID::ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT : { result = QObject::tr("HD AC power lost second alarm." ); break; } /* 307*/ /*0308*/case GuiAlarmID::ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPi conductivity sensor invalid character received." ); break; } /* 308*/ /*0309*/case GuiAlarmID::ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPo conductivity sensor invalid character received." ); break; } /* 309*/ Index: sources/model/hd/data/MHDAirTrapData.h =================================================================== diff -u -r10f946b2ecf6eed25d07d6a22216393dca34ffcc -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) +++ sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -39,8 +39,8 @@ * | || * | #1:(U32) | \ref Data::mAirTrapLowerLevel | * | #2:(U32) | \ref Data::mAirTrapUpperLevel | - * | #2:(U32) | \ref Data::mAirTrapRawLowerLevel | - * | #2:(U32) | \ref Data::mAirTrapRawUpperLevel | + * | #3:(U32) | \ref Data::mAirTrapRawLowerLevel | + * | #4:(U32) | \ref Data::mAirTrapRawUpperLevel | * * \sa Data * Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 -r9891a1deb940324058d295bcd3ff5e55c47701c2 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) @@ -58,27 +58,16 @@ QStringList values; values << QString("%1 - %2").arg(vData.mMinBloodFlowMLPM).arg(vData.mMaxBloodFlowMLPM); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinDialysateFlowMLPM).arg(vData.mMaxDialysateFlowMLPM); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinTxDurationMIN).arg(vData.mMaxTxDurationMIN); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinStopHepDispBeforeTxEndMIN).arg(vData.mMaxStopHepDispBeforeTxEndMIN); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinSalineBolVolumeML).arg(vData.mMaxSalineBolVolumeML); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinDialysateTempC).arg(vData.mMaxDialysateTempC); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinArtPressLimitWindowMMHG).arg(vData.mMaxArtPressLimitWindowMMHG); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinVenPressLimitWindowMMHG).arg(vData.mMaxVenPressLimitWindowMMHG); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinVenAsymPressLimitMMHG).arg(vData.mMaxVenAsymPressLimitMMHG); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinUltrafiltrationVolumeL).arg(vData.mMaxUltrafiltrationVolumeL); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinHepDispRateMLPM).arg(vData.mMaxHepDispRateMLPM); - parametersText(values); values << QString("%1 - %2").arg(vData.mMinHepBolVolumeML).arg(vData.mMaxHepBolVolumeML); parametersText(values);