Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -r9187b3bc0167642cfb350a372654e4cfc0be046b -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 9187b3bc0167642cfb350a372654e4cfc0be046b) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -35,15 +35,15 @@ QVariantList parameters() const override; struct { - Types::F32 mX ; - Types::F32 mY ; - Types::F32 mZ ; - Types::F32 mXMax ; - Types::F32 mYMax ; - Types::F32 mZMax ; - Types::F32 mXTilt ; - Types::F32 mYTilt ; - Types::F32 mZTilt ; + Types::F32 mx ; + Types::F32 my ; + Types::F32 mz ; + Types::F32 mxMax ; + Types::F32 myMax ; + Types::F32 mzMax ; + Types::F32 mxTilt ; + Types::F32 myTilt ; + Types::F32 mzTilt ; } _data; public: @@ -53,15 +53,15 @@ 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 */ + 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: @@ -70,7 +70,6 @@ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; - } typedef Model::MHDAccelerometer::Data HDAccelerometerData;