Index: AlarmMapping.csv =================================================================== diff -u -r10f946b2ecf6eed25d07d6a22216393dca34ffcc -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -90,15 +90,15 @@ 89,"DG outlet UV reactor on with no flow." 90,"DG load cells A1/B1 FPGA fault." 91,"HD No dialysate flow data receive in the last 3 seconds." - 92,"Available for use." + 92,"DG temperature sensors invalid calibration record." 93,"DG outlet primary conductivity out of range." 94,"DG pressure out of range." 95,"DG watchdog expired." 96,"DG inlet water temperature in high range." 97,"DG fill conductivity out of range." 98,"HD battery communication fault." 99,"HD syringe pump stall alarm." - 100,"Available for use." + 100,"DG conductivity sensors invalid temperature compensation calibration record." 101,"UI POST HD communication failure." 102,"DG heat disinfect temperature gradient out of range." 103,"HD invalid calibration CRC." Index: denali.pro.user =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- denali.pro.user (.../denali.pro.user) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ denali.pro.user (.../denali.pro.user) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -460,47 +460,47 @@ RemoteLinux.DirectUploadStep /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - 192.168.137.247 - 192.168.137.202 - 192.168.137.36 - 192.168.137.125 - 192.168.137.26 + 192.168.137.210 + 192.168.10.159 + 192.168.10.228 + 192.168.10.228 + 192.168.10.138 + 192.168.137.25 + 192.168.137.30 + 192.168.10.186 + 192.168.10.167 192.168.137.170 - 192.168.137.24 - 192.168.40.23 192.168.137.3 - 192.168.10.186 - 192.168.137.30 - 192.168.137.25 + 192.168.40.23 + 192.168.137.24 + 192.168.137.26 192.168.137.170 192.168.10.186 - 192.168.10.167 - 192.168.10.159 - 192.168.137.210 - 192.168.10.138 - 192.168.10.228 - 192.168.10.228 + 192.168.137.36 + 192.168.137.125 + 192.168.137.202 + 192.168.137.247 /home/root @@ -527,9 +527,12 @@ /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots @@ -538,57 +541,54 @@ /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - 2023-02-02T02:26:33.738 - 2023-02-02T01:46:50.167 - 2023-02-01T03:23:15.710 - 2023-02-02T02:07:25.922 - 2023-02-01T05:00:56.449 - 2023-01-27T09:45:11.898 - 2023-02-02T02:05:29.947 - 2023-01-24T17:29:54.849 - 2023-02-02T02:40:56.627 - 2023-01-18T20:13:36.296 - 2023-02-02T02:30:48.337 + 2023-02-02T01:52:20.307 + 2023-01-24T18:19:13.179 + 2023-01-17T18:06:25.579 + 2023-01-17T18:18:03.749 + 2023-02-02T09:06:00.862 2023-02-02T02:13:54.596 - 2023-01-27T10:15:15.423 + 2023-02-02T02:30:48.337 2023-01-18T17:47:08.797 2023-02-02T19:40:15.813 - 2023-01-24T18:19:13.179 - 2023-02-02T01:52:20.307 - 2023-02-02T09:06:00.862 - 2023-01-17T18:18:03.749 - 2023-01-17T18:06:25.579 + 2023-01-27T10:15:15.423 + 2023-02-02T02:40:56.627 + 2023-01-24T17:29:54.849 + 2023-02-02T02:05:29.947 + 2023-02-01T05:00:56.449 + 2023-01-27T09:45:11.898 + 2023-01-18T20:13:36.296 + 2023-02-01T03:23:15.710 + 2023-02-02T02:07:25.922 + 2023-02-02T01:46:50.167 + 2023-02-02T02:26:33.738 - 2023-02-02T02:26:46.000 - 2023-02-02T01:47:02.000 - 2023-02-01T03:23:28.000 - 2023-02-02T02:07:21.000 - 2023-02-01T05:00:51.000 - 2023-01-27T09:44:58.000 - 2023-02-02T02:05:42.000 - 2023-01-24T17:30:03.000 - 2023-02-02T02:41:10.000 - 2023-01-18T20:13:33.000 - 2023-02-02T02:31:01.000 + 2023-02-02T01:52:16.000 + 2023-01-24T18:18:58.000 + 2023-01-17T18:05:42.000 + 2023-01-17T18:17:25.000 + 2023-02-02T09:05:22.000 2023-02-02T02:14:08.000 - 2023-01-27T10:15:08.000 + 2023-02-02T02:31:01.000 2023-01-18T17:47:04.000 2023-02-02T19:39:36.000 - 2023-01-24T18:18:58.000 - 2023-02-02T01:52:16.000 - 2023-02-02T09:05:22.000 - 2023-01-17T18:17:25.000 - 2023-01-17T18:05:42.000 + 2023-01-27T10:15:08.000 + 2023-02-02T02:41:10.000 + 2023-01-24T17:30:03.000 + 2023-02-02T02:05:42.000 + 2023-02-01T05:00:51.000 + 2023-01-27T09:44:58.000 + 2023-01-18T20:13:33.000 + 2023-02-01T03:23:28.000 + 2023-02-02T02:07:21.000 + 2023-02-02T01:47:02.000 + 2023-02-02T02:26:46.000 2 Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -238,7 +238,7 @@ case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustServiceDatesReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData ); break; case Gui::GuiActionType::ID_HDUsageInfoReq : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData ); break; - case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInstitutionalRequestData ); break; + case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData ); break; // Pre-Treatment case Gui::GuiActionType::ID_AdjustInitTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData ); break; case Gui::GuiActionType::ID_AdjustParametersValidationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -288,7 +288,7 @@ // Institutional record request and response ID_AdjustInstitutionalRecordReq = 0xCF00, // 207 UI -> HD request institutional record - ID_AdjustInstitutionalRecordRsp = 0xD000, // 208 HD -> UI response institutional record + ID_AdjustInstitutionalRecordRsp = 0xD000, // 208 HD -> UI response institutional record }; Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -45,10 +45,9 @@ touchable : false itemsValueLeftMargin: itemWidth / 2 + 50 - itemsUnitLeftMargin : itemWidth / 4 + 50 + itemsUnitLeftMargin : itemWidth / 3 + 50 itemsValue : vAdjustmentInstitutionalRecord.parametersText itemsUnit : vAdjustmentInstitutionalRecord.parametersUnit itemsText : vAdjustmentInstitutionalRecord.parametersTitle } - } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -70,7 +70,7 @@ readonly property bool visibleSetDateTime : loggedIn || onlyUpdating readonly property bool visibleDeviceConfiguration : onlyManufacturing && loggedIn readonly property bool visibleDeviceRegistration : onlyManufacturing && loggedIn - readonly property bool visibleInstitutionalRecord : true //TODO uncomment loggedIn + readonly property bool visibleInstitutionalRecord : true enum ItemsIndex { @@ -242,7 +242,7 @@ push( _SettingsRootSSHAccess) break - case SettingsStack.FactoryReset: + case SettingsStack.FactoryReset: push( _serviceFactoryReset ) break @@ -251,6 +251,7 @@ break case SettingsStack.InstitutionalRecord: + vAdjustmentInstitutionalRecord.doAdjustment() push( _settingsInstitutionalRecord ) break Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 28-Feb-2024 + * \date (last) 03-Mar-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -125,15 +125,15 @@ /*0089*/case GuiAlarmID::ALARM_ID_DG_OUTLET_UV_REACTOR_ON_WITH_NO_FLOW : { result = QObject::tr("DG outlet UV reactor on with no flow." ); break; } /* 89*/ /*0090*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT : { result = QObject::tr("DG load cells A1/B1 FPGA fault." ); break; } /* 90*/ /*0091*/case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE : { result = QObject::tr("HD No dialysate flow data receive in the last 3 seconds." ); break; } /* 91*/ -/*0092*/case GuiAlarmID::ALARM_ID_AVAILABLE_1 : { result = QObject::tr("Available for use." ); break; } /* 92*/ +/*0092*/case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD : { result = QObject::tr("DG temperature sensors invalid calibration record." ); break; } /* 92*/ /*0093*/case GuiAlarmID::ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("DG outlet primary conductivity out of range." ); break; } /* 93*/ /*0094*/case GuiAlarmID::ALARM_ID_DG_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DG pressure out of range." ); break; } /* 94*/ /*0095*/case GuiAlarmID::ALARM_ID_DG_WATCHDOG_EXPIRED : { result = QObject::tr("DG watchdog expired." ); break; } /* 95*/ /*0096*/case GuiAlarmID::ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE : { result = QObject::tr("DG inlet water temperature in high range." ); break; } /* 96*/ /*0097*/case GuiAlarmID::ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("DG fill conductivity out of range." ); break; } /* 97*/ /*0098*/case GuiAlarmID::ALARM_ID_HD_BATTERY_COMM_FAULT : { result = QObject::tr("HD battery communication fault." ); break; } /* 98*/ /*0099*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_STALL : { result = QObject::tr("HD syringe pump stall alarm." ); break; } /* 99*/ -/*0100*/case GuiAlarmID::ALARM_ID_AVAILABLE_12 : { result = QObject::tr("Available for use." ); break; } /* 100*/ +/*0100*/case GuiAlarmID::ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD : { result = QObject::tr("DG conductivity sensors invalid temperature compensation calibration record." ); break; } /* 100*/ /*0101*/case GuiAlarmID::ALARM_ID_UI_POST_HD_COMM : { result = QObject::tr("UI POST HD communication failure." ); break; } /* 101*/ /*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE : { result = QObject::tr("DG heat disinfect temperature gradient out of range." ); break; } /* 102*/ /*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD invalid calibration CRC." ); break; } /* 103*/ Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rac49f0bd00d33f7326e82ae2d213e1b21e9083d4 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision ac49f0bd00d33f7326e82ae2d213e1b21e9083d4) @@ -28,8 +28,8 @@ void View::VAdjustmentInstitutionalRecord::onActionReceive(const AdjustInstitutionalRecordResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); minBloodFlowMLPM ( vData.mMinBloodFlowMLPM ); maxBloodFlowMLPM ( vData.mMaxBloodFlowMLPM ); minDialysateFlowMLPM ( vData.mMinDialysateFlowMLPM ); @@ -59,8 +59,29 @@ 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); - // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true );