diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
commit | d487c74a7f6a18a106314d3dc58013c6cfc2e1ca (patch) | |
tree | a061010dd8503d6263b72513a454aa5d2356ac5f /src/plugins/sensors/sensorfw/sensorfwsensorbase.h | |
parent | 102bdf35b13f1b60df26052341ebc5a2833518c7 (diff) | |
parent | 5ae30e1ae8de41478476567148846a80cd508e7b (diff) |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.h')
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 78a6c14f..1c2aa0e0 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 |