Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -120,9 +120,9 @@ * \brief The MAdjustDurationEditReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8300| 0x100 | Req | Y | UI | HD | Treatment Duration Edit Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x8300| 0x100 | Req | Y | UI | HD | Duration Edit Request | * * | Payload || * | || @@ -132,6 +132,7 @@ class MAdjustDurationEditReq : public MModel { public: quint32 duration = 0; + QString toString() { return toString({duration}); } @@ -144,9 +145,9 @@ * \brief The MAdjustDurationConfirmReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8500| 0x100 | Req | Y | UI | HD | Treatment Duration Confirm Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x8500| 0x100 | Req | Y | UI | HD | Duration Confirm Request | * * | Payload || * | || @@ -156,6 +157,7 @@ class MAdjustDurationConfirmReq : public MModel { public: quint32 duration = 0; + QString toString() { return toString({duration}); } @@ -165,6 +167,114 @@ }; /*! + * \brief The MAdjustSetPointsReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------:| + * |0x9300| 0x100 | Req | Y | UI | HD | Set Points Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlowRate | + * | #2:(U32) | \ref dialysateFlowRate | + * | #3:(F32) | \ref dialysateTemperature | + * | #4:(U32) | \ref acidConcentrate | + * | #5:(U32) | \ref bicarbConcentrate | + * + */ +class MAdjustSetPointsReq : public MModel { +public: + quint32 bloodFlowRate = 0; + quint32 dialysateFlowRate = 0; + float dialysateTemperature = 0; + quint32 acidConcentrate = 0; + quint32 bicarbConcentrate = 0; + + QString toString() { + return toString({bloodFlowRate, dialysateFlowRate, dialysateTemperature, acidConcentrate, bicarbConcentrate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustSetPointsReq", vParameters); + } +}; + +/*! + * \brief The MAdjustBloodFlowRateReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x9500| 0x100 | Req | Y | UI | HD | Blood Flow Rate Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlowRate | + * + */ +class MAdjustBloodFlowRateReq : public MModel { +public: + quint32 bloodFlowRate = 0; + + QString toString() { + return toString({bloodFlowRate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustBloodFlowRateReq", vParameters); + } +}; + +/*! + * \brief The MAdjustDialysateFlowRateReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x9700| 0x100 | Req | Y | UI | HD | Dialysate Flow Rate Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref dialysateFlowRate | + * + */ +class MAdjustDialysateFlowRateReq : public MModel { +public: + quint32 dialysateFlowRate = 0; + + QString toString() { + return toString({dialysateFlowRate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDialysateFlowRateReq", vParameters); + } +}; + +/*! + * \brief The MAdjustDialysateTemperatureReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------------------:| + * |0x9900| 0x100 | Req | Y | UI | HD | Dialysate Temperature Request | + * + * | Payload || + * | || + * | #1:(F32) | \ref dialysateTemperature | + * + */ +class MAdjustDialysateTemperatureReq : public MModel { +public: + float dialysateTemperature = 0; + + QString toString() { + return toString({dialysateTemperature}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDialysateTemperatureReq", vParameters); + } +}; + +/*! * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * @@ -525,6 +635,10 @@ typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData; typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData; +typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData; +typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData; +typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData; +typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;