Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r148844d868453927c9dd3f9c47e79d829c08d303 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 148844d868453927c9dd3f9c47e79d829c08d303) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -117,30 +117,164 @@ }; /*! - * \brief The MAdjustDurationReq class + * \brief The MAdjustDurationEditReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1600| 0x100 | Req | Y | UI | HD | Treatment Duration Change Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x7600| 0x100 | Req | Y | UI | HD | Duration Edit Request | * * | Payload || * | || * | #1:(U32) | \ref duration | * */ -class MAdjustDurationReq : public MModel { +class MAdjustDurationEditReq : public MModel { public: quint32 duration = 0; + QString toString() { return toString({duration}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustDuration", vParameters); + return MModel::toString("AdjustDurationEdit", vParameters); } }; /*! + * \brief The MAdjustDurationConfirmReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x7800| 0x100 | Req | Y | UI | HD | Duration Confirm Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref duration | + * + */ +class MAdjustDurationConfirmReq : public MModel { +public: + quint32 duration = 0; + + QString toString() { + return toString({duration}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDurationConfirm", vParameters); + } +}; + +/*! + * \brief The MAdjustSetPointsReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------:| + * |0x7A00| 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 | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x7C00| 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 | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x7E00| 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 | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------------------:| + * |0x8000| 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 * @@ -216,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 * @@ -247,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 || * | || @@ -297,34 +503,65 @@ }; /*! + * \brief The MAdjustBloodPrimeReq class + * \details The model to request Blood Prime command + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0x9800| 0x100 | Req | Y | UI | TD | BloodPrime Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref command | + * + * \sa State + * \sa MTreatmentBloodPrime : BloodPrime Data + * \sa MAdjustBloodPrimeResponse : BloodPrime Command Response + * + */ +class MAdjustBloodPrimeReq : public MModel { +public: + GuiBloodPrimeCommands command; + QString toString() { + return toString({command}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustBloodPrime", vParameters); + } +}; + +/*! * \brief The MAdjustPressuresLimitsReq class * \details The model to request the pressures limits adjustment * * | 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 ||| * | ||| * | #1:(S32) | \ref mArterialPressureLimitWindow | (mmHg) | * | #2:(S32) | \ref mVenousPressureLimitWindow | (mmHg) | * | #3:(S32) | \ref mVenousPressureLimitAsymtrc | (mmHg) | + * | #4:(S32) | \ref mTmpPressureLimitWindow | (mmHg) | * * \sa MPressureOcclusion : Pressure data broadcast * \sa MAdjustPressuresResponse : Pressures limit adjustment response * */ class MAdjustPressuresLimitsReq : public MModel { public: - 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) + 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) + qint32 mTmpLimitWindow = 0; ///< (S32) Transmembrane Pressure Limit Window (mmHg) QString toString() { return toString ({ mArterialPressureLimitWindow , mVenousPressureLimitWindow , - mVenousPressureLimitAsymtrc + mVenousPressureLimitAsymtrc , + mTmpLimitWindow }); } static QString toString(const QVariantList &vParameters) { @@ -333,6 +570,56 @@ }; /*! + * \brief The MAdjustPressuresWideningReq class + * \details The model to request the pressures widening + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0xA400| 0x041 | Req | Y | UI | TD | Pressures Widening | + * + * | Payload || + * | || + * | None || + * + * \sa Options + * + */ +class MAdjustPressuresWideningReq : public MModel { +public: + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustPressuresWidening", vParameters); + } +}; + +/*! + * \brief The MAdjustBolusVolumeReq class + * \details The model to request bolus volume adjustment + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:--------------------:| + * |0x7400| 0x100 | Req | Y | UI | TD | Bolus Volume Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bolusVolume | + * + * \sa Adjustment + * \sa MTreatmentBolusVolume : BolusVolume Bolus Data + * \sa MAdjustBolusVolumeResponse : BolusVolume Bolus Response + * + */ +class MAdjustBolusVolumeReq : public MModel { +public: + quint32 mBolusVolume = 0; ///< (U32) Bolus Volume (mL) + QString toString() { + return toString({mBolusVolume}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustBolusVolume", vParameters); + } +}; + +/*! * \brief The MAdjustRinsebackReq class * \details The model to request the Rinseback state * @@ -460,20 +747,32 @@ } -typedef Model:: MDuetConfirmUIr DuetConfirmUIrData; -typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; -typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; -typedef Model:: MAdjustDurationReq AdjustDurationRequestData; -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:: 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:: MAdjustBloodPrimeReq AdjustBloodPrimeRequestData; +typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; +typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; + +typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; // Alarms -typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; +typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; +typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;