Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r54aae98b72e3804008acad0bbbb7573be8e35707 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -5,11 +5,11 @@ * 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) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MTreatmentAdjustRequests.h + * \author (last) Behrouz NematiPour + * \date (last) 07-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ @@ -339,8 +339,8 @@ public: static const qint32 ArterialLimitLowDef = -300; // PRS354 manufacturing default - static const qint32 ArterialLimitHighDef = +100; // PRS355 manufacturing default - static const qint32 VenousLimitLowDef = -100; // PRS356 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 public: @@ -366,6 +366,127 @@ }; /*! + * \brief The MAdjustRinsebackReq class + * \details The model to request the Rinseback state + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5200| 0x100 | 9 | Req | Y | UI | HD | Rinseback Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * + * \sa State + * \sa MTreatmentRinseback : Rinseback Data + * \sa MAdjustRinsebackResponse : Rinseback Response + * + */ +class MAdjustRinsebackReq : public MModel { +public: + GuiRinsebackCommands requestedState = GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START; // the requested state. + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({requestedState}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustRinseback", vParameters); + } +}; + +/*! + * \brief The MAdjustRecirculateReq class + * \details The model to request the Recirculate state + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5400| 0x100 | 9 | Req | Y | UI | HD | Recirculate Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * + * \sa State + * \sa MTreatmentRecirculate : Recirculate Data + * \sa MAdjustRecirculateResponse : Recirculate Response + * + */ +class MAdjustRecirculateReq : public MModel { +public: + GuiRecirculateCommands requestedState = GuiRecirculateCommands::REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT; // the requested state. + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({requestedState}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustRecirculate", vParameters); + } +}; + +/*! + * \brief The MAdjustTreatmentEndReq class + * \details The model to request the Rinseback state + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------: | + * |0x5700| 0x100 | 9 | Req | Y | UI | HD | Treatment End Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * + * \sa State + * \sa MTreatmentEnd : Treatment End Data + * \sa MAdjustTreatmentEndResponse : Treatment End Response + * + */ +class MAdjustTreatmentEndReq : public MModel { +public: + GuiTreatmentEndCommands requestedState = GuiTreatmentEndCommands::REQUESTED_USER_ACTION_TX_END_RINSEBACK_START; // the requested state. + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({requestedState}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustTxEnd", vParameters); + } +}; + +/*! + * \brief The MAdjustVersionsReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------:| + * | 0x1C00 | 0x200 | 10 | Req | Y | UI | All | DG/HD Versions Request | + * + * | Payload || + * | || + * | #1:(N/A) | \ref None | + * + */ +class MAdjustVersionsReq : public MModel { +public: + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("Version", vParameters); + } +}; + +//// ---------- Alarms + +/*! * \brief The MAlarmSilenceReq class * \details The model to request alarm silent * @@ -512,33 +633,6 @@ }; /*! - * \brief The MTreatmentEndReq class - * \details The model to request an end to treatment - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 60 | 0x100 | 9 | Req | Y | UI | HD | End Treatment Request | - * - * | Payload || - * | || - * | N/A || - * - */ -class MTreatmentEndReq : public MModel { -public: - - // coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. - QString toString() { - return toString({}); - } - // coco end - static QString toString(const QVariantList &vParameters) { - return MModel::toString("EndTreatment", vParameters); - } -}; - -/*! * \brief The MAdjustTreatmentParametersReq class * \details The model used to request treatment parameters validation * @@ -627,11 +721,15 @@ typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; +typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; +typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; +typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MTreatmentStartReq TreatmentStartRequestData; typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; -typedef Model:: MTreatmentEndReq TreatmentEndRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +// Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;