Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r9403146058e7c4cef17bd542bbd39bbf032be9f3 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -72,35 +72,37 @@ * * | Payload || * | || - * | #01:(U32) | \ref mTreatmentModality | - * | #02:(U32) | \ref mHDFTreatmentMode | - * | #03:(U32) | \ref mBloodFlowRate | - * | #04:(U32) | \ref mDialysateFlowRate | - * | #05:(U32) | \ref mTreatmentDuration | - * | #06:(U32) | \ref mHeparinDeliveryDuration | - * | #07:(U32) | \ref mHeparinType | - * | #08:(U32) | \ref mDryBicarbCartSize | - * | #09:(U32) | \ref mSodium | - * | #10:(U32) | \ref mBicarbonate | - * | #11:(U32) | \ref mDialyzerType | - * | #12:(U32) | \ref mFluidBolusVolume | - * | #13:(U32) | \ref mBloodPressureMeasureInterval | - * | #14:(U32) | \ref mRinsebackVolume | - * | #15:(U32) | \ref mHepatitusBStatus | - * | #16:(U32) | \ref mAcidConcentrateIndex | - * | #17:(F32) | \ref mSubstitutionFluidVolume | - * | #18:(F32) | \ref mHeparinBolusVolume | - * | #19:(F32) | \ref mHeparinDispensingRate | - * | #20:(F32) | \ref mDialysateTemp | - * | #21:(F32) | \ref mAcidConcentrateConversionFactor | - * | #22:(F32) | \ref mUFPreWeight | - * | #23:(F32) | \ref mUFEstimatedTargetWeight | - * | #24:(F32) | \ref mUFVolume | + * | #01:(U32) | \ref mFinalConfirmation | + * | #02:(U32) | \ref mTreatmentModality | + * | #03:(U32) | \ref mHDFTreatmentMode | + * | #04:(U32) | \ref mBloodFlowRate | + * | #05:(U32) | \ref mDialysateFlowRate | + * | #06:(U32) | \ref mTreatmentDuration | + * | #07:(U32) | \ref mHeparinDeliveryDuration | + * | #08:(U32) | \ref mHeparinType | + * | #09:(U32) | \ref mDryBicarbCartSize | + * | #10:(U32) | \ref mSodium | + * | #11:(U32) | \ref mBicarbonate | + * | #12:(U32) | \ref mDialyzerType | + * | #13:(U32) | \ref mFluidBolusVolume | + * | #14:(U32) | \ref mBloodPressureMeasureInterval | + * | #15:(U32) | \ref mRinsebackVolume | + * | #16:(U32) | \ref mHepatitusBStatus | + * | #17:(U32) | \ref mAcidConcentrateIndex | + * | #18:(F32) | \ref mSubstitutionFluidVolume | + * | #19:(F32) | \ref mHeparinBolusVolume | + * | #20:(F32) | \ref mHeparinDispensingRate | + * | #21:(F32) | \ref mDialysateTemp | + * | #22:(F32) | \ref mAcidConcentrateConversionFactor | + * | #23:(F32) | \ref mUFPreWeight | + * | #24:(F32) | \ref mUFEstimatedTargetWeight | + * | #25:(F32) | \ref mUFVolume | * */ class MAdjustParametersValidationReq : public MModel { public: + quint32 mFinalConfirmation = 0; // flag quint32 mTreatmentModality = 0; // quint32 mHDFTreatmentMode = 0; // quint32 mBloodFlowRate = 0; // mL/min @@ -128,6 +130,7 @@ QString toString() { return toString({ + mFinalConfirmation , mTreatmentModality , mHDFTreatmentMode , mBloodFlowRate , @@ -159,35 +162,7 @@ } }; -/*! - * \brief The MAdjustParametersConfirmReq class - * \details The model to tell HD treatment parameters have been confirmed - * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------------------------------:| - * |0x4400| 0x041 | Req | Y | UI | TD | Confirm Treatment Parameter Request | - * - * | Payload || - * | || - * | #1:(U32) | \ref requestedState | - * - */ -class MAdjustParametersConfirmReq : public MModel { -public: - enum Options { - eCancel = 0, - eConfirm = 1 - }; - Options requestedState = eConfirm; - QString toString() { - return toString({requestedState}); - } - static QString toString(const QVariantList &vParameters) { - return MModel::toString("ConfirmParameters", vParameters); - } -}; - /*! * \brief The MAdjustWaterSampleResultReq class * \details The model to provide water sample result @@ -357,7 +332,6 @@ typedef Model:: MAdjustInitTreatmentReq AdjustInitTreatmentRequestData; typedef Model:: MAdjustParametersValidationReq AdjustParametersValidationRequestData; -typedef Model:: MAdjustParametersConfirmReq AdjustParametersConfirmRequestData; typedef Model:: MAdjustWaterSampleResultReq AdjustWaterSampleResultRequestData; typedef Model:: MAdjustConsumablesConfirmReq AdjustConsumablesConfirmRequestData; typedef Model:: MAdjustDisposablesConfirmReq AdjustDisposablesConfirmRequestData;