Index: denali.pro =================================================================== diff -u -r3bae841a29b562bac9a4a57ac9965505b15d1327 -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb --- denali.pro (.../denali.pro) (revision 3bae841a29b562bac9a4a57ac9965505b15d1327) +++ denali.pro (.../denali.pro) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) @@ -85,6 +85,7 @@ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ sources/model/hd/data/MHDAccelerometerData.h \ + sources/model/hd/data/MHDVersionData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ Index: sources/gui/guiglobals.h =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb --- sources/gui/guiglobals.h (.../guiglobals.h) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) @@ -78,6 +78,7 @@ ID_TreatmentStates = 0x0F00, // 15 ID_Saline = 0x2F00, // 47 ID_HDAccelerometerData = 0x3300, // 51 + ID_HDVersionData = 0x1D00, // 29 ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -r63107b136b69d7275b63ecfc5d64527874366124 -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 63107b136b69d7275b63ecfc5d64527874366124) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) @@ -48,8 +48,8 @@ public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } QString infoText() const override { return QString("HDAccelData") ; } struct Data { Index: sources/model/hd/data/MHDVersionData.h =================================================================== diff -u --- sources/model/hd/data/MHDVersionData.h (revision 0) +++ sources/model/hd/data/MHDVersionData.h (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) @@ -0,0 +1,74 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDAccelerometerData.h + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#pragma once + + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +class MHDVersion : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::F32 mMajor ; + Types::F32 mMinor ; + Types::F32 mMicro ; + Types::F32 mBuild ; + Types::F32 mFPGAId ; + Types::F32 mFPGAMajor ; + Types::F32 mFPGAMinor ; + Types::F32 mFPGALab ; + } _data; + +public: + + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("HDAccelData") ; } + + struct Data { + float mX = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ + float mY = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ + float mZ = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ + float mXMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ + float mYMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ + float mZMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ + float mXTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ + float mYTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ + float mZTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ + }; + +public: + MHDAccelerometer () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MHDAccelerometer::Data HDAccelerometerData;