Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rc1beb94502a4e01a2513e213eb9113ade82db31a --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c1beb94502a4e01a2513e213eb9113ade82db31a) @@ -319,7 +319,7 @@ return toString({volume}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustUFEdit", vParameters); + return MModel::toString("AdjustUFDurationEdit", vParameters); } }; @@ -350,6 +350,78 @@ }; /*! + * \brief The MAdjustIsolatedUFDurationEditReq class + * \details The ultrafiltration volume change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8400| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref duration | + * + */ +class MAdjustIsolatedUFDurationEditReq : public MModel { +public: + quint32 duration = 0; + QString toString() { + return toString({duration}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustIsolatedUFDurationEdit", vParameters); + } +}; + +/*! + * \brief The MAdjustIsolatedUFVolumeEditReq class + * \details The ultrafiltration volume change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8600| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref duration | + * | #1:(U32) | \ref volume | + * + */ +class MAdjustIsolatedUFVolumeEditReq : public MModel { +public: + quint32 duration = 0; + quint32 volume = 0; + QString toString() { + return toString({duration, volume}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustIsolatedUFVolumeEdit", vParameters); + } +}; + +/*! + * \brief The MAdjustIsolatedUFConfirmReq class + * \details The ultrafiltration volume change user confirm request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8800| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | + * + * | Payload || + * | || + * | None || + * + * \sa Options + * + */ +class MAdjustIsolatedUFConfirmReq : public MModel { +public: + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustIsolatedUFConfirm", vParameters); + } +}; + +/*! * \brief The MAdjustSalineReq class * \details The model to request the Saline Bolus state * @@ -381,9 +453,9 @@ * \brief The MAdjustVitalsReq class * \details The model to request the Vitals state * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * |0x6300| 0x100 | 9 | Req | Y | UI | TD | Vitals Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:--------------------:| + * |0x6300| 0x100 | Req | Y | UI | TD | Vitals Request | * * | Payload || * | || @@ -436,7 +508,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| - * |0x4600| 0x100 | Req | Y | UI | HD | A/V BP Limit Change Request | + * |0x4600| 0x100 | Req | Y | UI | TD | A/V BP Limit Change Request | * * | Payload ||| * | ||| @@ -475,7 +547,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:--------------------:| - * |0x7400| 0x100 | Req | Y | UI | HD | Bolus Volume Request | + * |0x7400| 0x100 | Req | Y | UI | TD | Bolus Volume Request | * * | Payload || * | || @@ -625,26 +697,29 @@ } -typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; -typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; -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; -typedef Model:: MAdjustSalineReq AdjustSalineRequestData; -typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData; -typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; -typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; -typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; -typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; -typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; +typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; +typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; +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; +typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData; +typedef Model:: MAdjustIsolatedUFVolumeEditReq AdjustIsolatedUFVolumeEditRequestData; +typedef Model:: MAdjustIsolatedUFConfirmReq AdjustIsolatedUFConfirmRequestData; +typedef Model:: MAdjustSalineReq AdjustSalineRequestData; +typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData; +typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; +typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData; +typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData; +typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; +typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; +typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; // Alarms -typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; +typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; +typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;