Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 -r59232da2f238a4510c47e32407399bc0e8105c16 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 59232da2f238a4510c47e32407399bc0e8105c16) @@ -75,14 +75,13 @@ static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; - /*! * \brief The MDDCalibrationPressureReq class * \details The model to request DD Calibration Pressure * * | MSG | Type | Ack | Src | Dest | Description | * |:----:|:----:|:---:|:---:|:----:|:-----------: | - * | 0x118 | Req | Y | UI | DG | DDCalibrationPressure | + * | 0x118 | Req | Y | UI | DD | DDCalibrationPressure | * * | Payload || * | || @@ -110,7 +109,7 @@ * * | MSG | Type | Ack | Src | Dest | Description | * |:----:|:----:|:---:|:---:|:----:|:-----------: | - * | 0x11A | Req | Y | UI | DG | AdjustDDCalibrationPressure | + * | 0x11A | Req | Y | UI | DD | AdjustDDCalibrationPressure | * * | Payload || * | || @@ -143,12 +142,356 @@ static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; +/*! + * \brief The MDDCalibrationTemperatureReq class + * \details The model to request DD Calibration Temperature + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x11C | Req | Y | UI | DD | DDCalibrationTemperature | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationTemperatureReq : public MModel { +public: + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalTemperatureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationTemperatureReq class + * \details The model to request Adjust DD Calibration Temperature + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x11E | Req | Y | UI | DD | AdjustDDCalibrationTemperature | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mGain | + * | #3: (F32) | \ref Data::mOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationTemperatureReq : public MModel { +public: + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalTemperatureReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationConcentratePumpReq class + * \details The model to request DD Calibration Concentrate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x120 | Req | Y | UI | DD | DDCalibrationConcentratePump | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationConcentratePumpReq : public MModel { +public: + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalConcentratePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationConcentratePumpReq class + * \details The model to request Adjust DD Calibration ConcentratePump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x122 | Req | Y | UI | DD | AdjustDDCalibrationConcentratePump | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mGain | + * | #3: (F32) | \ref Data::mOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationConcentratePumpReq : public MModel { +public: + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalConcentratePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationD12DialysatePumpReq class + * \details The model to request DD Calibration D12 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x124 | Req | Y | UI | DD | DDCalibrationD12DialysatePump | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationD12DialysatePumpReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalD12DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationD12DialysatePumpReq class + * \details The model to request Adjust DD Calibration D12 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x126 | Req | Y | UI | DD | AdjustDDCalibrationD12DialysatePump | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mTargetPumpSpeed | + * | #2: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationD12DialysatePumpReq : public MModel { +public: + float mTargetPumpSpeed = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mTargetPumpSpeed , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalD12DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationD48DialysatePumpReq class + * \details The model to request DD Calibration D48 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x128 | Req | Y | UI | DG | DDCalibrationD48DialysatePump | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationD48DialysatePumpReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalD48DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationD48DialysatePumpReq class + * \details The model to request Adjust DD Calibration D48 Dialysate Pump + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12A | Req | Y | UI | DD | AdjustDDCalibrationD48DialysatePump | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mGain | + * | #2: (F32) | \ref Data::mOffset | + * | #3: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationD48DialysatePumpReq : public MModel { +public: + float mGain = 0; + float mOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mGain , + mOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalD48DialysatePumpReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationAcidConcentratesReq class + * \details The model to request DD Calibration Acid Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12C | Req | Y | UI | DD | DDCalibrationAcidConcentrates| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + + * + */ +class MDDCalibrationAcidConcentratesReq : public MModel { +public: + + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalDAcidConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationAcidConcentratesReq class + * \details The model to request Adjust DD Calibration Acid Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x12E | Req | Y | UI | DD | AdjustDDCalibrationAcidConcentrates | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mAcidConcMixRatio | + * | #3: (F32) | \ref Data::mAcidFullBottleVolumeML | + * | #4: (F32) | \ref Data::mAcidConductivityUSPerCM| + * | #5: (F32) | \ref Data::mAcidBottleTemperature | + * | #6: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationAcidConcentratesReq : public MModel { +public: + quint32 mIndex = 0; + float mAcidConcMixRatio = 0; + float mAcidFullBottleVolumeML = 0; + float mAcidConductivityUSPerCM= 0; + float mAcidBottleTemperature = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mAcidConcMixRatio , + mAcidFullBottleVolumeML , + mAcidConductivityUSPerCM, + mAcidBottleTemperature , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalAcidConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + + + + } -typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; -typedef Model::MAdjustDGCleaningUsageReq AdjustDGCleaningUsageRequestData; +typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; +typedef Model::MAdjustDGCleaningUsageReq AdjustDGCleaningUsageRequestData; -typedef Model::MDDCalibrationPressureReq DDCalibrationPressureRequestData; -typedef Model::MAdjustDDCalibrationPressureReq AdjustDDCalibrationPressureRequestData; +typedef Model::MDDCalibrationPressureReq DDCalibrationPressureRequestData; +typedef Model::MAdjustDDCalibrationPressureReq AdjustDDCalibrationPressureRequestData; +typedef Model::MDDCalibrationTemperatureReq DDCalibrationTemperatureRequestData; +typedef Model::MAdjustDDCalibrationTemperatureReq AdjustDDCalibrationTemperatureRequestData; +typedef Model::MDDCalibrationConcentratePumpReq DDCalibrationConcentratePumpRequestData; +typedef Model::MAdjustDDCalibrationConcentratePumpReq AdjustDDCalibrationConcentratePumpRequestData; +typedef Model::MDDCalibrationD12DialysatePumpReq DDCalibrationD12DialysatePumpRequestData; +typedef Model::MAdjustDDCalibrationD12DialysatePumpReq AdjustDDCalibrationD12DialysatePumpRequestData; +typedef Model::MDDCalibrationD48DialysatePumpReq DDCalibrationD48DialysatePumpRequestData; +typedef Model::MAdjustDDCalibrationD48DialysatePumpReq AdjustDDCalibrationD48DialysatePumpRequestData; +typedef Model::MDDCalibrationAcidConcentratesReq DDCalibrationAcidConcentratesRequestData; +typedef Model::MAdjustDDCalibrationAcidConcentratesReq AdjustDDCalibrationAcidConcentratesRequestData;