From 6a4f3ba1b15a1e2e3c6bf3b4e085db0a47f0b481 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 2 Apr 2013 17:04:34 +0200 Subject: Android: Report correct timestamp value Android uses nanoseconds for the timestamp while Qt uses microseconds. Change-Id: I1a6a4c2c3e8cfc950d795e00b7d7546869399f29 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/sensors/android/src/androidaccelerometer.cpp | 2 +- src/plugins/sensors/android/src/androidgyroscope.cpp | 2 +- src/plugins/sensors/android/src/androidlight.cpp | 2 +- src/plugins/sensors/android/src/androidmagnetometer.cpp | 2 +- src/plugins/sensors/android/src/androidrotation.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp index b64536ef..36ce08e3 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 69a05c18..9d445af1 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 42295e54..7c059de9 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 9175f584..e6b4de5a 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 602575fe..d529558b 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; -- cgit v1.2.3