Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358) @@ -335,6 +335,33 @@ }; /*! + * \brief The MAdjustIsolatedUFStateReq class + * \details The Iso UF commands request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0xBA00| 0x041 | Req | Y | UI | HD | Iso UF Pause/Resume/End | + * + * | Payload || + * | || + * | #1:(U32) | \ref requestedState | + * + */ +class MAdjustIsolatedUFStateReq : public MModel { +public: + +// GuiUFCommands requestedState = GuiUFCommands::UF_CMD_PAUSE; // the requested state. Initially it's running => paused. +// TODO UPDATE + quint32 requestedState = 0; // Pause/ resume/ end + QString toString() { + return toString({requestedState}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustIsoUFState", vParameters); + } +}; + +/*! * \brief The MAdjustUltrafiltrationEditReq class * \details The ultrafiltration volume change request model * @@ -807,6 +834,84 @@ } }; +/*! + * \brief The MAdjustHDFStateReq class + * \details The model to request the HDF state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | HDF State Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref state | + * + */ +class MAdjustHDFStateReq : public MModel { +public: + quint32 state = 0; + + QString toString() { + return toString({state}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustHDFState", vParameters); + } +}; + +/*! + * \brief The MAdjustAutoSubReq class + * \details The model to request the auto sub state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req | + * + * | Payload || + * | || + * | #1:(U32) | \ref state | + * + */ +class MAdjustAutoSubReq : public MModel { +public: + quint32 state = 0; + + QString toString() { + return toString({state}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustAutoSub", vParameters); + } +}; + +/*! + * \brief The MAdjustAutoSubReq class + * \details The model to request the auto sub state + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xBD00| 0x100 | Req | Y | UI | TD | auto sub State Req | + * + * | Payload || + * | || + * | #1:(U32) | \ref treatmetnModali | + * | #2:(F32) | \ref state | + * + */ +class MAdjustHDFReq : public MModel { +public: + quint32 treatmentMode = 0; + float subFluidVolume = 0; + + QString toString() { + return toString({treatmentMode, + subFluidVolume}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustHDF", vParameters); + } +}; + } typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; @@ -819,6 +924,7 @@ typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData; typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; +typedef Model:: MAdjustIsolatedUFStateReq AdjustIsolatedUFStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData; @@ -834,6 +940,9 @@ typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; +typedef Model:: MAdjustHDFStateReq AdjustHDFStateRequestData; +typedef Model:: MAdjustAutoSubReq AdjustAutoSubRequestData; +typedef Model:: MAdjustHDFReq AdjustHDFRequestData; typedef Model:: MAdjustryBicartDisconnectReq AdjustDryBicartDisconnectRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData;