diff options
30 files changed, 181 insertions, 72 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/sensors/qmlsensorgestures/plugin/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h index 0daa743..7092aec 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h @@ -49,7 +49,7 @@ class QCounterGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 2deff79..f461372 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -3,13 +3,16 @@ import QtQuick.tooling 1.1 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // -// This file was auto-generated with the command 'qmlplugindump QtSensors 5.0 /home/thomas/src/qtbase/qml'. +// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtSensors 5.1'. Module { Component { name: "QmlAccelerometer" prototype: "QmlSensor" - exports: ["Accelerometer 5.0", "Accelerometer 5.1"] + exports: [ + "QtSensors/Accelerometer 5.0", + "QtSensors/Accelerometer 5.1" + ] exportMetaObjectRevisions: [0, 1] Enum { name: "AccelerationMode" @@ -22,13 +25,18 @@ Module { Property { name: "accelerationMode"; revision: 1; type: "AccelerationMode" } Signal { name: "accelerationModeChanged" + revision: 1 Parameter { name: "accelerationMode"; type: "AccelerationMode" } } } Component { name: "QmlAccelerometerReading" prototype: "QmlSensorReading" - exports: ["AccelerometerReading 5.0", "AccelerometerReading 5.1"] + exports: [ + "QtSensors/AccelerometerReading 5.0", + "QtSensors/AccelerometerReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -36,57 +44,79 @@ Module { Component { name: "QmlAltimeter" prototype: "QmlSensor" - exports: ["Altimeter 5.1"] + exports: ["QtSensors/Altimeter 5.1"] + exportMetaObjectRevisions: [0] } Component { name: "QmlAltimeterReading" prototype: "QmlSensorReading" - exports: ["AltimeterReading 5.1"] + exports: ["QtSensors/AltimeterReading 5.1"] + exportMetaObjectRevisions: [0] Property { name: "altitude"; type: "double"; isReadonly: true } } Component { name: "QmlAmbientLightSensor" prototype: "QmlSensor" - exports: ["AmbientLightSensor 5.0", "AmbientLightSensor 5.1"] + exports: [ + "QtSensors/AmbientLightSensor 5.0", + "QtSensors/AmbientLightSensor 5.1" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlAmbientLightSensorReading" prototype: "QmlSensorReading" - exports: ["AmbientLightReading 5.0", "AmbientLightReading 5.1"] + exports: [ + "QtSensors/AmbientLightReading 5.0", + "QtSensors/AmbientLightReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "lightLevel"; type: "QAmbientLightReading::LightLevel"; isReadonly: true } } Component { name: "QmlAmbientTemperatureReading" prototype: "QmlSensorReading" - exports: ["AmbientTemperatureReading 5.1"] + exports: ["QtSensors/AmbientTemperatureReading 5.1"] + exportMetaObjectRevisions: [0] Property { name: "temperature"; type: "double"; isReadonly: true } } Component { name: "QmlAmbientTemperatureSensor" prototype: "QmlSensor" - exports: ["AmbientTemperatureSensor 5.1"] + exports: ["QtSensors/AmbientTemperatureSensor 5.1"] + exportMetaObjectRevisions: [0] } Component { name: "QmlCompass" prototype: "QmlSensor" - exports: ["Compass 5.0", "Compass 5.1"] + exports: ["QtSensors/Compass 5.0", "QtSensors/Compass 5.1"] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlCompassReading" prototype: "QmlSensorReading" - exports: ["CompassReading 5.0", "CompassReading 5.1"] + exports: [ + "QtSensors/CompassReading 5.0", + "QtSensors/CompassReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "azimuth"; type: "double"; isReadonly: true } Property { name: "calibrationLevel"; type: "double"; isReadonly: true } } Component { name: "QmlGyroscope" prototype: "QmlSensor" - exports: ["Gyroscope 5.0", "Gyroscope 5.1"] + exports: ["QtSensors/Gyroscope 5.0", "QtSensors/Gyroscope 5.1"] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlGyroscopeReading" prototype: "QmlSensorReading" - exports: ["GyroscopeReading 5.0", "GyroscopeReading 5.1"] + exports: [ + "QtSensors/GyroscopeReading 5.0", + "QtSensors/GyroscopeReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -94,29 +124,40 @@ Module { Component { name: "QmlHolsterReading" prototype: "QmlSensorReading" - exports: ["HolsterReading 5.1"] + exports: ["QtSensors/HolsterReading 5.1"] + exportMetaObjectRevisions: [0] Property { name: "holstered"; type: "bool"; isReadonly: true } } Component { name: "QmlHolsterSensor" prototype: "QmlSensor" - exports: ["HolsterSensor 5.1"] + exports: ["QtSensors/HolsterSensor 5.1"] + exportMetaObjectRevisions: [0] } Component { name: "QmlIRProximitySensor" prototype: "QmlSensor" - exports: ["IRProximitySensor 5.0", "IRProximitySensor 5.1"] + exports: [ + "QtSensors/IRProximitySensor 5.0", + "QtSensors/IRProximitySensor 5.1" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlIRProximitySensorReading" prototype: "QmlSensorReading" - exports: ["IRProximityReading 5.0", "IRProximityReading 5.1"] + exports: [ + "QtSensors/IRProximityReading 5.0", + "QtSensors/IRProximityReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "reflectance"; type: "double"; isReadonly: true } } Component { name: "QmlLightSensor" prototype: "QmlSensor" - exports: ["LightSensor 5.0", "LightSensor 5.1"] + exports: ["QtSensors/LightSensor 5.0", "QtSensors/LightSensor 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "fieldOfView"; type: "double"; isReadonly: true } Signal { name: "fieldOfViewChanged" @@ -126,13 +167,15 @@ Module { Component { name: "QmlLightSensorReading" prototype: "QmlSensorReading" - exports: ["LightReading 5.0", "LightReading 5.1"] + exports: ["QtSensors/LightReading 5.0", "QtSensors/LightReading 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "illuminance"; type: "double"; isReadonly: true } } Component { name: "QmlMagnetometer" prototype: "QmlSensor" - exports: ["Magnetometer 5.0", "Magnetometer 5.1"] + exports: ["QtSensors/Magnetometer 5.0", "QtSensors/Magnetometer 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "returnGeoValues"; type: "bool" } Signal { name: "returnGeoValuesChanged" @@ -142,7 +185,11 @@ Module { Component { name: "QmlMagnetometerReading" prototype: "QmlSensorReading" - exports: ["MagnetometerReading 5.0", "MagnetometerReading 5.1"] + exports: [ + "QtSensors/MagnetometerReading 5.0", + "QtSensors/MagnetometerReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -151,40 +198,62 @@ Module { Component { name: "QmlOrientationSensor" prototype: "QmlSensor" - exports: ["OrientationSensor 5.0", "OrientationSensor 5.1"] + exports: [ + "QtSensors/OrientationSensor 5.0", + "QtSensors/OrientationSensor 5.1" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlOrientationSensorReading" prototype: "QmlSensorReading" - exports: ["OrientationReading 5.0", "OrientationReading 5.1"] + exports: [ + "QtSensors/OrientationReading 5.0", + "QtSensors/OrientationReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "orientation"; type: "QOrientationReading::Orientation"; isReadonly: true } } Component { name: "QmlPressureReading" prototype: "QmlSensorReading" - exports: ["PressureReading 5.1"] + exports: ["QtSensors/PressureReading 5.1"] + exportMetaObjectRevisions: [0] Property { name: "pressure"; type: "double"; isReadonly: true } } Component { name: "QmlPressureSensor" prototype: "QmlSensor" - exports: ["PressureSensor 5.1"] + exports: ["QtSensors/PressureSensor 5.1"] + exportMetaObjectRevisions: [0] } Component { name: "QmlProximitySensor" prototype: "QmlSensor" - exports: ["ProximitySensor 5.0", "ProximitySensor 5.1"] + exports: [ + "QtSensors/ProximitySensor 5.0", + "QtSensors/ProximitySensor 5.1" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlProximitySensorReading" prototype: "QmlSensorReading" - exports: ["ProximityReading 5.0", "ProximityReading 5.1"] + exports: [ + "QtSensors/ProximityReading 5.0", + "QtSensors/ProximityReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "near"; type: "bool"; isReadonly: true } } Component { name: "QmlRotationSensor" prototype: "QmlSensor" - exports: ["RotationSensor 5.0", "RotationSensor 5.1"] + exports: [ + "QtSensors/RotationSensor 5.0", + "QtSensors/RotationSensor 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "hasZ"; type: "bool"; isReadonly: true } Signal { name: "hasZChanged" @@ -194,7 +263,11 @@ Module { Component { name: "QmlRotationSensorReading" prototype: "QmlSensorReading" - exports: ["RotationReading 5.0", "RotationReading 5.1"] + exports: [ + "QtSensors/RotationReading 5.0", + "QtSensors/RotationReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -202,7 +275,7 @@ Module { Component { name: "QmlSensor" prototype: "QObject" - exports: ["Sensor 5.0", "Sensor 5.1"] + exports: ["QtSensors/Sensor 5.0", "QtSensors/Sensor 5.1"] exportMetaObjectRevisions: [0, 1] Enum { name: "AxesOrientationMode" @@ -234,30 +307,37 @@ Module { Property { name: "bufferSize"; revision: 1; type: "int" } Signal { name: "skipDuplicatesChanged" + revision: 1 Parameter { name: "skipDuplicates"; type: "bool" } } Signal { name: "axesOrientationModeChanged" + revision: 1 Parameter { name: "axesOrientationMode"; type: "AxesOrientationMode" } } Signal { name: "currentOrientationChanged" + revision: 1 Parameter { name: "currentOrientation"; type: "int" } } Signal { name: "userOrientationChanged" + revision: 1 Parameter { name: "userOrientation"; type: "int" } } Signal { name: "maxBufferSizeChanged" + revision: 1 Parameter { name: "maxBufferSize"; type: "int" } } Signal { name: "efficientBufferSizeChanged" + revision: 1 Parameter { name: "efficientBufferSize"; type: "int" } } Signal { name: "bufferSizeChanged" + revision: 1 Parameter { name: "bufferSize"; type: "int" } } Method { name: "start"; type: "bool" } @@ -266,7 +346,11 @@ Module { Component { name: "QmlSensorGesture" prototype: "QObject" - exports: ["SensorGesture 5.0", "SensorGesture 5.1"] + exports: [ + "QtSensors/SensorGesture 5.0", + "QtSensors/SensorGesture 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "availableGestures"; type: "QStringList"; isReadonly: true } Property { name: "gestures"; type: "QStringList" } Property { name: "validGestures"; type: "QStringList"; isReadonly: true } @@ -280,7 +364,8 @@ Module { Component { name: "QmlSensorGlobal" prototype: "QObject" - exports: ["QmlSensors 5.0", "QmlSensors 5.1"] + exports: ["QtSensors/QmlSensors 5.0", "QtSensors/QmlSensors 5.1"] + exportMetaObjectRevisions: [0, 0] Signal { name: "availableSensorsChanged" } Method { name: "sensorTypes"; type: "QStringList" } Method { @@ -297,7 +382,8 @@ Module { Component { name: "QmlSensorOutputRange" prototype: "QObject" - exports: ["OutputRange 5.0", "OutputRange 5.1"] + exports: ["QtSensors/OutputRange 5.0", "QtSensors/OutputRange 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "minimum"; type: "double"; isReadonly: true } Property { name: "maximum"; type: "double"; isReadonly: true } Property { name: "accuracy"; type: "double"; isReadonly: true } @@ -305,20 +391,26 @@ Module { Component { name: "QmlSensorRange" prototype: "QObject" - exports: ["Range 5.0", "Range 5.1"] + exports: ["QtSensors/Range 5.0", "QtSensors/Range 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "minimum"; type: "int"; isReadonly: true } Property { name: "maximum"; type: "int"; isReadonly: true } } Component { name: "QmlSensorReading" prototype: "QObject" - exports: ["SensorReading 5.0", "SensorReading 5.1"] + exports: [ + "QtSensors/SensorReading 5.0", + "QtSensors/SensorReading 5.1" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "timestamp"; type: "qulonglong"; isReadonly: true } } Component { name: "QmlTapSensor" prototype: "QmlSensor" - exports: ["TapSensor 5.0", "TapSensor 5.1"] + exports: ["QtSensors/TapSensor 5.0", "QtSensors/TapSensor 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "returnDoubleTapEvents"; type: "bool" } Signal { name: "returnDoubleTapEventsChanged" @@ -328,7 +420,8 @@ Module { Component { name: "QmlTapSensorReading" prototype: "QmlSensorReading" - exports: ["TapReading 5.0", "TapReading 5.1"] + exports: ["QtSensors/TapReading 5.0", "QtSensors/TapReading 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "tapDirection"; type: "QTapReading::TapDirection"; isReadonly: true } Property { name: "doubleTap"; type: "bool"; isReadonly: true } Signal { name: "isDoubleTapChanged" } @@ -336,13 +429,15 @@ Module { Component { name: "QmlTiltSensor" prototype: "QmlSensor" - exports: ["TiltSensor 5.0", "TiltSensor 5.1"] + exports: ["QtSensors/TiltSensor 5.0", "QtSensors/TiltSensor 5.1"] + exportMetaObjectRevisions: [0, 0] Method { name: "calibrate" } } Component { name: "QmlTiltSensorReading" prototype: "QmlSensorReading" - exports: ["TiltReading 5.0", "TiltReading 5.1"] + exports: ["QtSensors/TiltReading 5.0", "QtSensors/TiltReading 5.1"] + exportMetaObjectRevisions: [0, 0] Property { name: "yRotation"; type: "double"; isReadonly: true } Property { name: "xRotation"; type: "double"; isReadonly: true } } diff --git a/src/plugins/sensorgestures/qtsensors/plugin.json b/src/plugins/sensorgestures/qtsensors/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- a/src/plugins/sensorgestures/qtsensors/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h index 5980a49..848a4f0 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h +++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: diff --git a/src/plugins/sensorgestures/shake/plugin.json b/src/plugins/sensorgestures/shake/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- a/src/plugins/sensorgestures/shake/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index 7b95064..ea69dd0 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -50,7 +50,7 @@ class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro index fb56058..f875f59 100644 --- a/src/plugins/sensors/sensorfw/sensorfw.pro +++ b/src/plugins/sensors/sensorfw/sensorfw.pro @@ -1,5 +1,5 @@ TARGET = qtsensors_sensorfw -QT = core sensors network +QT = core sensors network dbus PLUGIN_TYPE = sensors load(qt_plugin) diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp index ddbaa9c..4c50faa 100644 --- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp @@ -51,6 +51,7 @@ sensorfwaccelerometer::sensorfwaccelerometer(QSensor *sensor) setDescription(QLatin1String("x, y, and z axes accelerations in m/s^2")); setRanges(GRAVITY_EARTH_THOUSANDTH); setReading<QAccelerometerReading>(&m_reading); + sensor->setDataRate(50);//set a default rate } void sensorfwaccelerometer::slotDataAvailable(const XYZ& data) diff --git a/src/plugins/sensors/sensorfw/sensorfwals.cpp b/src/plugins/sensors/sensorfw/sensorfwals.cpp index 811da77..839c537 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwals.cpp @@ -54,6 +54,7 @@ Sensorfwals::Sensorfwals(QSensor *sensor) setDescription(QLatin1String("ambient light intensity given as 5 pre-defined levels")); addOutputRange(0, 5, 1); addDataRate(10,10); + sensor->setDataRate(10);//set a default rate } void Sensorfwals::start() diff --git a/src/plugins/sensors/sensorfw/sensorfwals.h b/src/plugins/sensors/sensorfw/sensorfwals.h index ba7c9af..63d6443 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.h +++ b/src/plugins/sensors/sensorfw/sensorfwals.h @@ -46,7 +46,6 @@ #include <qambientlightsensor.h> #include <alssensor_i.h> -#include <unsigned.h> diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp index 00741a1..1fd8441 100644 --- a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp @@ -50,6 +50,7 @@ SensorfwCompass::SensorfwCompass(QSensor *sensor) { initSensor<CompassSensorChannelInterface>(m_initDone); setReading<QCompassReading>(&m_reading); + sensor->setDataRate(50);//set a default rate } void SensorfwCompass::slotDataAvailable(const Compass& data) diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.h b/src/plugins/sensors/sensorfw/sensorfwcompass.h index e54c348..7cc5c43 100644 --- a/src/plugins/sensors/sensorfw/sensorfwcompass.h +++ b/src/plugins/sensors/sensorfw/sensorfwcompass.h @@ -45,7 +45,7 @@ #include <qcompass.h> #include <compasssensor_i.h> -#include <compass.h> +#include <datatypes/compass.h> diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp index 238993a..e29b77e 100644 --- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp @@ -54,6 +54,7 @@ SensorfwGyroscope::SensorfwGyroscope(QSensor *sensor) setReading<QGyroscopeReading>(&m_reading); addDataRate(10, 10); addDataRate(50, 50); + sensor->setDataRate(50);//set a default rate } void SensorfwGyroscope::slotDataAvailable(const XYZ& data) diff --git a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp index 865d376..a2e2349 100644 --- a/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwirproximitysensor.cpp @@ -56,6 +56,7 @@ SensorfwIrProximitySensor::SensorfwIrProximitySensor(QSensor *sensor) addOutputRange(0, 100, 1); addDataRate(10,10); rangeMax = QFile::exists(RM680_PS)?255:1023; + sensor->setDataRate(10);//set a default rate } void SensorfwIrProximitySensor::slotDataAvailable(const Proximity& proximity) diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp index b49e7b2..232d4e8 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp @@ -49,6 +49,7 @@ SensorfwLightSensor::SensorfwLightSensor(QSensor *sensor) { initSensor<ALSSensorChannelInterface>(m_initDone); setReading<QLightReading>(&m_reading); + sensor->setDataRate(10);//set a default rate } void SensorfwLightSensor::slotDataAvailable(const Unsigned& data) diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h index 83591fa..96df633 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.h @@ -47,8 +47,6 @@ #include <qlightsensor.h> #include <alssensor_i.h> -#include <unsigned.h> - class SensorfwLightSensor : public SensorfwSensorBase diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp index 9778b95..e4afdd3 100644 --- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include "sensorfwmagnetometer.h" +#include <QSensor> + char const * const SensorfwMagnetometer::id("sensorfw.magnetometer"); bool SensorfwMagnetometer::m_initDone = false; @@ -53,11 +55,14 @@ SensorfwMagnetometer::SensorfwMagnetometer(QSensor *sensor) setDescription(QLatin1String("magnetic flux density in teslas (T)")); setRanges(NANO); setReading<QMagnetometerReading>(&m_reading); + sensor->setDataRate(50);//set a default rate } void SensorfwMagnetometer::start() { - m_isGeoMagnetometer = sensor()->returnGeoValues(); + QMagnetometer *const magnetometer = qobject_cast<QMagnetometer *>(sensor()); + if (magnetometer) + m_isGeoMagnetometer = magnetometer->returnGeoValues(); SensorfwSensorBase::start(); } @@ -67,13 +72,13 @@ void SensorfwMagnetometer::slotDataAvailable(const MagneticField& data) m_reading.setX( NANO * (m_isGeoMagnetometer?data.x():data.rx())); m_reading.setY( NANO * (m_isGeoMagnetometer?data.y():data.ry())); m_reading.setZ( NANO * (m_isGeoMagnetometer?data.z():data.rz())); - m_reading.setCalibrationLevel( m_isGeoMagnetometer?((float) data.level()) / 3.0 :1); + m_reading.setCalibrationLevel(m_isGeoMagnetometer?((float) data.level()) / 3.0 :1); m_reading.setTimestamp(data.timestamp()); newReadingAvailable(); } -void SensorfwMagnetometer::slotFrameAvailable(const QVector<MagneticField>& frame) +void SensorfwMagnetometer::slotFrameAvailable(const QVector<MagneticField>& frame) { for (int i=0, l=frame.size(); i<l; i++) { slotDataAvailable(frame.at(i)); @@ -83,8 +88,10 @@ void SensorfwMagnetometer::slotFrameAvailable(const QVector<MagneticField>& fr bool SensorfwMagnetometer::doConnect() { if (m_bufferSize==1) - return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(slotDataAvailable(const MagneticField&))); - return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<MagneticField>& )),this, SLOT(slotFrameAvailable(const QVector<MagneticField>& ))); + return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const MagneticField&)), + this, SLOT(slotDataAvailable(const MagneticField&))); + return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<MagneticField>& )), + this, SLOT(slotFrameAvailable(const QVector<MagneticField>& ))); } QString SensorfwMagnetometer::sensorName() const diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h index dff70c0..22d81a8 100644 --- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h +++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h @@ -46,7 +46,7 @@ #include <qmagnetometer.h> #include <magnetometersensor_i.h> -#include <magneticfield.h> +#include <datatypes/magneticfield.h> diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp index 09dfb0e..6211a45 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp @@ -41,7 +41,7 @@ #include "sensorfworientationsensor.h" -#include <posedata.h> +#include <datatypes/posedata.h> char const * const SensorfwOrientationSensor::id("sensorfw.orientationsensor"); bool SensorfwOrientationSensor::m_initDone = false; @@ -51,6 +51,7 @@ SensorfwOrientationSensor::SensorfwOrientationSensor(QSensor *sensor) { initSensor<OrientationSensorChannelInterface>(m_initDone); setReading<QOrientationReading>(&m_reading); + sensor->setDataRate(10);//set a default rate } diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h index 496939c..7c2ecdf 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.h @@ -46,7 +46,6 @@ #include <qorientationsensor.h> #include <orientationsensor_i.h> -#include <unsigned.h> diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp index 4602a9a..1f4c2b5 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp @@ -50,6 +50,7 @@ SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor) initSensor<ProximitySensorChannelInterface>(m_initDone); setReading<QProximityReading>(&m_reading); addDataRate(10,10); //TODO: fix this when we know better + sensor->setDataRate(10);//set a default rate } void SensorfwProximitySensor::start() diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h index 91800c2..404e66a 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h @@ -46,7 +46,6 @@ #include <qproximitysensor.h> #include <proximitysensor_i.h> -#include <unsigned.h> diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp index d577402..1971e92 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp @@ -49,7 +49,10 @@ SensorfwRotationSensor::SensorfwRotationSensor(QSensor *sensor) { initSensor<RotationSensorChannelInterface>(m_initDone); setReading<QRotationReading>(&m_reading); - sensor()->setHasZ(true); + QRotationSensor *const rotationSensor = qobject_cast<QRotationSensor *>(sensor); + if (rotationSensor) + rotationSensor->setHasZ(true); + sensor->setDataRate(20);//set a default rate } void SensorfwRotationSensor::slotDataAvailable(const XYZ& data) diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h index 5b5556d..d6b056b 100644 --- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h @@ -47,7 +47,7 @@ #include <qrotationsensor.h> #include <rotationsensor_i.h> -#include <xyz.h> +#include <datatypes/xyz.h> diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp index 85968e2..b41d630 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp @@ -73,7 +73,7 @@ void SensorfwSensorBase::start() if (m_sensorInterface) { // dataRate QByteArray type = sensor()->type(); - if (type != QTapSensor::type() && type != QProximitySensor::type()) { + if (type != QTapSensor::type && type != QProximitySensor::type) { int dataRate = sensor()->dataRate(); int interval = dataRate > 0 ? 1000 / dataRate : 0; // for testing maximum speed diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 78a6c14..1c2aa0e 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h @@ -47,6 +47,11 @@ #include <sensormanagerinterface.h> #include <abstractsensor_i.h> +#include <QAmbientLightSensor> +#include <QIRProximitySensor> +#include <QTapSensor> +#include <QProximitySensor> + class SensorfwSensorBase : public QSensorBackend { public: @@ -137,11 +142,11 @@ protected: m_maxBufferSize = 1; sensor()->setMaxBufferSize(m_maxBufferSize); - sensor()->efficientBufferSize(m_efficientBufferSize); + sensor()->setEfficientBufferSize(m_efficientBufferSize); QByteArray type = sensor()->type(); - if (type == QAmbientLightSensor::type()) return; // SensorFW returns lux values, plugin enumerated values - if (type == QIRProximitySensor::type()) return; // SensorFW returns raw reflectance values, plugin % of max reflectance + if (type == QAmbientLightSensor::type) return; // SensorFW returns lux values, plugin enumerated values + if (type == QIRProximitySensor::type) return; // SensorFW returns raw reflectance values, plugin % of max reflectance if (name == "accelerometersensor") return; // SensorFW returns milliGs, plugin m/s^2 if (name == "magnetometersensor") return; // SensorFW returns nanoTeslas, plugin Teslas if (name == "gyroscopesensor") return; // SensorFW returns DSPs, plugin milliDSPs diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp index c945ac1..d5539de 100644 --- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.cpp @@ -51,15 +51,18 @@ SensorfwTapSensor::SensorfwTapSensor(QSensor *sensor) setReading<QTapReading>(&m_reading); addOutputRange(QTapReading::Undefined, QTapReading::Z_Both, 1); addDataRate(10,10); //TODO: fix this when we know better + sensor->setDataRate(10);//set a default rate } void SensorfwTapSensor::start() { - bool b = sensor()->returnDoubleTapEvents(); + QTapSensor * const tapSensor = qobject_cast<QTapSensor *>(sensor()); + + bool b = tapSensor->returnDoubleTapEvents(); bool isDoubleTapSensor = m_isDoubleTapSensor; if (!b) { - sensor()->setReturnDoubleTapEvents(true); //by default doubles + tapSensor->setReturnDoubleTapEvents(true); //by default doubles m_isDoubleTapSensor = true; } else m_isDoubleTapSensor = b; diff --git a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h index 6df3bcf..c577bde 100644 --- a/src/plugins/sensors/sensorfw/sensorfwtapsensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwtapsensor.h @@ -45,7 +45,7 @@ #include <qtapsensor.h> #include <tapsensor_i.h> -#include <tap.h> +#include <datatypes/tap.h> diff --git a/src/sensors/doc/src/sensor-examples.qdoc b/src/sensors/doc/src/sensor-examples.qdoc index d934c8a..1dd5852 100644 --- a/src/sensors/doc/src/sensor-examples.qdoc +++ b/src/sensors/doc/src/sensor-examples.qdoc @@ -33,8 +33,4 @@ These are the Qt Sensors examples. - \generatelist related */ - - - |