diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-09-18 17:15:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 09:56:30 +0200 |
commit | e6e740b5cfacbaa816d461f74bec4240aaa99e21 (patch) | |
tree | 62b1df0fdaa76553d7146666c62bf15b398a8abf /src/plugins/sensors/android/src/main.cpp | |
parent | 0784f45d046f481f91dd9b701e237836c8b3fb11 (diff) | |
download | qtsensors-e6e740b5cfacbaa816d461f74bec4240aaa99e21.tar.gz |
Android: Add missing sensors
This adds Android backends for QAmbientTemperatureSensor, QPressureSensor
and QProximitySensor.
Task-number: QTBUG-30531
Change-Id: I8d97f62d007c886fcc8dd701e23f6a35a3cbd748
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/plugins/sensors/android/src/main.cpp')
-rw-r--r-- | src/plugins/sensors/android/src/main.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/plugins/sensors/android/src/main.cpp b/src/plugins/sensors/android/src/main.cpp index 0cb4de4..17d499e 100644 --- a/src/plugins/sensors/android/src/main.cpp +++ b/src/plugins/sensors/android/src/main.cpp @@ -47,7 +47,10 @@ #include "androidgyroscope.h" #include "androidlight.h" #include "androidmagnetometer.h" +#include "androidpressure.h" +#include "androidproximity.h" #include "androidrotation.h" +#include "androidtemperature.h" using namespace AndroidSensors; @@ -66,7 +69,8 @@ public: break; case TYPE_AMBIENT_TEMPERATURE: case TYPE_TEMPERATURE: - break; // add the temperature sensor backend + QSensorManager::registerBackend(QAmbientTemperatureSensor::type, QByteArray::number(sensor), this); + break; case TYPE_GRAVITY: break; // add the gravity sensor backend case TYPE_GYROSCOPE: @@ -83,14 +87,22 @@ public: case TYPE_ORIENTATION: break; // add the orientation sensor backend case TYPE_PRESSURE: - break; // add the pressure sensor backend + QSensorManager::registerBackend(QPressureSensor::type, QByteArray::number(sensor), this); + break; case TYPE_PROXIMITY: - break; // add the proximity sensor backend + QSensorManager::registerBackend(QProximitySensor::type, QByteArray::number(sensor), this); + break; case TYPE_RELATIVE_HUMIDITY: break; // add the relative humidity sensor backend case TYPE_ROTATION_VECTOR: QSensorManager::registerBackend(QRotationSensor::type, QByteArray::number(sensor), this); break; + + case TYPE_GAME_ROTATION_VECTOR: + case TYPE_GYROSCOPE_UNCALIBRATED: + case TYPE_MAGNETIC_FIELD_UNCALIBRATED: + case TYPE_SIGNIFICANT_MOTION: + break; // add backends for API level 18 sensors } } } @@ -103,7 +115,7 @@ public: return new AndroidAccelerometer(type, sensor); case TYPE_AMBIENT_TEMPERATURE: case TYPE_TEMPERATURE: - break; // add the temperature sensor backend + return new AndroidTemperature(type, sensor); case TYPE_GRAVITY: break; // add the gravity sensor backend case TYPE_GYROSCOPE: @@ -117,13 +129,19 @@ public: case TYPE_ORIENTATION: break; // add the orientation sensor backend case TYPE_PRESSURE: - break; // add the pressure sensor backend + return new AndroidPressure(type, sensor); case TYPE_PROXIMITY: - break; // add the proximity sensor backend + return new AndroidProximity(type, sensor); case TYPE_RELATIVE_HUMIDITY: break; // add the relative humidity sensor backend case TYPE_ROTATION_VECTOR: return new AndroidRotation(type, sensor); + + case TYPE_GAME_ROTATION_VECTOR: + case TYPE_GYROSCOPE_UNCALIBRATED: + case TYPE_MAGNETIC_FIELD_UNCALIBRATED: + case TYPE_SIGNIFICANT_MOTION: + break; // add backends for API level 18 sensors } return 0; } |