Index: sources/model/hd/data/treatment/MTreatmentHeparinData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r1edd5fe4e852a2b352a86587820a269a5103fc9f --- sources/model/hd/data/treatment/MTreatmentHeparinData.h (.../MTreatmentHeparinData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentHeparinData.h (.../MTreatmentHeparinData.h) (revision 1edd5fe4e852a2b352a86587820a269a5103fc9f) @@ -32,12 +32,13 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Heparin Data | + * |0x8C00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Heparin Data | * * | Payload || * | || - * | #1:(F32) | \ref Data::mCumulative | - * | #2:(F32) | \ref Data::mTarget | + * | #1:(F32) | \ref Data::mCumulative | + * | #2:(F32) | \ref Data::mTarget | + * | #2:(U32) | \ref Data::mTimeRemaining | * * \sa Data * \sa MAdjustHeparinReq : Heparin Request @@ -59,8 +60,9 @@ QVariantList parameters() const override; struct { - Types::F32 mCumulative ; - Types::F32 mTarget ; + Types::F32 mCumulative ; + Types::F32 mTarget ; + Types::U32 mTimeRemaining ; } _data; public: @@ -70,8 +72,9 @@ QString infoText() const override { return QString("Heparin") ; } struct Data { - float mCumulative = 0; ///< Cumulative volume of all Heparin deliveries during current treatment - float mTarget = 0; ///< Target volume of all Heparin deliveries during current treatment + float mCumulative = 0; ///< Cumulative volume of all Heparin deliveries during current treatment + float mTarget = 0; ///< Target volume of all Heparin deliveries during current treatment + int mTimeRemaining = 0; ///< Time remaining heparing time remaining }; public: