Index: denali.pro =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- denali.pro (.../denali.pro) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ denali.pro (.../denali.pro) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -38,6 +38,7 @@ sources/model/hd/alarm \ sources/model/hd/data \ sources/model/dg/data \ + sources/model/dg/adjustment \ sources/view \ sources/view/hd/adjustment \ sources/view/hd/alarm \ @@ -71,6 +72,8 @@ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmClearedCondition.h \ + \ # ---------- Models - HD - Adjustment + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ @@ -87,19 +90,22 @@ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.h \ \ # ---------- Models - HD - Data + sources/model/hd/data/MHDOperationModeData.h \ + sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ sources/model/hd/data/MTreatmentOutletFlowData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/MTreatmentPressureOcclusionData.h \ sources/model/hd/data/MTreatmentStatesData.h \ - sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ sources/model/hd/data/MTreatmentHeparinData.h \ sources/model/hd/data/MTreatmentRinsebackData.h \ sources/model/hd/data/MTreatmentRecirculateData.h \ sources/model/hd/data/MTreatmentBloodPrimeData.h \ sources/model/hd/data/MPrimingData.h \ + \ # ---------- Models - DG - Adjustment + sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -110,6 +116,7 @@ sources/model/dg/data/MDGROPumpData.h \ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ + sources/model/dg/data/MDGAccelerometerData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ @@ -132,6 +139,8 @@ sources/view/VPriming.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ + \ # ---------- Views - HD - Adjustment + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ @@ -148,29 +157,31 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \ \ # ---------- Views - HD - Data + sources/view/hd/data/VHDOperationModeData.h \ + sources/view/hd/data/VHDTreatmentStatesData.h \ + sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VTreatmentTime.h \ sources/view/hd/data/VTreatmentBloodFlow.h \ sources/view/hd/data/VTreatmentDialysateFlow.h \ sources/view/hd/data/VTreatmentUltrafiltration.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/hd/data/VTreatmentPressureOcclusion.h \ - sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/VTreatmentSalineData.h \ sources/view/hd/data/VTreatmentHeparinData.h \ sources/view/hd/data/VTreatmentRinsebackData.h \ sources/view/hd/data/VTreatmentRecirculateData.h \ sources/view/hd/data/VTreatmentBloodPrimeData.h \ - sources/view/hd/data/VHDTreatmentStatesData.h \ \ # ---------- Views - DG - Data + sources/view/dg/data/VDGOperationModeData.h \ sources/view/dg/data/VDGDrainPumpData.h \ sources/view/dg/data/VDGHeatersData.h \ sources/view/dg/data/VDGLoadCellReadingsData.h \ - sources/view/dg/data/VDGOperationModeData.h \ sources/view/dg/data/VDGPressuresData.h \ sources/view/dg/data/VDGROPumpData.h \ sources/view/dg/data/VDGReservoirData.h \ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ + sources/view/dg/data/VDGAccelerometerData.h \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -208,6 +219,8 @@ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmClearedCondition.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ + \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \ @@ -222,19 +235,22 @@ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Data + sources/model/hd/data/MHDAccelerometerData.cpp \ + sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ sources/model/hd/data/MTreatmentOutletFlowData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/MTreatmentPressureOcclusionData.cpp \ sources/model/hd/data/MTreatmentStatesData.cpp \ - sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ sources/model/hd/data/MTreatmentHeparinData.cpp \ sources/model/hd/data/MTreatmentRinsebackData.cpp \ sources/model/hd/data/MTreatmentRecirculateData.cpp \ sources/model/hd/data/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/MPrimingData.cpp \ + \ # ---------- Models - DG - Adjustment + sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ @@ -245,6 +261,7 @@ sources/model/dg/data/MDGROPumpData.cpp \ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ + sources/model/dg/data/MDGAccelerometerData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -265,6 +282,8 @@ sources/view/VPowerOff.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + \ # ---------- Views - HD - Adjustment + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ @@ -281,6 +300,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \ \ # ---------- Views - HD - Data + sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VTreatmentTime.cpp \ sources/view/hd/data/VTreatmentBloodFlow.cpp \ sources/view/hd/data/VTreatmentDialysateFlow.cpp \ @@ -304,6 +324,7 @@ sources/view/dg/data/VDGReservoirData.cpp \ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ + sources/view/dg/data/VDGAccelerometerData.cpp \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \ Index: denali.pro.user =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- denali.pro.user (.../denali.pro.user) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ denali.pro.user (.../denali.pro.user) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -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 Generic Linux Device (iMX8))2 + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + 1 + + false + -u + 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 @@ -1185,312 +1490,7 @@ true false - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug - - 1 - - - - 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 Generic Linux Device (iMX8))2 - RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro - 1 - - false - -u - 3768 - false - true - false - false - true - false - - :0 1 Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -427,6 +427,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HD Version Denali message. + * \param vData - Data model contains HD Version state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) +{ + Q_UNUSED(vData); + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustVersionsReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Pressures Limits Adjustment Denali message. * \param vData - Data model contains treatment Pressures Limits adjustment. * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -119,6 +119,7 @@ GuiActionType::ID_AdjustRinsebackReq , GuiActionType::ID_AdjustRecirculateReq , GuiActionType::ID_AdjustTreatmentEndReq , + GuiActionType::ID_AdjustVersionsReq , // Alarm GuiActionType::ID_AlarmUserActionReq , GuiActionType::ID_AlarmSilenceReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -50,29 +50,32 @@ // ----- {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 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateInletFlow , 8 * 4 }, // 7 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 {Gui::GuiActionType::ID_Heparin , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 5 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes + // ---- {Gui::GuiActionType::ID_HDOperationModeData , 1 * 4 }, // 1 parameter each 4bytes // ---- - {Gui::GuiActionType::ID_DGROPumpData , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGDrainPumpData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes {Gui::GuiActionType::ID_DGHeatersData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 12 * 4 }, // 12 parameters each 4bytes + {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes @@ -148,6 +151,11 @@ {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes + // ---- Versions + {Gui::GuiActionType::ID_AdjustVersionsReq , 0 * 4 }, // 0 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustHDVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDGVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes + // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -225,6 +225,7 @@ break; case Gui::GuiActionType::ID_PowerOff : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData ); break; + case Gui::GuiActionType::ID_AdjustVersionsReq : INTERPRET_RECEIVED_MESSAGE(AdjustVersionsRequestData ); break; // in-treatment case Gui::GuiActionType::ID_AdjustDurationReq : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData ); break; @@ -327,7 +328,7 @@ case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break; case Gui::GuiActionType::ID_Recirculate : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Recirculate ); break; case Gui::GuiActionType::ID_BloodPrime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_BloodPrime ); break; - + case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; // ----- Events case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; case Gui::GuiActionType::ID_HDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDDebugText ); break; @@ -348,6 +349,7 @@ case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break; case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; + case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() @@ -404,6 +406,7 @@ case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData); break; case Gui::GuiActionType::ID_DGTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData ); break; case Gui::GuiActionType::ID_DGDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDebugText ); break; + case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -42,6 +42,7 @@ #include "VTreatmentRecirculateData.h" #include "VTreatmentBloodPrimeData.h" #include "VHDTreatmentStatesData.h" +#include "VHDAccelerometerData.h" #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" @@ -52,6 +53,8 @@ #include "VDGReservoirData.h" #include "VDGTemperaturesData.h" #include "VDGValvesStatesData.h" +#include "VDGAccelerometerData.h" + #include "VTreatmentCreate.h" #include "VPriming.h" #include "VTreatmentBegin.h" @@ -67,6 +70,7 @@ #include "VTreatmentAdjustmentRecirculate.h" #include "VTreatmentAdjustmentEnd.h" #include "VTreatmentAdjustmentPressuresLimits.h" +#include "VTreatmentAdjustmentVersions.h" namespace Gui { MainView *_viewer = nullptr; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -91,6 +91,7 @@ ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 + ID_HDAccelerometerData = 0x3300, // 51 // Alarm Messages ID_AlarmStatus = 0x0200, @@ -119,6 +120,7 @@ ID_DGHeatersData = 0x2C00, // 44 ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 + ID_DGAccelerometerData = 0x3400, // 52 // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 @@ -162,7 +164,10 @@ ID_AdjustTreatmentEndReq = 0x5700, // 87 ID_AdjustTreatmentEndRsp = 0x5800, // 88 - + // independent bidirectional + ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustHDVersionsRsp = 0x1D00, // 29 + ID_AdjustDGVersionsRsp = 0x1E00, // 30 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -31,7 +31,7 @@ property string textObjectName: "_DebugDataColumn" width : 150 - spacing : -10 + spacing : -14 Text { id: _title text : _root.title Index: sources/gui/qml/main.qml =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/qml/main.qml (.../main.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/gui/qml/main.qml (.../main.qml) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -23,6 +23,8 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the TreatmentFlows.qml +import VHDTreatmentStates 0.1 +import VTreatmentRanges 0.1 import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 import VTreatmentPressureOcclusion 0.1 @@ -31,11 +33,11 @@ import VAlarmStatus 0.1 import VPowerOff 0.1 import VHDOperationMode 0.1 +import VTreatmentRinseback 0.1 +import VTreatmentRecirculate 0.1 +import VTreatmentBloodPrime 0.1 +import VHDAccelerometer 0.1 -import VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 - -import VTreatmentCreate 0.1 import VDGDrainPump 0.1 import VDGHeaters 0.1 import VDGLoadCellReadings 0.1 @@ -47,22 +49,22 @@ import VDGValvesStates 0.1 import VPriming 0.1 import VTreatmentBegin 0.1 -import VTreatmentAdjustmentUltrafiltrationInit 0.1 +import VTreatmentCreate 0.1 +import VDGAccelerometer 0.1 -import VTreatmentRanges 0.1 -import VTreatmentAdjustmentSaline 0.1 -import VHDTreatmentStates 0.1 +import VTreatmentAdjustmentDuration 0.1 +import VTreatmentAdjustmentFlows 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 +import VTreatmentAdjustmentUltrafiltrationInit 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 +import VTreatmentAdjustmentSaline 0.1 import VTreatmentAdjustmentHeparin 0.1 -import VTreatmentRinseback 0.1 import VTreatmentAdjustmentRinseback 0.1 -import VTreatmentRecirculate 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 -import VTreatmentBloodPrime 0.1 +import VTreatmentAdjustmentVersions 0.1 // Qml imports import "qrc:/globals" @@ -104,7 +106,11 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } - + VTreatmentBloodPrime { id: vTreatmentBloodPrime } + VTreatmentRinseback { id: vTreatmentRinseback } + VTreatmentRecirculate { id: vTreatmentRecirculate } + VHDAccelerometer { id: vHDAccelerometer } + // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } @@ -114,7 +120,8 @@ VDGReservoir { id: vDGReservoir } VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } - + VDGAccelerometer { id: vDGAccelerometer } + // --- VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } @@ -131,12 +138,10 @@ VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } - VTreatmentBloodPrime { id: vTreatmentBloodPrime } - VTreatmentRinseback { id: vTreatmentRinseback } - VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } + VTreatmentAdjustmentVersions { id: vTreatmentAdjustmentVersions } // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -43,9 +43,10 @@ y: row(0) title: qsTr(" ROPmp ") model: [ - vDGROPump.pressure , + vDGROPump.pressure .toFixed(2) , vDGROPump.flowRate .toFixed(2) , - vDGROPump.pwm .toFixed(2) + vDGROPump.pwm .toFixed(2) , + vDGROPump.state ] textObjectName: "_DGROPumpData" } @@ -55,8 +56,10 @@ y: row(0) title: qsTr(" DRPmp ") model: [ - vDGDrainPump.rpm , - vDGDrainPump.dac , + vDGDrainPump.rpmi , + vDGDrainPump.dac , + vDGDrainPump.state , + vDGDrainPump.rpmo ] textObjectName: "_DGDrainPumpData" } @@ -152,55 +155,57 @@ // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn x: col(0) - y: row(3) + y: row(2.8) title: qsTr(" Blood ") model: [ - 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_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_SigStrength .toFixed(2) ] textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn x: col(1.2) - y: row(3) + y: row(2.8) 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_SigStrength .toFixed(2) ] textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn x: col(2.4) - y: row(3) + y: row(2.8) title: qsTr(" Dlyst O ") model: [ - vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) + vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , + vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , + vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , + "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ] textObjectName: "_HDOutletFlowData" } DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(3) + y: row(2.8) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , @@ -213,7 +218,7 @@ } DebugDataColumn { id: _HDOperationModeColumn - x: col(3) + x: col(3.2) y: row(2) title: qsTr(" HD Mode ") model: [ vHDOperationMode.text ] @@ -231,13 +236,84 @@ font.pixelSize: 38 } + DebugDataColumn { id: _HDAccelerometerColumn + x: col(7) + y: row(3.2) + title: qsTr(" HD Acc ") + model: [ + vHDAccelerometer.x .toFixed(3) , + vHDAccelerometer.y .toFixed(3) , + vHDAccelerometer.z .toFixed(3) , + vHDAccelerometer.xMax .toFixed(3) , + vHDAccelerometer.yMax .toFixed(3) , + vHDAccelerometer.zMax .toFixed(3) , + vHDAccelerometer.xTilt .toFixed(3) , + vHDAccelerometer.yTilt .toFixed(3) , + vHDAccelerometer.zTilt .toFixed(3) + ] + textObjectName: "_HDAccelerometerData" + } + + DebugDataColumn { id: _DGAccelerometerColumn + x: col(7) + y: row(0) + title: qsTr(" DG Acc ") + model: [ + vDGAccelerometer.x .toFixed(3) , + vDGAccelerometer.y .toFixed(3) , + vDGAccelerometer.z .toFixed(3) , + vDGAccelerometer.xMax .toFixed(3) , + vDGAccelerometer.yMax .toFixed(3) , + vDGAccelerometer.zMax .toFixed(3) , + vDGAccelerometer.xTilt .toFixed(3) , + vDGAccelerometer.yTilt .toFixed(3) , + vDGAccelerometer.zTilt .toFixed(3) + ] + textObjectName: "_DGAccelerometerData" + } + + DebugDataColumn { id: _HDVersionsColumn + x: col(6.3) + y: row(4.5) + title: qsTr(" HD Ver ") + model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + .arg(vTreatmentAdjustmentVersions.HDVerMajor) + .arg(vTreatmentAdjustmentVersions.HDVerMinor) + .arg(vTreatmentAdjustmentVersions.HDVerMicro) + .arg(vTreatmentAdjustmentVersions.HDVerBuild) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAId) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.HDVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.HDVerFPGALab) + ] + textObjectName: "_HDVersions" + } + + DebugDataColumn { id: _DGVersionsColumn + x: col(6.3) + y: row(5.4) + title: qsTr(" DG Ver ") + model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + .arg(vTreatmentAdjustmentVersions.DGVerMajor) + .arg(vTreatmentAdjustmentVersions.DGVerMinor) + .arg(vTreatmentAdjustmentVersions.DGVerMicro) + .arg(vTreatmentAdjustmentVersions.DGVerBuild) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAId) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.DGVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.DGVerFPGALab) + ] + textObjectName: "_DGVersions" + } + + Text { id : _mouseEventCountText x: col(2) y: row(6) visible: true text: String("Touch Count: %1,%2") - .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) horizontalAlignment: Text.AlignLeft color: Colors.textMain font.pixelSize: 38 Index: sources/model/MModel.h =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/MModel.h (.../MModel.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/model/MModel.h (.../MModel.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -23,6 +23,7 @@ #include "MAlarmCleared.h" #include "MAlarmClearedCondition.h" +#include "MHDOperationModeData.h" #include "MTreatmentTimeData.h" #include "MTreatmentFlowsData.h" #include "MTreatmentOutletFlowData.h" @@ -34,6 +35,8 @@ #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" +#include "MPrimingData.h" +#include "MHDAccelerometerData.h" #include "MDGDrainPumpData.h" #include "MDGHeatersData.h" @@ -44,13 +47,13 @@ #include "MDGROPumpData.h" #include "MDGTemperaturesData.h" #include "MDGValvesStatesData.h" +#include "MDGAccelerometerData.h" #include "MTreatmentParametersResp.h" #include "MHDDebugText.h" #include "MDGDebugText.h" -#include "MHDOperationModeData.h" #include "MTreatmentAdjustRequests.h" #include "MTreatmentAdjustDurationResponse.h" #include "MTreatmentAdjustBloodDialysateResponse.h" @@ -64,8 +67,9 @@ #include "MTreatmentAdjustRecirculateResponse.h" #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" -#include "MPrimingData.h" #include "MStartTreatmentResponse.h" +#include "MTreatmentAdjustHDVersionsResponse.h" +#include "MTreatmentAdjustDGVersionsResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -201,6 +205,7 @@ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( HDOperationModeData ) \ + REGISTER_METATYPE( HDAccelerometerData ) \ \ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ @@ -217,6 +222,7 @@ REGISTER_METATYPE( DGHeatersData ) \ REGISTER_METATYPE( DGLoadCellReadingsData ) \ REGISTER_METATYPE( DGTemperaturesData ) \ + REGISTER_METATYPE( DGAccelerometerData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -244,6 +250,7 @@ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ + REGISTER_METATYPE( AdjustVersionsRequestData ) \ /* Response */ \ REGISTER_METATYPE( StartTreatmentResponseData ) \ \ @@ -260,6 +267,8 @@ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ + REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ + REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ //===============================================================================// /*! @@ -291,6 +300,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ @@ -307,6 +317,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGHeatersData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -326,6 +337,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -345,6 +358,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -385,6 +400,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ @@ -401,6 +417,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGHeatersData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -420,6 +437,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentParametersResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -438,6 +457,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -462,6 +482,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -486,6 +507,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -511,6 +533,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( HDOperationModeData ) \ + ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -525,6 +548,7 @@ ACTION_RECEIVE_SIGNAL( DGHeatersData ) \ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ @@ -545,6 +569,8 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp =================================================================== diff -u --- sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp (revision 0) +++ sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,64 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MTreatmentAdjustDGVersionsResponse.cpp + * \author (last) Peman Montazemi + * \date (last) 10-Dec-2020 + * \author (original) Peman Montazemi + * \date (original) 10-Dec-2020 + * + */ +#include "MTreatmentAdjustDGVersionsResponse.h" + +using namespace Model; + +QVariantList MAdjustDGVersionsResponse::parameters() const { + return { + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor.value, + _data.mFPGAMinor.value, + _data.mFPGALab .value + }; +} + +bool MAdjustDGVersionsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor)) + if (GetValue(vByteArray, index, _data.mFPGAMinor)) + if (GetValue(vByteArray, index, _data.mFPGALab )) + return true ; + 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; } + 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; } +} + +AdjustDGVersionsResponseData MAdjustDGVersionsResponse::data() const { + Data data; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor.value; + data.mFPGAMinor = _data.mFPGAMinor.value; + data.mFPGALab = _data.mFPGALab .value; + return data; +} Index: sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h =================================================================== diff -u --- sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h (revision 0) +++ sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,101 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MTreatmentAdjustDGVersionsResponse.h + * \author (last) Peman Montazemi + * \date (last) 8-Dec-2020 + * \author (original) Peman Montazemi + * \date (original) 8-Dec-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDGVersionsResponse class + * \details The DG versions data model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x1E00 | 0x070 | 17 | Rsp | Y | DG | UI | DG Versions Data | + * + * | Payload || + * | || + * | #1:(U08) | \ref Data::mMajor | + * | #2:(U08) | \ref Data::mMinor | + * | #3:(U08) | \ref Data::mMicro | + * | #4:(U16) | \ref Data::mBuild | + * | #5:(U08) | \ref Data::mFPGAId | + * | #6:(U08) | \ref Data::mFPGAMajor | + * | #7:(U08) | \ref Data::mFPGAMinor | + * | #8:(U08) | \ref Data::mFPGALab | + * + * \sa Data + * \sa MAdjustDGVersionsResponse : DG Versions Response Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | DGVersions | + * + */ +class MAdjustDGVersionsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + QString infoText () const override { return QString("DGVersions") ; } + + struct Data { + quint8 mMajor = 0; /*!< DG Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< DG Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< DG Versions Micro value of type quint8 extracted out */ + quint16 mBuild = 0; /*!< DG Versions Build value of type quint16 extracted out */ + quint8 mFPGAId = 0; /*!< DG Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< DG Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< DG Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< DG Versions FPGA Lab value of type quint8 extracted out */ + }; + + MAdjustDGVersionsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDGVersionsResponse::Data AdjustDGVersionsResponseData; Index: sources/model/dg/data/MDGAccelerometerData.cpp =================================================================== diff -u --- sources/model/dg/data/MDGAccelerometerData.cpp (revision 0) +++ sources/model/dg/data/MDGAccelerometerData.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,68 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MDGAccelerometerData.cpp + * \author (last) Peman Montazemi + * \date (last) 20-Oct-2020 + * \author (original) Peman Montazemi + * \date (original) 20-Oct-2020 + * + */ +#include "MDGAccelerometerData.h" + +using namespace Model; + +QVariantList MDGAccelerometer::parameters() const { + return { + _data.mX .value, + _data.mY .value, + _data.mZ .value, + _data.mXMax .value, + _data.mYMax .value, + _data.mZMax .value, + _data.mXTilt .value, + _data.mYTilt .value, + _data.mZTilt .value, + }; +} + +bool MDGAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mX )) + if (GetValue(vByteArray, index, _data.mY )) + if (GetValue(vByteArray, index, _data.mZ )) + if (GetValue(vByteArray, index, _data.mXMax )) + if (GetValue(vByteArray, index, _data.mYMax )) + if (GetValue(vByteArray, index, _data.mZMax )) + if (GetValue(vByteArray, index, _data.mXTilt )) + if (GetValue(vByteArray, index, _data.mYTilt )) + if (GetValue(vByteArray, index, _data.mZTilt )) + return true ; + 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; } + 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; } + else { if(vIndex) *vIndex = index; return false; } +} + +MDGAccelerometer::Data MDGAccelerometer::data() const { + Data data; + data.mX = _data.mX .value; + data.mY = _data.mY .value; + data.mZ = _data.mZ .value; + data.mXMax = _data.mXMax .value; + data.mYMax = _data.mYMax .value; + data.mZMax = _data.mZMax .value; + data.mXTilt = _data.mXTilt .value; + data.mYTilt = _data.mYTilt .value; + data.mZTilt = _data.mZTilt .value; + return data; +} Index: sources/model/dg/data/MDGAccelerometerData.h =================================================================== diff -u --- sources/model/dg/data/MDGAccelerometerData.h (revision 0) +++ sources/model/dg/data/MDGAccelerometerData.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,106 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MDGAccelerometerData.h + * \author (last) Peman Montazemi + * \date (last) 20-Oct-2020 + * \author (original) Peman Montazemi + * \date (original) 20-Oct-2020 + * + */ +#pragma once + + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDGAccelerometer class + * \details The DG accelerometer data model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x3400 | 0x080 | 8 | 1 Hz | N | DG | UI | DG Acceleromter Data | + * + * | Payload || + * | || + * | #1:(F32) | \ref Data::mX | + * | #2:(F32) | \ref Data::mY | + * | #3:(F32) | \ref Data::mZ | + * | #4:(F32) | \ref Data::mXMax | + * | #5:(F32) | \ref Data::mYMax | + * | #6:(F32) | \ref Data::mZMax | + * | #7:(F32) | \ref Data::mXTilt | + * | #8:(F32) | \ref Data::mYTilt | + * | #9:(F32) | \ref Data::mZTilt | + * + * \sa Data + * \sa MDGAccemelometer : DG Accelerometer Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | DGAccelData | + * + */ +class MDGAccelerometer : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::F32 mX ; + Types::F32 mY ; + Types::F32 mZ ; + Types::F32 mXMax ; + Types::F32 mYMax ; + Types::F32 mZMax ; + Types::F32 mXTilt ; + Types::F32 mYTilt ; + Types::F32 mZTilt ; + } _data; + +public: + + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eDG ; } + QString infoText() const override { return QString("DGAccelData") ; } + + struct Data { + float mX = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ + float mY = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ + float mZ = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ + float mXMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ + float mYMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ + float mZMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ + float mXTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ + float mYTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ + float mZTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ + }; + +public: + MDGAccelerometer () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDGAccelerometer::Data DGAccelerometerData; Index: sources/model/dg/data/MDGDrainPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGDrainPumpData.cpp (.../MDGDrainPumpData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGDrainPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGDrainPumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "MDGDrainPumpData.h" @@ -18,18 +18,24 @@ QVariantList MDGDrainPump::parameters() const { return { - _data.mRPM .value, - _data.mDAC .value + _data.mRPMI .value, + _data.mDAC .value, + _data.mState .value, + _data.mRPMO .value, }; } bool MDGDrainPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mRPM )) - if (GetValue(vByteArray, index, _data.mDAC )) + if (GetValue(vByteArray, index, _data.mRPMI )) + if (GetValue(vByteArray, index, _data.mDAC )) + if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mRPMO )) return true ; 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; } } /*! @@ -39,7 +45,9 @@ */ MDGDrainPump::Data MDGDrainPump::data() const { Data data; - data.mRPM = _data.mRPM .value; - data.mDAC = _data.mDAC .value; + data.mRPMI = _data.mRPMI .value; + data.mDAC = _data.mDAC .value; + data.mState = _data.mState .value; + data.mRPMO = _data.mRPMO .value; return data; } Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGDrainPumpData.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGDrainPumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -36,8 +36,10 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mRPM | - * | #2:(U32) | \ref Data::mDAC | + * | #1:(U32) | \ref Data::mRPMI | + * | #2:(U32) | \ref Data::mDAC | + * | #3:(U32) | \ref Data::mState | + * | #4:(U32) | \ref Data::mPRMO | * * \sa Data * @@ -57,8 +59,10 @@ QVariantList parameters() const override; struct { - Types::U32 mRPM ; + Types::U32 mRPMI ; Types::U32 mDAC ; + Types::U32 mState ; + Types::U32 mRPMO ; } _data; public: @@ -68,8 +72,10 @@ QString infoText () const override { return QString("DrainPump"); } struct Data { - quint32 mRPM = 0; ///< Set pt. RPM - quint32 mDAC = 0; ///< DAC value + quint32 mRPMI = 0; ///< Set pt. RPM + quint32 mDAC = 0; ///< DAC value + quint32 mState = 0; ///< State + quint32 mRPMO = 0; ///< RPM read }; MDGDrainPump () { } Index: sources/model/dg/data/MDGROPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGROPumpData.cpp (.../MDGROPumpData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGROPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGROPumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "MDGROPumpData.h" @@ -20,7 +20,8 @@ return { _data.mPressure.value, _data.mFlowRate.value, - _data.mPWM .value + _data.mPWM .value, + _data.mState .value }; } @@ -29,10 +30,12 @@ if (GetValue(vByteArray, index, _data.mPressure)) if (GetValue(vByteArray, index, _data.mFlowRate)) if (GetValue(vByteArray, index, _data.mPWM )) - return true ; + if (GetValue(vByteArray, index, _data.mState )) + return true ; 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; } } /*! @@ -45,5 +48,6 @@ data.mPressure = _data.mPressure.value; data.mFlowRate = _data.mFlowRate.value; data.mPWM = _data.mPWM .value; + data.mState = _data.mState .value; return data; } Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGROPumpData.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGROPumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -36,9 +36,10 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mPressure| - * | #2:(F32) | \ref Data::mFlowRate| - * | #3:(F32) | \ref Data::mPWM | + * | #1:(F32) | \ref Data::mPressure | + * | #2:(F32) | \ref Data::mFlowRate | + * | #3:(F32) | \ref Data::mPWM | + * | #4:(U32) | \ref Data::mState | * * \sa Data * @@ -58,9 +59,10 @@ QVariantList parameters() const override; struct { - Types::U32 mPressure ; + Types::F32 mPressure ; Types::F32 mFlowRate ; Types::F32 mPWM ; + Types::U32 mState ; } _data; public: @@ -70,9 +72,10 @@ QString infoText () const override { return QString("ROPump"); } struct Data { - quint32 mPressure = 0; ///< Set pt. pressure + float mPressure = 0; ///< Set pt. pressure float mFlowRate = 0; ///< flow rate float mPWM = 0; ///< PWM + quint32 mState = 0; ///< State }; MDGROPump () { } Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,64 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDVersionResponse.cpp + * \author (last) Peman Montazemi + * \date (last) 4-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#include "MTreatmentAdjustHDVersionsResponse.h" + +using namespace Model; + +QVariantList MAdjustHDVersionsResponse::parameters() const { + return { + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor.value, + _data.mFPGAMinor.value, + _data.mFPGALab .value + }; +} + +bool MAdjustHDVersionsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor)) + if (GetValue(vByteArray, index, _data.mFPGAMinor)) + if (GetValue(vByteArray, index, _data.mFPGALab )) + return true ; + 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; } + 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; } +} + +AdjustHDVersionsResponseData MAdjustHDVersionsResponse::data() const { + Data data; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor.value; + data.mFPGAMinor = _data.mFPGAMinor.value; + data.mFPGALab = _data.mFPGALab .value; + return data; +} Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,101 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MTreatmentAdjustHDVersionsResponse.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustHDVersionsResponse class + * \details The HD versions data model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x1D00 | 0x020 | 6 | Rsp | Y | HD | UI | HD Versions Data | + * + * | Payload || + * | || + * | #1:(U08) | \ref Data::mHDMajor | + * | #2:(U08) | \ref Data::mHDMinor | + * | #3:(U08) | \ref Data::mHDMicro | + * | #4:(U16) | \ref Data::mHDBuild | + * | #5:(U08) | \ref Data::mHDFPGAId | + * | #6:(U08) | \ref Data::mHDFPGAMajor | + * | #7:(U08) | \ref Data::mHDFPGAMinor | + * | #8:(U08) | \ref Data::mHDFPGALab | + * + * \sa Data + * \sa MAdjustHDVersionsResponse : HD Versions Response Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | HDVersions | + * + */ +class MAdjustHDVersionsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("HDVersions") ; } + + struct Data { + quint8 mMajor = 0; /*!< HD Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< HD Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< HD Versions Micro value of type quint8 extracted out */ + quint16 mBuild = 0; /*!< HD Versions Build value of type quint16 extracted out */ + quint8 mFPGAId = 0; /*!< HD Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< HD Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< HD Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< HD Versions FPGA Lab value of type quint8 extracted out */ + }; + + MAdjustHDVersionsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponseData; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -458,8 +458,32 @@ } }; +/*! + * \brief The MAdjustVersionsReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------:| + * | 0x1C00 | 0x200 | 10 | Req | Y | UI | All | DG/HD Versions Request | + * + * | Payload || + * | || + * | #1:(N/A) | \ref None | + * + */ +class MAdjustVersionsReq : public MModel { +public: + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("Version", vParameters); + } +}; - //// ---------- Alarms /*! @@ -705,6 +729,7 @@ typedef Model:: MStartTreatmentReq StartTreatmentRequestData; typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r3345651cca9723989785801ee25001dc3e4f28a1 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 3345651cca9723989785801ee25001dc3e4f28a1) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -34,7 +34,6 @@ if (GetValue(vByteArray, index, _data.mEscalatesIn )) if (GetValue(vByteArray, index, _data.mMuteTimeout )) if (GetBits (vByteArray, index, _data.mFlags , GuiAlarmFlags::NUM_OF_ALARM_STATE_FLAG_BIT_POS)) { - qDebug() << _data.mFlags.toString(); return true ; } else { if(vIndex) *vIndex = index; return false; } @@ -170,7 +169,7 @@ case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME : { result = QObject::tr("DG dialysate fill runs out of time" ); break; } case GuiAlarmID::ALARM_ID_CP1_SPEED_CONTROL_ERROR : { result = QObject::tr("DG concentrate pump CP1 speed control error" ); break; } case GuiAlarmID::ALARM_ID_CP2_SPEED_CONTROL_ERROR : { result = QObject::tr("DG concentrate pump CP2 speed control error" ); break; } - //// TODO: Has been removed // case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("DG flow rate out of range" ); break; } + case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE : { result = QObject::tr("DG flow rate out of upper range" ); break; } case GuiAlarmID::ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DG RO pump pressure out of range" ); break; } case GuiAlarmID::ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DG drain pump RPM out of range" ); break; } case GuiAlarmID::ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE : { result = QObject::tr("DG heaters cold junction temperature out of range" ); break; } Index: sources/model/hd/data/MHDAccelerometerData.cpp =================================================================== diff -u --- sources/model/hd/data/MHDAccelerometerData.cpp (revision 0) +++ sources/model/hd/data/MHDAccelerometerData.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,68 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDAccelerometerData.cpp + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#include "MHDAccelerometerData.h" + +using namespace Model; + +QVariantList MHDAccelerometer::parameters() const { + return { + _data.mX .value, + _data.mY .value, + _data.mZ .value, + _data.mXMax .value, + _data.mYMax .value, + _data.mZMax .value, + _data.mXTilt .value, + _data.mYTilt .value, + _data.mZTilt .value, + }; +} + +bool MHDAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mX )) + if (GetValue(vByteArray, index, _data.mY )) + if (GetValue(vByteArray, index, _data.mZ )) + if (GetValue(vByteArray, index, _data.mXMax )) + if (GetValue(vByteArray, index, _data.mYMax )) + if (GetValue(vByteArray, index, _data.mZMax )) + if (GetValue(vByteArray, index, _data.mXTilt )) + if (GetValue(vByteArray, index, _data.mYTilt )) + if (GetValue(vByteArray, index, _data.mZTilt )) + return true ; + 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; } + 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; } + else { if(vIndex) *vIndex = index; return false; } +} + +MHDAccelerometer::Data MHDAccelerometer::data() const { + Data data; + data.mX = _data.mX .value; + data.mY = _data.mY .value; + data.mZ = _data.mZ .value; + data.mXMax = _data.mXMax .value; + data.mYMax = _data.mYMax .value; + data.mZMax = _data.mZMax .value; + data.mXTilt = _data.mXTilt .value; + data.mYTilt = _data.mYTilt .value; + data.mZTilt = _data.mZTilt .value; + return data; +} Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u --- sources/model/hd/data/MHDAccelerometerData.h (revision 0) +++ sources/model/hd/data/MHDAccelerometerData.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,107 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDAccelerometerData.h + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#pragma once + + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MHDAccelerometer class + * \details The HD accelerometer data model + * + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x3300 | 0x040 | 7 | 1 Hz | N | HD | UI | HD Acceleromter Data | + * + * | Payload || + * | || + * | #1:(F32) | \ref Data::mX | + * | #2:(F32) | \ref Data::mY | + * | #3:(F32) | \ref Data::mZ | + * | #4:(F32) | \ref Data::mXMax | + * | #5:(F32) | \ref Data::mYMax | + * | #6:(F32) | \ref Data::mZMax | + * | #7:(F32) | \ref Data::mXTilt | + * | #8:(F32) | \ref Data::mYTilt | + * | #9:(F32) | \ref Data::mZTilt | + * + * \sa Data + * \sa MHDAccemelometer : HD Accelerometer Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | HDAccelData | + * + */ +class MHDAccelerometer : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::F32 mX ; + Types::F32 mY ; + Types::F32 mZ ; + Types::F32 mXMax ; + Types::F32 mYMax ; + Types::F32 mZMax ; + Types::F32 mXTilt ; + Types::F32 mYTilt ; + Types::F32 mZTilt ; + } _data; + +public: + + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("HDAccelData") ; } + + struct Data { + float mX = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ + float mY = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ + float mZ = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ + float mXMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ + float mYMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ + float mZMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ + float mXTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ + float mYTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ + float mZTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ + }; + +public: + MHDAccelerometer () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MHDAccelerometer::Data HDAccelerometerData; Index: sources/model/hd/data/MTreatmentFlowsData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/data/MTreatmentFlowsData.cpp (.../MTreatmentFlowsData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -26,7 +26,7 @@ _data.mMotorSpeed .value, _data.mMotorCtlSpeed .value, _data.mMotorCtlCurrent.value, - _data.mPWMDutyCycle .value + _data.mPWMDutyCycle .value, }; } Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -43,6 +43,7 @@ Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % + Types::F32 mSigStrength ; ///< Signal Strength in % } _data; public: @@ -99,6 +100,7 @@ float mMotorCtlSpeed = 0; ///< Motor Controller Speed float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % + float mSigStrength = 0; ///< Signal Strength in % }; MBloodFlow() { } @@ -150,6 +152,7 @@ float mMotorCtlSpeed = 0; ///< Motor Controller Speed float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % + float mSigStrength = 0; ///< Signal Strength in % }; MDialysateFlow() { } Index: sources/view/VView.h =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/VView.h (.../VView.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ sources/view/VView.h (.../VView.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -118,6 +118,7 @@ REGISTER_TYPE( VTreatmentBloodPrime ) \ REGISTER_TYPE( VHDOperationMode ) \ REGISTER_TYPE( VHDTreatmentStates ) \ + REGISTER_TYPE( VHDAccelerometer ) \ \ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDGHeaters ) \ @@ -128,6 +129,7 @@ REGISTER_TYPE( VDGReservoir ) \ REGISTER_TYPE( VDGTemperatures ) \ REGISTER_TYPE( VDGValvesStates ) \ + REGISTER_TYPE( VDGAccelerometer ) \ \ REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ @@ -144,5 +146,6 @@ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VPriming ) \ REGISTER_TYPE( VTreatmentBegin ) \ - + REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ + //--------------------------------------------------------------------------------// Index: sources/view/dg/data/VDGAccelerometerData.cpp =================================================================== diff -u --- sources/view/dg/data/VDGAccelerometerData.cpp (revision 0) +++ sources/view/dg/data/VDGAccelerometerData.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,32 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VDGAccelerometerData.cpp + * \author (last) Peman Montazemi + * \date (last) 20-Oct-2020 + * \author (original) Peman Montazemi + * \date (original) 20-Oct-2020 + * + */ +#include "VDGAccelerometerData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VDGAccelerometer, DGAccelerometerData) + +void VDGAccelerometer::onActionReceive(const DGAccelerometerData &vData) { + x (vData.mX ); + y (vData.mY ); + z (vData.mZ ); + xMax (vData.mXMax ); + yMax (vData.mYMax ); + zMax (vData.mZMax ); + zTilt (vData.mXTilt ); + yTilt (vData.mYTilt ); + zTilt (vData.mZTilt ); +} Index: sources/view/dg/data/VDGAccelerometerData.h =================================================================== diff -u --- sources/view/dg/data/VDGAccelerometerData.h (revision 0) +++ sources/view/dg/data/VDGAccelerometerData.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VDGAccelerometerData.h + * \author (last) Peman Montazemi + * \date (last) 20-Oct-2020 + * \author (original) Peman Montazemi + * \date (original) 20-Oct-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MModel.h" +#include "VView.h" + +// namespace +namespace View { + +/*! + * \brief The VDGAccelerometer class + * \details View for Model's Data representation. + * + * \sa Model::MDGAccelerometer + * + */ +class VDGAccelerometer : public QObject { + Q_OBJECT + + PROPERTY( float , x , 0) + PROPERTY( float , y , 0) + PROPERTY( float , z , 0) + PROPERTY( float , xMax , 0) + PROPERTY( float , yMax , 0) + PROPERTY( float , zMax , 0) + PROPERTY( float , xTilt , 0) + PROPERTY( float , yTilt , 0) + PROPERTY( float , zTilt , 0) + + VIEW_DEC(VDGAccelerometer, DGAccelerometerData) +}; +} Index: sources/view/dg/data/VDGDrainPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VDGDrainPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGDrainPumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "VDGDrainPumpData.h" @@ -21,6 +21,8 @@ void VDGDrainPump::onActionReceive(const DGDrainPumpData &vData) { - rpm ( vData.mRPM ); - dac ( vData.mDAC ); + rpmi ( vData.mRPMI ); + dac ( vData.mDAC ); + state ( vData.mState ); + rpmo ( vData.mRPMO ); } Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VDGDrainPumpData.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGDrainPumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -36,8 +36,10 @@ { Q_OBJECT - PROPERTY( quint32 , rpm , 0) - PROPERTY( quint32 , dac , 0) + PROPERTY( quint32 , rpmi , 0) + PROPERTY( quint32 , dac , 0) + PROPERTY( quint32 , state , 0) + PROPERTY( quint32 , rpmo , 0) VIEW_DEC(VDGDrainPump, DGDrainPumpData) }; Index: sources/view/dg/data/VDGROPumpData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/dg/data/VDGROPumpData.cpp (.../VDGROPumpData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGROPumpData.cpp (.../VDGROPumpData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -6,10 +6,10 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VDGROPumpData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \author (last) Behrouz NematiPour + * \date (last) 12-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "VDGROPumpData.h" @@ -21,7 +21,8 @@ void VDGROPump::onActionReceive(const DGROPumpData &vData) { - pressure ( vData.mPressure ); - flowRate ( vData.mFlowRate ); - pwm ( vData.mPWM ); + pressure ( vData.mPressure ); + flowRate ( vData.mFlowRate ); + pwm ( vData.mPWM ); + state ( vData.mState ); } Index: sources/view/dg/data/VDGROPumpData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -36,9 +36,10 @@ { Q_OBJECT - PROPERTY( quint32 , pressure , 0) + PROPERTY( float , pressure , 0) PROPERTY( float , flowRate , 0) PROPERTY( float , pwm , 0) + PROPERTY( quint32 , state , 0) VIEW_DEC(VDGROPump, DGROPumpData) }; Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentVersions.cpp + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#include "VTreatmentAdjustmentVersions.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions, AdjustVersionsResponseData) + +void VTreatmentAdjustmentVersions::initConnections() { + ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); + ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData); + ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); +} + +void VTreatmentAdjustmentVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) +{ + // HD versions data + HDVerMajor (vData.mMajor ); + HDVerMinor (vData.mMinor ); + HDVerMicro (vData.mMicro ); + HDVerBuild (vData.mBuild ); + HDVerFPGAId (vData.mFPGAId ); + HDVerFPGAMajor (vData.mFPGAMajor); + HDVerFPGAMinor (vData.mFPGAMinor); + HDVerFPGALab (vData.mFPGALab ); + + // *** 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. *** + adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not +} + +void VTreatmentAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData) +{ + // DG versions data + DGVerMajor (vData.mMajor ); + DGVerMinor (vData.mMinor ); + DGVerMicro (vData.mMicro ); + DGVerBuild (vData.mBuild ); + DGVerFPGAId (vData.mFPGAId ); + DGVerFPGAMajor (vData.mFPGAMajor); + DGVerFPGAMinor (vData.mFPGAMinor); + DGVerFPGALab (vData.mFPGALab ); + + // *** 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. *** + adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,81 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentVersions.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#pragma once + +#include + +// Project +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentVersions class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustVersionsResponse + * + */ +class VTreatmentAdjustmentVersions : public VTreatmentAdjustmentResponseBase { + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustVersionsRequestData _data; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustmentHD , 0) + TRIGGER( bool , adjustmentDG , 0) + // coco end + + // HD Versions data + PROPERTY( quint8 , HDVerMajor , 0) + PROPERTY( quint8 , HDVerMinor , 0) + PROPERTY( quint8 , HDVerMicro , 0) + PROPERTY( quint16 , HDVerBuild , 0) + PROPERTY( quint8 , HDVerFPGAId , 0) + PROPERTY( quint8 , HDVerFPGAMajor , 0) + PROPERTY( quint8 , HDVerFPGAMinor , 0) + PROPERTY( quint8 , HDVerFPGALab , 0) + + // DG Versions data + PROPERTY( quint8 , DGVerMajor , 0) + PROPERTY( quint8 , DGVerMinor , 0) + PROPERTY( quint8 , DGVerMicro , 0) + PROPERTY( quint16 , DGVerBuild , 0) + PROPERTY( quint8 , DGVerFPGAId , 0) + PROPERTY( quint8 , DGVerFPGAMajor , 0) + PROPERTY( quint8 , DGVerFPGAMinor , 0) + PROPERTY( quint8 , DGVerFPGALab , 0) + + VIEW_DEC_CLASS(VTreatmentAdjustmentVersions) + VIEW_DEC_SLOT (AdjustHDVersionsResponseData) + VIEW_DEC_SLOT (AdjustDGVersionsResponseData) + +// ---------- Version +public slots: + void doAdjustment() { + AdjustVersionsRequestData data; + emit didAdjustment(data); + } + +signals: + void didAdjustment(const AdjustVersionsRequestData &vData); +}; +} Index: sources/view/hd/data/VHDAccelerometerData.cpp =================================================================== diff -u --- sources/view/hd/data/VHDAccelerometerData.cpp (revision 0) +++ sources/view/hd/data/VHDAccelerometerData.cpp (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,32 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VHDAccelerometerData.cpp + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#include "VHDAccelerometerData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VHDAccelerometer, HDAccelerometerData) + +void VHDAccelerometer::onActionReceive(const HDAccelerometerData &vData) { + x (vData.mX ); + y (vData.mY ); + z (vData.mZ ); + xMax (vData.mXMax ); + yMax (vData.mYMax ); + zMax (vData.mZMax ); + zTilt (vData.mXTilt ); + yTilt (vData.mYTilt ); + zTilt (vData.mZTilt ); +} Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u --- sources/view/hd/data/VHDAccelerometerData.h (revision 0) +++ sources/view/hd/data/VHDAccelerometerData.h (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VHDAccelerometerData.h + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MModel.h" +#include "VView.h" + +// namespace +namespace View { + +/*! + * \brief The VHDAccelerometer class + * \details View for Model's Data representation. + *#include "VTreatmentAdjustmentResponseBase.h" + * \sa Model::MHDAccelerometer + * + */ +class VHDAccelerometer : public QObject { + Q_OBJECT + + PROPERTY( float , x , 0) + PROPERTY( float , y , 0) + PROPERTY( float , z , 0) + PROPERTY( float , xMax , 0) + PROPERTY( float , yMax , 0) + PROPERTY( float , zMax , 0) + PROPERTY( float , xTilt , 0) + PROPERTY( float , yTilt , 0) + PROPERTY( float , zTilt , 0) + + VIEW_DEC(VHDAccelerometer, HDAccelerometerData) +}; +} Index: sources/view/hd/data/VTreatmentBloodFlow.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/hd/data/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -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_SigStrength (vData.mSigStrength ); } Index: sources/view/hd/data/VTreatmentBloodFlow.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -43,6 +43,7 @@ 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/hd/data/VTreatmentDialysateFlow.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/hd/data/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -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_SigStrength (vData.mSigStrength ); } Index: sources/view/hd/data/VTreatmentDialysateFlow.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -43,6 +43,7 @@ PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) + PROPERTY( float , dialysateFlow_SigStrength , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) };