Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -37,12 +37,11 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeStamp | - * | #2:(U32) | \ref Data::mBloodFlowRate | - * | #3:(U32) | \ref Data::mDialysateFlowRate | - * | #4:(F32) | \ref Data::mUFRate | - * | #5:(F32) | \ref Data::mArterialPressure | - * | #6:(F32) | \ref Data::mVenousPressure | + * | #1:(U32) | \ref Data::mBloodFlowRate | + * | #2:(U32) | \ref Data::mDialysateFlowRate | + * | #3:(F32) | \ref Data::mUFRate | + * | #4:(F32) | \ref Data::mArterialPressure | + * | #5:(F32) | \ref Data::mVenousPressure | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -63,12 +62,11 @@ QVariantList parameters() const override; struct { - Types::U32 mTimeStamp ; ///< TimeStamp in epoch - Types::U32 mBloodFlowRate ; ///< 2 - (U32) Blood Flow Rate (mL/min) - Types::U32 mDialysateFlowRate ; ///< 3 - (U32) Dialysate Flow Rate (mL/min) - Types::F32 mUFRate ; ///< 4 - (F32) Ultrafiltration Rate (mmHg) - Types::F32 mArterialPressure ; ///< 5 - (F32) Arterial Pressure (mmHg) - Types::F32 mVenousPressure ; ///< 6 - (F32) Venous Pressure (mmHg) + Types::U32 mBloodFlowRate ; ///< (U32) Blood Flow Rate (mL/min) + Types::U32 mDialysateFlowRate ; ///< (U32) Dialysate Flow Rate (mL/min) + Types::F32 mUFRate ; ///< (F32) Ultrafiltration Rate (mmHg) + Types::F32 mArterialPressure ; ///< (F32) Arterial Pressure (mmHg) + Types::F32 mVenousPressure ; ///< (F32) Venous Pressure (mmHg) } _data; public: @@ -78,12 +76,12 @@ QString infoText () const override { return QString("TreatmentLogAvrge") ; } struct Data { - quint32 mTimeStamp ; ///< TimeStamp in epoch - quint32 mBloodFlowRate ; ///< 2 - (U32) Blood Flow Rate (mL/min) - quint32 mDialysateFlowRate ; ///< 3 - (U32) Dialysate Flow Rate (mL/min) - float mUFRate ; ///< 4 - (F32) Ultrafiltration Rate (mmHg) - float mArterialPressure ; ///< 5 - (F32) Arterial Pressure (mmHg) - float mVenousPressure ; ///< 6 - (F32) Venous Pressure (mmHg) + quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch + quint32 mBloodFlowRate ; ///< Blood Flow Rate (mL/min) + quint32 mDialysateFlowRate ; ///< Dialysate Flow Rate (mL/min) + float mUFRate ; ///< Ultrafiltration Rate (mmHg) + float mArterialPressure ; ///< Arterial Pressure (mmHg) + float mVenousPressure ; ///< Venous Pressure (mmHg) quint32 mSystolic = 0; ///< Systolic Blood Pressure - This value is not coming from FW and will be get from UI and User. quint32 mDiastolic = 0; ///< Diastolic Blood Pressure - This value is not coming from FW and will be get from UI and User. quint32 mHeartRate = 0; ///< Heart Rate - This value is not coming from FW and will be get from UI and User.