Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -151,15 +151,21 @@ * * | Payload || * | || - * | #1:(U32) | \ref duration | + * | #1:(U32) | \ref duration | + * | #2:(U32) | \ref heparinDuration | + * | #3:(F32) | \ref rate | * */ class MAdjustDurationConfirmReq : public MModel { public: - quint32 duration = 0; + quint32 duration = 0; + quint32 heparinDuration = 0; + float rate = 0; QString toString() { - return toString({duration}); + return toString({duration, + heparinDuration, + rate}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustDurationConfirm", vParameters); @@ -180,7 +186,7 @@ * | #2:(U32) | \ref dialysateFlowRate | * | #3:(F32) | \ref dialysateTemperature | * | #4:(U32) | \ref acidConcentrate | - * | #5:(U32) | \ref acidConcentrateConversionFactor | + * | #5:(F32) | \ref acidConcentrateConversionFactor | * | #6:(U32) | \ref bicarbConcentrate | * | #7:(U32) | \ref treatmentModality | * | #8:(U32) | \ref hepatitus | @@ -348,20 +354,22 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x6600| 0x041 | Req | Y | UI | HD | UF Vol. Change User Confirm | + * |0x6600| 0x041 | Req | Y | UI | TD | UF Vol. Change User Confirm | * * | Payload || * | || * | #1:(F32) | \ref volume | + * | #2:(F32) | \ref rate | * * \sa Options * */ class MAdjustUltrafiltrationConfirmReq : public MModel { public: - float volume = 0; + float volume = 0; + float rate = 0; QString toString() { - return toString({volume}); + return toString({volume, rate}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); @@ -555,25 +563,25 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| - * |0x4600| 0x100 | Req | Y | UI | TD | A/V BP Limit Change Request | + * |0x7200| 0x100 | Req | Y | UI | TD | A/V BP Limit Change Request | * * | Payload ||| * | ||| - * | #1:(S32) | \ref mArterialPressureLimitWindow | (mmHg) | - * | #2:(S32) | \ref mVenousPressureLimitWindow | (mmHg) | - * | #3:(S32) | \ref mVenousPressureLimitAsymtrc | (mmHg) | - * | #4:(S32) | \ref mTmpPressureLimitWindow | (mmHg) | + * | #1:(U32) | \ref mArterialPressureLimitWindow | (mmHg) | + * | #2:(U32) | \ref mVenousPressureLimitWindow | (mmHg) | + * | #3:(U32) | \ref mVenousPressureLimitAsymtrc | (mmHg) | + * | #4:(U32) | \ref mTmpPressureLimitWindow | (mmHg) | * * \sa MPressureOcclusion : Pressure data broadcast * \sa MAdjustPressuresResponse : Pressures limit adjustment response * */ class MAdjustPressuresLimitsReq : public MModel { public: - qint32 mArterialPressureLimitWindow = 0; ///< (S32) Arterial Pressure Limit Window (mmHg) - qint32 mVenousPressureLimitWindow = 0; ///< (S32) Venous Pressure Limit Window (mmHg) - qint32 mVenousPressureLimitAsymtrc = 0; ///< (S32) Venous Pressure Limit Asymmetric (mmHg) - qint32 mTmpLimitWindow = 0; ///< (S32) Transmembrane Pressure Limit Window (mmHg) + quint32 mArterialPressureLimitWindow = 0; ///< (U32) Arterial Pressure Limit Window (mmHg) + quint32 mVenousPressureLimitWindow = 0; ///< (U32) Venous Pressure Limit Window (mmHg) + quint32 mVenousPressureLimitAsymtrc = 0; ///< (U32) Venous Pressure Limit Asymmetric (mmHg) + quint32 mTmpLimitWindow = 0; ///< (U32) Transmembrane Pressure Limit Window (mmHg) QString toString() { return toString