Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -r59232da2f238a4510c47e32407399bc0e8105c16 -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 59232da2f238a4510c47e32407399bc0e8105c16) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -342,7 +342,7 @@ * * | MSG | Type | Ack | Src | Dest | Description | * |:----:|:----:|:---:|:---:|:----:|:-----------: | - * | 0x128 | Req | Y | UI | DG | DDCalibrationD48DialysatePump | + * | 0x128 | Req | Y | UI | DD | DDCalibrationD48DialysatePump | * * | Payload || * | || @@ -473,9 +473,305 @@ static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; +/*! + * \brief The MDDCalibrationBicarbConcentratesReq class + * \details The model to request DD Calibration Bicarb Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x130 | Req | Y | UI | DD | DDCalibrationBicarbConcentratesReq| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * + */ +class MDDCalibrationBicarbConcentratesReq : public MModel { +public: + quint32 mIndex = 0; + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalBicarbConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationBicarbConcentratesReq class + * \details The model to request Adjust DD Calibration Bicarb Concentrates + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x132 | Req | Y | UI | DD | AdjustDDCalibrationBicarbConcentrates | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mBicarbConcMixRatio | + * | #3: (F32) | \ref Data::mBicarbStartVolumeML | + * | #4: (F32) | \ref Data::mBicarbConductivityUSPerCM | + * | #5: (F32) | \ref Data::mBicarbBottleTemperature | + * | #6: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationBicarbConcentratesReq : public MModel { +public: + quint32 mIndex = 0; + float mBicarbConcMixRatio = 0; + float mBicarbStartVolumeML = 0; + float mBicarbConductivityUSPerCM = 0; + float mBicarbBottleTemperature = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mBicarbConcMixRatio , + mBicarbStartVolumeML , + mBicarbConductivityUSPerCM , + mBicarbBottleTemperature , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalBicarbConcentratesReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationAccelerometerSensorReq class + * \details The model to request DD Calibration Accelerometer Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x134 | Req | Y | UI | DD | DDCalibrationAccelerometerSensorReq | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationAccelerometerSensorReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalAccelerometerSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationAccelerometerSensorReq class + * \details The model to request Adjust DD Calibration Accelerometer Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x136 | Req | Y | UI | DD | AdjustDDCalibrationAccelerometerSensorReq | + * + * | Payload || + * | || + * | #1: (F32) | \ref Data::mAccelXOffset | + * | #2: (F32) | \ref Data::mAccelYOffset | + * | #3: (F32) | \ref Data::mAccelZOffset | + * | #4: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationAccelerometerSensorReq : public MModel { +public: + float mAccelXOffset = 0; + float mAccelYOffset = 0; + float mAccelZOffset = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mAccelXOffset , + mAccelYOffset , + mAccelZOffset , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalAccelerometerSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationBloodLeakSensorReq class + * \details The model to request DD Calibration Blood Leak Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x138 | Req | Y | UI | DD | MDDCalibrationBloodLeakSensorReq | + * + * | Payload || + * | || + * | N/A | + * + */ +class MDDCalibrationBloodLeakSensorReq : public MModel { +public: + + QString toString() { + return toString(); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalinBloodLeakSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationBloodLeakSensorReq class + * \details The model to request Adjust DD Calibration Blood Leak Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13A | Req | Y | UI | DD | MAdjustDDCalibrationBloodLeakSensorReq | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mSetPoint | + * | #2: (U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationBloodLeakSensorReq : public MModel { +public: + quint32 mSetPoint = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mSetPoint , + mCalibrationTime , + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalBloodLeakSensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MDDCalibrationConductivitySensorReq class + * \details The model to request DD Calibration Conductivity Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13C | Req | Y | UI | DD | MDDCalibrationConductivitySensorReq| + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + + * + */ +class MDDCalibrationConductivitySensorReq : public MModel { +public: + + quint32 mIndex = 0; + + QString toString() { + return toString({ mIndex }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DDCalConductivitySensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + +/*! + * \brief The MAdjustDDCalibrationConductivitySensorReq class + * \details The model to request Adjust DD Calibration Conductivity Sensor + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x13A | Req | Y | UI | DD | MAdjustDDCalibrationConductivitySensorReq | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mIndex | + * | #2: (F32) | \ref Data::mKHigh | + * | #3: (F32) | \ref Data::mAlphaHigh | + * | #4: (F32) | \ref Data::mEtaHigh | + * | #5: (F32) | \ref Data::mZetahigh | + * | #6: (F32) | \ref Data::mKLow | + * | #7: (F32) | \ref Data::mAlphaLow | + * | #8: (F32) | \ref Data::mEtaLow | + * | #9: (F32) | \ref Data::mZetaLow | + * | #10: F32) | \ref Data::mBeta | + * | #11:(F32) | \ref Data::mDelta | + * | #12:(F32) | \ref Data::mReserved1 | + * | #13:(F32) | \ref Data::mReserved2 | + * | #14:(U32) | \ref Data::mCalibrationTime | + * + */ +class MAdjustDDCalibrationConductivitySensorReq : public MModel { +public: + quint32 mIndex = 0; + float mKHigh = 0; + float mAlphaHigh = 0; + float mEtaHigh = 0; + float mZetahigh = 0; + float mKLow = 0; + float mAlphaLow = 0; + float mEtaLow = 0; + float mZetaLow = 0; + float mBeta = 0; + float mDelta = 0; + float mReserved1 = 0; + float mReserved2 = 0; + quint32 mCalibrationTime = 0; + + QString toString() { + return toString({ + mIndex , + mKHigh , + mAlphaHigh , + mEtaHigh , + mZetahigh , + mKLow , + mAlphaLow , + mEtaLow , + mZetaLow , + mBeta , + mDelta , + mReserved1 , + mReserved2 , + mCalibrationTime, + }); + } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDDCalConductivitySensorReq", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; + + } typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; @@ -491,7 +787,15 @@ typedef Model::MAdjustDDCalibrationD12DialysatePumpReq AdjustDDCalibrationD12DialysatePumpRequestData; typedef Model::MDDCalibrationD48DialysatePumpReq DDCalibrationD48DialysatePumpRequestData; typedef Model::MAdjustDDCalibrationD48DialysatePumpReq AdjustDDCalibrationD48DialysatePumpRequestData; - typedef Model::MDDCalibrationAcidConcentratesReq DDCalibrationAcidConcentratesRequestData; typedef Model::MAdjustDDCalibrationAcidConcentratesReq AdjustDDCalibrationAcidConcentratesRequestData; +typedef Model::MDDCalibrationBicarbConcentratesReq DDCalibrationBicarbConcentratesRequestData; +typedef Model::MAdjustDDCalibrationBicarbConcentratesReq AdjustDDCalibrationBicarbConcentratesRequestData; +typedef Model::MDDCalibrationAccelerometerSensorReq DDCalibrationAccelerometerSensorRequestData; +typedef Model::MAdjustDDCalibrationAccelerometerSensorReq AdjustDDCalibrationAccelerometerSensorRequestData; +typedef Model::MDDCalibrationBloodLeakSensorReq DDCalibrationBloodLeakSensorRequestData; +typedef Model::MAdjustDDCalibrationBloodLeakSensorReq AdjustDDCalibrationBloodLeakSensorRequestData; +typedef Model::MDDCalibrationConductivitySensorReq DDCalibrationConductivityRequestData; +typedef Model::MAdjustDDCalibrationConductivitySensorReq AdjustDDCalibrationConductivityRequestData; +