diff options
author | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-02-01 11:18:49 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-01 09:35:56 +0000 |
commit | 80da360e5213c0481ba7c19a463129eb19e3d7fa (patch) | |
tree | b93971eb0d5df02a5a340bb39c26eb136ae97f19 /tradeshow/iot-sensortag/sensortagdataprovider.cpp | |
parent | 7cfb17d7db0ffc79210fe6c24e8c358eaf535e65 (diff) |
Accelometer changed to report values in G instead of mG
Change-Id: I4193b6566f7408f3e3e09161987d107941e2a6b2
Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/sensortagdataprovider.cpp')
-rw-r--r-- | tradeshow/iot-sensortag/sensortagdataprovider.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.cpp b/tradeshow/iot-sensortag/sensortagdataprovider.cpp index c41cf19..4d1abcd 100644 --- a/tradeshow/iot-sensortag/sensortagdataprovider.cpp +++ b/tradeshow/iot-sensortag/sensortagdataprovider.cpp @@ -71,9 +71,9 @@ SensorTagDataProvider::SensorTagDataProvider(QString id, QObject* parent) gyroscopeX_degPerSec(0), gyroscopeY_degPerSec(0), gyroscopeZ_degPerSec(0), - accelometer_mG_xAxis(0), - accelometer_mG_yAxis(0), - accelometer_mG_zAxis(0), + accelometerX(0), + accelometerY(0), + accelometerZ(0), /* Object is not "walking in the air" so have one axis at 1G */ magnetometerMicroT_xAxis(-1000), magnetometerMicroT_yAxis(0), @@ -156,19 +156,19 @@ float SensorTagDataProvider::getGyroscopeZ_degPerSec() return gyroscopeZ_degPerSec; } -float SensorTagDataProvider::getAccelometer_mG_xAxis() +float SensorTagDataProvider::getAccelometer_xAxis() { - return accelometer_mG_xAxis; + return accelometerX; } -float SensorTagDataProvider::getAccelometer_mG_yAxis() +float SensorTagDataProvider::getAccelometer_yAxis() { - return accelometer_mG_yAxis; + return accelometerY; } -float SensorTagDataProvider::getAccelometer_mG_zAxis() +float SensorTagDataProvider::getAccelometer_zAxis() { - return accelometer_mG_zAxis; + return accelometerZ; } float SensorTagDataProvider::getMagnetometerMicroT_xAxis() |