Index: denali.pro.user =================================================================== diff -u -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a -r614a24f69b322ff08e8155fec8fb5881d590934c --- denali.pro.user (.../denali.pro.user) (revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a) +++ denali.pro.user (.../denali.pro.user) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -86,6 +86,311 @@ ProjectExplorer.Project.Target.0 + Qt 5.12.5 (iMX8) + Qt 5.12.5 (iMX8) + {5d6458ef-f917-4aef-a092-c77bbe106149} + 1 + 0 + 0 + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Check for free disk space + + RemoteLinux.CheckForFreeDiskSpaceStep + + + + + / + 5242880 + + + + + true + Kill current application instance + + RemoteLinux.KillAppStep + + + + + + + + + true + Deploy files via rsync + + RemoteLinux.RsyncDeployStep + + + + + + + -av + false + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Remote Linux Host + + DeployToGenericLinux + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 1 + + + denali (on UI Test Board) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + 1 + + false + + 3768 + false + true + false + false + true + false + + + :0 + + 1 + + + + ProjectExplorer.Project.Target.1 + Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit @@ -1191,311 +1496,6 @@ - ProjectExplorer.Project.Target.1 - - Qt 5.12.5 (iMX8) - Qt 5.12.5 (iMX8) - {5d6458ef-f917-4aef-a092-c77bbe106149} - 0 - 0 - 0 - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Check for free disk space - - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - / - 5242880 - - - - - true - Kill current application instance - - RemoteLinux.KillAppStep - - - - - - - - - true - Deploy files via rsync - - RemoteLinux.RsyncDeployStep - - - - - - - -av - false - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Remote Linux Host - - DeployToGenericLinux - - 1 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 1 - - - denali (on UI Test Board) - RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro - 1 - - false - - 3768 - false - true - false - false - true - false - - - :0 - - 1 - - - ProjectExplorer.Project.TargetCount 2 Index: sources/canbus/messageglobals.h =================================================================== diff -u -radf89000bad1a50ec33114ea76d65621a1d351d5 -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -50,8 +50,8 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 7 * 4 }, // 7 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateInletFlow , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes Index: sources/gui/guiglobals.h =================================================================== diff -u -radf89000bad1a50ec33114ea76d65621a1d351d5 -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/gui/guiglobals.h (.../guiglobals.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -88,9 +88,9 @@ ID_CreateTreatmentRsp = 0x3600, // 54 ID_StartTreatmentReq = 0x3800, // 56 ID_StartTreatmentRsp = 0x3900, // 57 - ID_ConfirmTreatmentReq = 0x3A00, // 58 - ID_EndTreatmentReq = 0x3B00, // 59 - ID_EndTreatmentRsp = 0x3C00, // 60 + ID_ConfirmTreatmentReq = 0x3B00, // 59 + ID_EndTreatmentReq = 0x3C00, // 60 + ID_EndTreatmentRsp = 0x3D00, // 61 ID_PrimingData = 0x3700, // 55 Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -161,7 +161,8 @@ 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_SignalStrengthPct.toFixed(2) ] textObjectName: "_HDBloodFlowData" } @@ -171,13 +172,14 @@ y: row(3) title: qsTr(" Dlyst I ") model: [ - vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) + vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , + "%" + vTreatmentDialysateFlow.dialysateFlow_SignalStrengthPct.toFixed(2) ] textObjectName: "_HDInletFlowData" } @@ -222,7 +224,7 @@ Text { id : _canbusFaultCountText x: col(0) - y: row(6) + y: row(6, 40) property int count: 0 visible: true text: qsTr("CAN Faults: %1").arg(count) @@ -233,7 +235,7 @@ Text { id : _mouseEventCountText x: col(2) - y: row(6) + y: row(6, 40) visible: true text: String("Touch Count: %1,%2") .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) Index: sources/model/hd/data/MTreatmentFlowsData.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -20,25 +20,27 @@ QVariantList MFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlSpeed .value, - _data.mMotorCtlCurrent.value, - _data.mPWMDutyCycle .value + _data.mFlowSetPoint .value, + _data.mMeasuredFlow .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlSpeed .value, + _data.mMotorCtlCurrent .value, + _data.mPWMDutyCycle .value, + _data.mSignalStrengthPct.value }; } bool MFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mFlowSetPoint )) - if (GetValue(vByteArray, index, _data.mMeasuredFlow )) - if (GetValue(vByteArray, index, _data.mRotorSpeed )) - if (GetValue(vByteArray, index, _data.mMotorSpeed )) - if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) - if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) - if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + if (GetValue(vByteArray, index, _data.mFlowSetPoint )) + if (GetValue(vByteArray, index, _data.mMeasuredFlow )) + if (GetValue(vByteArray, index, _data.mRotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) + if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + if (GetValue(vByteArray, index, _data.mSignalStrengthPct)) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -47,30 +49,33 @@ 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 ----- MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; - data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; - data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mFlowSetPoint = _data.mFlowSetPoint .value; + data.mMeasuredFlow = _data.mMeasuredFlow .value; + data.mRotorSpeed = _data.mRotorSpeed .value; + data.mMotorSpeed = _data.mMotorSpeed .value; + data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; + data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; + data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mSignalStrengthPct = _data.mSignalStrengthPct.value; return data; } // ----- DialysateFlow ----- MDialysateFlow::Data MDialysateFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; - data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; - data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mFlowSetPoint = _data.mFlowSetPoint .value; + data.mMeasuredFlow = _data.mMeasuredFlow .value; + data.mRotorSpeed = _data.mRotorSpeed .value; + data.mMotorSpeed = _data.mMotorSpeed .value; + data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; + data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; + data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + data.mSignalStrengthPct = _data.mSignalStrengthPct.value; return data; } Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -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 mSignalStrengthPct ; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ } _data; public: @@ -67,13 +68,14 @@ QString infoText () const override { return QString("BloodFlow"); } struct Data { - qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ - float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ - float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ - 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 */ + qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ + float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ + float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ + float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ + 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 mSignalStrengthPct = 0; /*!< vSignalStrengthPct - Signal Strength in % value of type float extracted out */ }; MBloodFlow() { } @@ -93,13 +95,14 @@ QString infoText () const override { return QString("DialysateFlow"); } struct Data { - qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ - float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ - float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ - 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 */ + qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ + float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ + float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ + float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ + 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 mSignalStrengthPct = 0; /*!< vSignalStrenghtPct- Signal Strength in % value of type float extracted out */ }; MDialysateFlow() { } Index: sources/view/vtreatmentbloodflow.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/view/vtreatmentbloodflow.cpp (.../vtreatmentbloodflow.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentbloodflow.cpp (.../vtreatmentbloodflow.cpp) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -21,11 +21,12 @@ void VTreatmentBloodFlow::onActionReceive(const BloodFlowData &vData) { - bloodFlow_FlowSetPoint (vData.mFlowSetPoint ); - bloodFlow_MeasuredFlow (vData.mMeasuredFlow ); - bloodFlow_RotorSpeed (vData.mRotorSpeed ); - bloodFlow_MotorSpeed (vData.mMotorSpeed ); - bloodFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); - bloodFlow_MotorCtlCurrent (vData.mMotorCtlCurrent); - bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); + bloodFlow_FlowSetPoint (vData.mFlowSetPoint ); + bloodFlow_MeasuredFlow (vData.mMeasuredFlow ); + bloodFlow_RotorSpeed (vData.mRotorSpeed ); + bloodFlow_MotorSpeed (vData.mMotorSpeed ); + bloodFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); + bloodFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); + bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); + bloodFlow_SignalStrengthPct (vData.mSignalStrengthPct); } Index: sources/view/vtreatmentbloodflow.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -28,13 +28,14 @@ { Q_OBJECT - PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0) - PROPERTY( float , bloodFlow_MeasuredFlow , 0) - PROPERTY( float , bloodFlow_RotorSpeed , 0) - PROPERTY( float , bloodFlow_MotorSpeed , 0) - PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) - PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) - PROPERTY( float , bloodFlow_PWMDutyCycle , 0) + PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( float , bloodFlow_MeasuredFlow , 0) + PROPERTY( float , bloodFlow_RotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlCurrent , 0) + PROPERTY( float , bloodFlow_PWMDutyCycle , 0) + PROPERTY( float , bloodFlow_SignalStrengthPct , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) Index: sources/view/vtreatmentdialysateflow.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/view/vtreatmentdialysateflow.cpp (.../vtreatmentdialysateflow.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentdialysateflow.cpp (.../vtreatmentdialysateflow.cpp) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -21,11 +21,12 @@ void VTreatmentDialysateFlow::onActionReceive(const DialysateFlowData &vData) { - dialysateFlow_FlowSetPoint (vData.mFlowSetPoint ); - dialysateFlow_MeasuredFlow (vData.mMeasuredFlow ); - dialysateFlow_RotorSpeed (vData.mRotorSpeed ); - dialysateFlow_MotorSpeed (vData.mMotorSpeed ); - dialysateFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); - dialysateFlow_MotorCtlCurrent (vData.mMotorCtlCurrent); - dialysateFlow_PWMDutyCycle (vData.mPWMDutyCycle ); + dialysateFlow_FlowSetPoint (vData.mFlowSetPoint ); + dialysateFlow_MeasuredFlow (vData.mMeasuredFlow ); + dialysateFlow_RotorSpeed (vData.mRotorSpeed ); + dialysateFlow_MotorSpeed (vData.mMotorSpeed ); + dialysateFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); + dialysateFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); + dialysateFlow_PWMDutyCycle (vData.mPWMDutyCycle ); + dialysateFlow_SignalStrengthPct (vData.mSignalStrengthPct); } Index: sources/view/vtreatmentdialysateflow.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r614a24f69b322ff08e8155fec8fb5881d590934c --- sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 614a24f69b322ff08e8155fec8fb5881d590934c) @@ -28,13 +28,14 @@ { Q_OBJECT - PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0) - PROPERTY( float , dialysateFlow_MeasuredFlow , 0) - PROPERTY( float , dialysateFlow_RotorSpeed , 0) - PROPERTY( float , dialysateFlow_MotorSpeed , 0) - PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) - PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) - PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) + PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0) + PROPERTY( float , dialysateFlow_MeasuredFlow , 0) + PROPERTY( float , dialysateFlow_RotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlCurrent , 0) + PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) + PROPERTY( float , dialysateFlow_SignalStrengthPct , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData)