Index: sources/model/hd/data/MHDVersionData.h =================================================================== diff -u -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb -rcb7073c016b2fda83a1a6998ad5216f9af571b64 --- sources/model/hd/data/MHDVersionData.h (.../MHDVersionData.h) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) +++ sources/model/hd/data/MHDVersionData.h (.../MHDVersionData.h) (revision cb7073c016b2fda83a1a6998ad5216f9af571b64) @@ -49,26 +49,25 @@ 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") ; } + QString infoText() const override { return QString("HDVersionData") ; } 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 */ + float mMajor = 0; /*!< Major Firmware build major number in Major.X.X format */ + float mMinor = 0; /*!< Minor Firmware build minor number in X.Minor.X format */ + float mMicro = 0; /*!< Micro Firmware build micro number in X.X.Micro format */ + float mBuild = 0; /*!< Build Firmware build number */ + float mFPGAId = 0; /*!< FPGA ID FPGA ID number */ + float mFPGAMajor = 0; /*!< FPGA Major FPGA build major number in Major.X format */ + float mFPGAMinor = 0; /*!< FPGA Minor FPGA build minor number in X.Minor format */ + float mFPGALab = 0; /*!< FPGA Lab FPGA test build number for lab roll-out before merging to master */ }; public: - MHDAccelerometer () { } + MHDVersion () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MHDAccelerometer::Data HDAccelerometerData; +typedef Model::MHDVersion::Data HDVersionData;