Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r4a67c01045f365be38f1a12a8572c0070d343e1e -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 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 MTreatmentAdjustRequests.h * \author (last) Behrouz NematiPour - * \date (last) 13-Jun-2021 + * \date (last) 31-May-2023 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -39,7 +39,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0100| 0x020 | 6 | Cmd | N | HD | UI | Power Off | + * |0x0100| 0x020 | 6 | Cmd | N | UI | HD | Power Off | * * | Payload || * | || @@ -55,15 +55,46 @@ QString toString() { return toString({state}); } + // disabled coco end explicit MAdjustPowerOffReq(quint8 vState) : state(vState) { } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("PowerOff", vParameters); } }; /*! + * \brief The MDuetConfirmUIr class + * \details The power off request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0100| 0x020 | Rsp | Y | UI | HD | Confirm | + * + * | Payload || + * | || + * | #1:(U08) | \ref state | + * + * + */ +class MDuetConfirmUIr : public MModel { +public: + quint32 mId = 0; /*!< Request ID */ + quint32 mConfirm = 0; /*!< user confirm */ + + // disabled coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({mId, mConfirm}); + } + // disabled coco end + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("Confirm", vParameters); + } +}; + +/*! * \brief The MAdjustBloodDialysateReq class * \details The blood/dialysate rate change request model * @@ -283,38 +314,28 @@ * * | Payload ||| * | ||| - * | #1:(S32) | \ref mArterialLimitLow | (mmHg) | - * | #2:(S32) | \ref mArterialLimitHigh | (mmHg) | - * | #3:(S32) | \ref mVenousLimitLow | (mmHg) | - * | #4:(S32) | \ref mVenousLimitHigh | (mmHg) | + * | #1:(S32) | \ref mArterialPressureLimitWindow | (mmHg) | + * | #2:(S32) | \ref mVenousPressureLimitWindow | (mmHg) | + * | #3:(S32) | \ref mVenousPressureLimitAsymtrc | (mmHg) | * * \sa MPressureOcclusion : Pressure data broadcast * \sa MAdjustPressuresResponse : Pressures limit adjustment response * */ class MAdjustPressuresLimitsReq : public MModel { - public: - static const qint32 ArterialLimitLowDef = -300; // PRS354 manufacturing default - static const qint32 ArterialLimitHighDef = 0; // PRS355 manufacturing default - static const qint32 VenousLimitLowDef = +20; // PRS356 manufacturing default - static const qint32 VenousLimitHighDef = +400; // PRS357 manufacturing default + 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) -public: - qint32 mArterialLimitLow = ArterialLimitLowDef ; ///< (S32) Arterial Pressure Limit Low (mmHg) - qint32 mArterialLimitHigh = ArterialLimitHighDef; ///< (S32) Arterial Pressure Limit High (mmHg) - qint32 mVenousLimitLow = VenousLimitLowDef ; ///< (S32) Venous Pressure Limit Low (mmHg) - qint32 mVenousLimitHigh = VenousLimitHighDef ; ///< (S32) Venous Pressure Limit High (mmHg) - // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString - ({ mArterialLimitLow , - mArterialLimitHigh , - mVenousLimitLow , - mVenousLimitHigh - }); + ({ mArterialPressureLimitWindow , + mVenousPressureLimitWindow , + mVenousPressureLimitAsymtrc + }); } // disabled coco end static QString toString(const QVariantList &vParameters) { @@ -503,6 +524,7 @@ } +typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationReq AdjustDurationRequestData;