diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
commit | b11d8d673ba36ab22c0d7a40ea53d57f284cca13 (patch) | |
tree | f370841deac0b5516fa458a910f508d592a6cc36 /src/plugins | |
parent | 478ec8819427f783cba05601779cfce9dba1d55c (diff) | |
parent | a16f81a365b7d9a6629b04bd298a3b45fc1b7628 (diff) | |
download | qtsensors-b11d8d673ba36ab22c0d7a40ea53d57f284cca13.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02497aafc94feba0381ffe8733cbc89f29fb412
Diffstat (limited to 'src/plugins')
6 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp index b64536e..36ce08e 100644 --- a/src/plugins/sensors/android/src/androidaccelerometer.cpp +++ b/src/plugins/sensors/android/src/androidaccelerometer.cpp @@ -49,7 +49,7 @@ void AndroidAccelerometer::onSensorChanged(jlong timestamp, const jfloat *values { if (size < 3) return; - m_reader.setTimestamp(timestamp); + m_reader.setTimestamp(timestamp/1000); // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values m_reader.setX(values[0]); m_reader.setY(values[1]); diff --git a/src/plugins/sensors/android/src/androidgyroscope.cpp b/src/plugins/sensors/android/src/androidgyroscope.cpp index 69a05c1..9d445af 100644 --- a/src/plugins/sensors/android/src/androidgyroscope.cpp +++ b/src/plugins/sensors/android/src/androidgyroscope.cpp @@ -50,7 +50,7 @@ void AndroidGyroscope::onSensorChanged(jlong timestamp, const jfloat *values, ui { if (size < 3) return; - m_reader.setTimestamp(timestamp); + m_reader.setTimestamp(timestamp/1000); // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values m_reader.setX(values[0]*180/M_PI); m_reader.setY(values[1]*180/M_PI); diff --git a/src/plugins/sensors/android/src/androidlight.cpp b/src/plugins/sensors/android/src/androidlight.cpp index 42295e5..7c059de 100644 --- a/src/plugins/sensors/android/src/androidlight.cpp +++ b/src/plugins/sensors/android/src/androidlight.cpp @@ -55,7 +55,7 @@ void AndroidLight::onSensorChanged(jlong timestamp, const jfloat *values, uint s { if (size < 1) return; - m_reader.setTimestamp(timestamp); + m_reader.setTimestamp(timestamp/1000); // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values m_reader.setLux(values[0]); newReadingAvailable(); diff --git a/src/plugins/sensors/android/src/androidmagnetometer.cpp b/src/plugins/sensors/android/src/androidmagnetometer.cpp index 9175f58..e6b4de5 100644 --- a/src/plugins/sensors/android/src/androidmagnetometer.cpp +++ b/src/plugins/sensors/android/src/androidmagnetometer.cpp @@ -54,7 +54,7 @@ void AndroidMagnetometer::onSensorChanged(jlong timestamp, const jfloat *values, { if (size<3) return; - m_reader.setTimestamp(timestamp); + m_reader.setTimestamp(timestamp/1000); // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values m_reader.setX(values[0]/1e6); m_reader.setY(values[1]/1e6); diff --git a/src/plugins/sensors/android/src/androidrotation.cpp b/src/plugins/sensors/android/src/androidrotation.cpp index 602575f..d529558 100644 --- a/src/plugins/sensors/android/src/androidrotation.cpp +++ b/src/plugins/sensors/android/src/androidrotation.cpp @@ -55,7 +55,7 @@ void AndroidRotation::onSensorChanged(jlong timestamp, const jfloat *values, uin { if (size < 3) return; - m_reader.setTimestamp(timestamp); + m_reader.setTimestamp(timestamp/1000); float rz = -values[0]*180/M_PI; float rx = -values[1]*180/M_PI; diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp index 33e7111..675e54b 100644 --- a/src/plugins/sensors/dummy/dummycommon.cpp +++ b/src/plugins/sensors/dummy/dummycommon.cpp @@ -151,6 +151,7 @@ quint64 dummycommon::getTimestamp() int ok; ok = clock_gettime(CLOCK_MONOTONIC, &tv); Q_ASSERT(ok == 0); + Q_UNUSED(ok); quint64 result = (tv.tv_sec * 1000000ULL) + (tv.tv_nsec * 0.001); // scale to microseconds return result; |