Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -35,15 +35,15 @@ * * | 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::mMotorCtlCurrent | - * | #6 :(F32) | \ref Data::mRPM | - * | #7 :(U32) | \ref Data::mRotorCount | - * | #8 :(U32) | \ref Data::mPresFlow | - * | #9 :(U32) | \ref Data::mRotorHall | + * | #1 :(S32) | \ref Data:: mH4SetFlowRate | + * | #2 :(F32) | \ref Data:: mH4MeasFlow | + * | #3 :(F32) | \ref Data:: mH4MeasRotorSpd | + * | #4 :(F32) | \ref Data:: mH4MeasPumpSpd | + * | #5 :(F32) | \ref Data:: mH4MeasCurr | + * | #6 :(F32) | \ref Data:: mH4SetRPM | + * | #7 :(U32) | \ref Data:: mH4RotorCount | + * | #8 :(U32) | \ref Data:: mH4PresFlow | + * | #9 :(U32) | \ref Data:: mH6RotorHallState | * * \sa Data * @@ -61,33 +61,33 @@ friend class ::tst_models; struct { - Types::S32 mH4FlowSetPoint ; ///< Flow Set Point - Types::F32 mH4MeasuredFlow ; ///< Measured Flow - Types::F32 mH4RotorSpeed ; ///< Rotor Speed - Types::F32 mH4MotorSpeed ; ///< Motor Speed - Types::F32 mH4MotorCtlCurrent ; ///< Motor Controller Current - Types::F32 mH4RPM ; ///< RPM - Types::U32 mH4RotorCount ; ///< Rotor Count - Types::U32 mH4PresFlow ; ///< Prescribed flow rate - Types::U32 mH4RotorHall ; ///< Rotor Hall Sensor Value + Types::S32 mH4SetFlowRate ; ///< Set flow rate in mL/min. + Types::F32 mH4MeasFlow ; ///< Measured flow rate in mL/min. + Types::F32 mH4MeasRotorSpd ; ///< Measured rotor speed in RPM. + Types::F32 mH4MeasPumpSpd ; ///< Measured pump speed in RPM. + Types::F32 mH4MeasCurr ; ///< Measure motor current in Amps. + Types::F32 mH4SetRPM ; ///< Set motor speed in RPM. + Types::U32 mH4RotorCount ; ///< Rotor count. + Types::U32 mH4PresFlow ; ///< Prescribed blood flow in mL/min. + Types::U32 mH6RotorHallState ; ///< Rotor hall state (1=home, 0=not home) } _data; QVariantList parameters() const override; public: - Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + Type_Enum typeText () const override { return Type_Enum::eDatum ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } 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 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 + qint32 mSetFlowRate = 0; ///< Set flow rate in mL/min. + float mMeasFlow = 0; ///< Measured flow rate in mL/min. + float mMeasRotorSpd = 0; ///< Measured rotor speed in RPM. + float mMeasPumpSpd = 0; ///< Measured pump speed in RPM. + float mMeasCurr = 0; ///< Measure motor current in Amps. + float mSetRPM = 0; ///< Set motor speed in RPM. + quint32 mRotorCount = 0; ///< Rotor count. + quint32 mPresFlow = 0; ///< Prescribed blood flow in mL/min. + quint32 mRotorHallState = 0; ///< Rotor hall state (1=home, 0=not home) }; MBloodFlow() { }