Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -31,28 +31,27 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | + * |0x1100| 0x100 | 7 | 1 Hz | N | TD | All | Blood 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 | - * | #8 :(U32) | \ref Data::mRotorCount | - * | #9 :(U32) | \ref Data::mPresFlow | - * | #10:(U32) | \ref Data::mRotorHall | + * | #5 :(F32) | \ref Data::mMotorCtlCurrent | + * | #6 :(F32) | \ref Data::mRPM | + * | #7 :(U32) | \ref Data::mRotorCount | + * | #8 :(U32) | \ref Data::mPresFlow | + * | #9 :(U32) | \ref Data::mRotorHall | * * \sa Data * *

Logging info

* | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | BloodFlow | * */ @@ -62,16 +61,15 @@ friend class ::tst_models; 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 % - Types::U32 mRotorCount ; ///< Rotor Count - Types::U32 mPresFlow ; ///< Prescribed flow rate - Types::U32 mRotorHall ; ///< Rotor hall sensor value + Types::S32 mFlowSetPoint ; ///< Flow Set Point + Types::F32 mMeasuredFlow ; ///< Measured Flow + Types::F32 mRotorSpeed ; ///< Rotor Speed + Types::F32 mMotorSpeed ; ///< Motor Speed + Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current + Types::F32 mRPM ; ///< RPM + Types::U32 mRotorCount ; ///< Rotor Count + Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor Hall Sensor Value } _data; QVariantList parameters() const override; @@ -81,16 +79,15 @@ QString infoText () const override { return QString("BloodFlow"); } 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 % - quint32 mRotorCount = 0; ///< Rotor Count - quint32 mPresFlow = 0; ///< Prescribed flow rate - quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value + qint32 mFlowSetPoint = 0; ///< Flow Set Point + float mMeasuredFlow = 0; ///< Measured Flow + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mRPM = 0; ///< RPM + quint32 mRotorCount = 0; ///< Rotor Count + quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value }; MBloodFlow() { }