Index: denali.pro =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- denali.pro (.../denali.pro) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ denali.pro (.../denali.pro) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -203,8 +203,8 @@ sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentTimeData.h \ - sources/model/hd/data/treatment/MTreatmentInletFlowData.h \ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h \ + sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h \ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h \ sources/model/hd/data/treatment/MTreatmentSalineData.h \ @@ -448,7 +448,7 @@ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp \ - sources/model/hd/data/treatment/MTreatmentInletFlowData.cpp \ + sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp \ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp \ sources/model/hd/data/treatment/MTreatmentSalineData.cpp \ Index: sources/model/MModel.h =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/model/MModel.h (.../MModel.h) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ sources/model/MModel.h (.../MModel.h) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -45,8 +45,8 @@ // HD Data Messages #include "MTreatmentTimeData.h" -#include "MTreatmentInletFlowData.h" #include "MTreatmentBloodFlowData.h" +#include "MTreatmentDialysateFlowData.h" #include "MTreatmentOutletFlowData.h" #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentRangesData.h" Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -16,18 +16,16 @@ using namespace Model; -// ----- BloodFlow ----- - QVariantList MBloodFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlSpeed .value, - _data.mMotorCtlCurrent.value, - _data.mPWMDutyCycle .value, - _data.mRotorCount .value, + _data.mFlowSetPoint .value, + _data.mMeasuredFlow .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlSpeed .value, + _data.mMotorCtlCurrent .value, + _data.mPWMDutyCycle .value, + _data.mRotorCount .value, }; } @@ -67,6 +65,6 @@ data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; data.mPWMDutyCycle = _data.mPWMDutyCycle .value; - data.mRotorCount = _data.mRotorCount .value; + data.mRotorCount = _data.mRotorCount .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -42,7 +42,7 @@ * | #5:(F32) | \ref Data::mMotorCtlSpeed | * | #6:(F32) | \ref Data::mMotorCtlCurrent | * | #7:(F32) | \ref Data::mPWMDutyCycle | - * | #7:(U32) | \ref Data::mRotorCount | + * | #8:(U32) | \ref Data::mRotorCount | * * \sa Data * @@ -67,7 +67,7 @@ Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % - Types::U32 mRotorCount ; ///< Signal Strength in % + Types::U32 mRotorCount ; ///< Rotor Count } _data; QVariantList parameters() const override; Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (revision 0) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -0,0 +1,67 @@ +/*! + * + * Copyright (c) 2019-2022 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 MTreatmentInletFlowData.cpp + * \author (last) Michael Garthwaite + * \date (last) 9-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 9-Feb-2022 + * + */ +#include "MTreatmentDialysateFlowData.h" + +using namespace Model; + +QVariantList MDialysateFlow::parameters() const { + return { + _data.mFlowSetPoint .value, + _data.mMeasuredFlow .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlSpeed .value, + _data.mMotorCtlCurrent.value, + _data.mPWMDutyCycle .value, + }; +} + +bool MDialysateFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mFlowSetPoint )) + if (GetValue(vByteArray, index, _data.mMeasuredFlow )) + if (GetValue(vByteArray, index, _data.mRotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) + if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + 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; } +} + + +/*! + * \brief MDialysateFlow::data + * \details Provides model's Data from the received messages data values of + * DialysateFlow. + * \return Data + */ +MDialysateFlow::Data MDialysateFlow::data() const { + Data data; + data.mFlowSetPoint = _data.mFlowSetPoint .value; + data.mMeasuredFlow = _data.mMeasuredFlow .value; + data.mRotorSpeed = _data.mRotorSpeed .value; + data.mMotorSpeed = _data.mMotorSpeed .value; + data.mMotorCtlSpeed = _data.mMotorCtlSpeed .value; + data.mMotorCtlCurrent = _data.mMotorCtlCurrent.value; + data.mPWMDutyCycle = _data.mPWMDutyCycle .value; + return data; +} Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h =================================================================== diff -u --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (revision 0) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -0,0 +1,95 @@ +/*! + * + * Copyright (c) 2019-2022 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 MTreatmentFlowsData.h + * \author (last) Michael Garthwaite + * \date (last) 09-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 09-Feb-2022 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDialysateFlow class + * \details The dialysate flow data model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0800| 0x040 | 7 | 1 Hz | N | HD | All | Dialysate Flow Data | + * + * | Payload || + * | || + * | #1:(S32) | \ref Data::mFlowSetPoint | + * | #2:(F32) | \ref Data::mMeasuredFlow | + * | #3:(F32) | \ref Data::mRotorSpeed | + * | #4:(F32) | \ref Data::mMotorSpeed | + * | #5:(F32) | \ref Data::mMotorCtlSpeed | + * | #6:(F32) | \ref Data::mMotorCtlCurrent | + * | #7:(F32) | \ref Data::mPWMDutyCycle | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | DialysateFlow | + * + */ +class MDialysateFlow : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::S32 mFlowSetPoint ; ///< Flow Set Point + Types::F32 mMeasuredFlow ; ///< Measured Flow + Types::F32 mRotorSpeed ; ///< Rotor Speed + Types::F32 mMotorSpeed ; ///< Motor Speed + Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed + Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current + Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % + } _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("DialysateFlow"); } + + struct Data { + qint32 mFlowSetPoint = 0; ///< Flow Set Point + float mMeasuredFlow = 0; ///< Measured Flow + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlSpeed = 0; ///< Motor Controller Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % + }; + + MDialysateFlow() { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data() const; +}; +} +typedef Model::MDialysateFlow::Data DialysateFlowData; Fisheye: Tag 22e9fba5d14ea03731b4e30f6bbde22561921894 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentInletFlowData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 22e9fba5d14ea03731b4e30f6bbde22561921894 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentInletFlowData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -28,5 +28,5 @@ bloodFlow_MotorCtlSpeed (vData.mMotorCtlSpeed ); bloodFlow_MotorCtlCurrent (vData.mMotorCtlCurrent ); bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); - bloodFlow_RotorCount (vData.mRotorCount ); + bloodFlow_RotorCount (vData.mRotorCount ); } Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h =================================================================== diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 10f39b63ce8a992280ab123f05a5eb44a27c121b) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -20,7 +20,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VView.h" -#include "MTreatmentInletFlowData.h" +#include "MTreatmentDialysateFlowData.h" // namespace namespace View {