Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r8325066ffcce349e21df74e33bd3d298d3042ef3 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) @@ -18,7 +18,6 @@ #include // Project -#include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "types.h" // forward declarations @@ -30,9 +29,9 @@ * \brief The MAdjustUltrafiltrationEditResponse class * \details The UF vol. change response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4200| 0x040 | 6 | Rsp | Y | HD | UI | UF Vol. Change Response | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4200| 0x040 | Rsp | Y | TD | UI | UF Vol. Change Response | * * | Payload || * | || @@ -53,11 +52,11 @@ * | || * | || * | typeText | Event | - * | unitText | HD | + * | unitText | TD | * | infoText | AdjustUFEdit | * */ -class MAdjustUltrafiltrationEditResponse : public MAdjustUltrafiltrationConfirmResponse +class MAdjustUltrafiltrationEditResponse { // friends @@ -68,15 +67,25 @@ //NOTE: The correct order is followed in cpp to fill in the values regarding the payload byte orders. // The struct here is just the values not in correct order // since has been inherited from the confirm to borrow some struct variables. - struct Data : public MAdjustUltrafiltrationConfirmResponse::Data { + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + float mVolume = 0; /*!< volume value of type float extracted out */ + quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ qint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ + float mRate = 0; /*!< rate value of type float extracted out */ float mRateDiff = 0; /*!< rateDiff value of type float extracted out */ float mRateOld = 0; /*!< rateOld value of type float extracted out */ }; private: - struct : public MAdjustUltrafiltrationConfirmResponse::_Data { + struct _Data { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mVolume ; + Types::U32 mDuration ; Types::S32 mDurationDiff ; + Types::F32 mRate ; Types::F32 mRateDiff ; Types::F32 mRateOld ; } _data;