Index: denali.pro =================================================================== diff -u -r242ef09c059eac13b036989147f5e2314df54a30 -r51936e788b311fec39d28c387e5026f50e06c165 --- denali.pro (.../denali.pro) (revision 242ef09c059eac13b036989147f5e2314df54a30) +++ denali.pro (.../denali.pro) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -101,7 +101,6 @@ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ sources/model/dg/data/MDGAccelerometerData.h \ - sources/model/dg/data/MTreatmentAdjustDGVersionsResponse.h \ \ # CANBus sources/canbus/caninterface.h \ sources/canbus/frameinterface.h \ Index: denali.pro.user =================================================================== diff -u -r242ef09c059eac13b036989147f5e2314df54a30 -r51936e788b311fec39d28c387e5026f50e06c165 --- denali.pro.user (.../denali.pro.user) (revision 242ef09c059eac13b036989147f5e2314df54a30) +++ denali.pro.user (.../denali.pro.user) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r8ad91bd76ffd6aa405cec91f2e51042a87c6fbe0 -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 8ad91bd76ffd6aa405cec91f2e51042a87c6fbe0) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -7,7 +7,7 @@ * * \file ManagerHome.qml * \author (last) Peman Montazemi - * \date (last) 10-Dec-2020 + * \date (last) 14-Dec-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 * @@ -152,23 +152,24 @@ // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn x: col(0) - y: row(3.2) + y: row(2.8) title: qsTr(" Blood ") model: [ - vTreatmentBloodFlow.bloodFlow_FlowSetPoint , + vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) + "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , + "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) ] textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn x: col(1.2) - y: row(3.2) + y: row(2.8) title: qsTr(" Dlyst I ") model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , @@ -177,14 +178,15 @@ vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) + "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , + "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn x: col(2.4) - y: row(3.2) + y: row(2.8) title: qsTr(" Dlyst O ") model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , @@ -200,7 +202,7 @@ DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(3.2) + y: row(2.8) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , @@ -278,22 +280,14 @@ y: row(5.4) title: qsTr(" DG Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(0) - .arg(4) - .arg(5) - .arg(1034) - .arg(254) - .arg(0) - .arg(1) - .arg(255) - //.arg(vTreatmentAdjustmentDGVersions.verMajor) - //.arg(vTreatmentAdjustmentDGVersions.verMinor) - //.arg(vTreatmentAdjustmentDGVersions.verMicro) - //.arg(vTreatmentAdjustmentDGVersions.verBuild) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAId) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAMajor) - //.arg(vTreatmentAdjustmentDGVersions.verFPGAMinor) - //.arg(vTreatmentAdjustmentDGVersions.verFPGALab) + .arg(vTreatmentAdjustmentDGVersions.verMajor) + .arg(vTreatmentAdjustmentDGVersions.verMinor) + .arg(vTreatmentAdjustmentDGVersions.verMicro) + .arg(vTreatmentAdjustmentDGVersions.verBuild) + .arg(vTreatmentAdjustmentDGVersions.verFPGAId) + .arg(vTreatmentAdjustmentDGVersions.verFPGAMajor) + .arg(vTreatmentAdjustmentDGVersions.verFPGAMinor) + .arg(vTreatmentAdjustmentDGVersions.verFPGALab) ] textObjectName: "_DGVersions" } Index: sources/model/hd/data/MTreatmentFlowsData.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -26,7 +26,8 @@ _data.mMotorSpeed .value, _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent.value, - _data.mPWMDutyCycle .value + _data.mPWMDutyCycle .value, + _data.mSigStrength .value }; } @@ -39,6 +40,7 @@ if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + if (GetValue(vByteArray, index, _data.mSigStrength )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -47,6 +49,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } // ----- BloodFlow ----- @@ -59,6 +62,7 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mSigStrength = _data.mSigStrength .value; return data; } @@ -72,5 +76,6 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mSigStrength = _data.mSigStrength .value; return data; } Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MTreatmentFlowsData.h - * \author (last) Behrouz NemaiPour - * \date (last) 28-Jul-2020 + * \author (last) Peman Montazemi + * \date (last) 14-Dec-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -43,6 +43,7 @@ Types::F32 mMotorCtlSpeed ; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ Types::F32 mMotorCtlCurrent ; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ Types::F32 mPWMDutyCycle ; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + Types::F32 mSigStrength ; /*!< vSigStrength - Signal Strength in % value of type float extracted out */ } _data; public: @@ -74,6 +75,7 @@ float mMotorCtlSpeed = 0; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + float mSigStrength = 0; /*!< vSigStrength - Signal Strength in % value of type float extracted out */ }; MBloodFlow() { } @@ -100,6 +102,7 @@ float mMotorCtlSpeed = 0; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + float mSigStrength = 0; /*!< vSigStrength - Signal Strength in % value of type float extracted out */ }; MDialysateFlow() { } Index: sources/view/vtreatmentbloodflow.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -35,9 +35,9 @@ PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) PROPERTY( float , bloodFlow_PWMDutyCycle , 0) + PROPERTY( float , bloodFlow_SigStrength , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) - }; } Index: sources/view/vtreatmentdialysateflow.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r51936e788b311fec39d28c387e5026f50e06c165 --- sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 51936e788b311fec39d28c387e5026f50e06c165) @@ -35,9 +35,9 @@ PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) + PROPERTY( float , dialysateFlow_SigStrength , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) - }; }