From 20769d97920674d9b7480d1f2305315dcd9d2819 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Fri, 29 Jun 2012 10:39:22 +0200 Subject: Blackberry: Add ambient light sensor support Change-Id: I119c5864599e206795522be485c4c218f983cfb9 Reviewed-by: Adam Parco Reviewed-by: Lorn Potter Reviewed-by: Sean Harmer --- .../sensors/blackberry/bbambientlightsensor.cpp | 69 ++++++++++++++++++++++ .../sensors/blackberry/bbambientlightsensor.h | 60 +++++++++++++++++++ src/plugins/sensors/blackberry/blackberry.pro | 2 + src/plugins/sensors/blackberry/main.cpp | 6 ++ 4 files changed, 137 insertions(+) create mode 100644 src/plugins/sensors/blackberry/bbambientlightsensor.cpp create mode 100644 src/plugins/sensors/blackberry/bbambientlightsensor.h (limited to 'src/plugins/sensors/blackberry') diff --git a/src/plugins/sensors/blackberry/bbambientlightsensor.cpp b/src/plugins/sensors/blackberry/bbambientlightsensor.cpp new file mode 100644 index 00000000..a2dc99f7 --- /dev/null +++ b/src/plugins/sensors/blackberry/bbambientlightsensor.cpp @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "bbambientlightsensor.h" + +BbAmbientLightSensor::BbAmbientLightSensor(QSensor *sensor) + : BbSensorBackend(devicePath(), SENSOR_TYPE_LIGHT, sensor) +{ + setDescription(QLatin1String("Ambient light brightness")); +} + +bool BbAmbientLightSensor::updateReadingFromEvent(const sensor_event_t &event, QAmbientLightReading *reading) +{ + const int lightLevelLux = event.light_s.illuminance; + if (lightLevelLux < 10) + reading->setLightLevel(QAmbientLightReading::Dark); + else if (lightLevelLux < 80) + reading->setLightLevel(QAmbientLightReading::Twilight); + else if (lightLevelLux < 400) + reading->setLightLevel(QAmbientLightReading::Light); + else if (lightLevelLux < 2500) + reading->setLightLevel(QAmbientLightReading::Bright); + else + reading->setLightLevel(QAmbientLightReading::Sunny); + + return true; +} + +QString BbAmbientLightSensor::devicePath() +{ + return QLatin1String("/dev/sensor/light"); +} diff --git a/src/plugins/sensors/blackberry/bbambientlightsensor.h b/src/plugins/sensors/blackberry/bbambientlightsensor.h new file mode 100644 index 00000000..25d0e2e3 --- /dev/null +++ b/src/plugins/sensors/blackberry/bbambientlightsensor.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef BBAMBIENTLIGHTSENSOR_H +#define BBAMBIENTLIGHTSENSOR_H + +#include "bbsensorbackend.h" +#include + +class BbAmbientLightSensor : public BbSensorBackend +{ + Q_OBJECT + +public: + explicit BbAmbientLightSensor(QSensor *sensor); + + static QString devicePath(); + +protected: + bool updateReadingFromEvent(const sensor_event_t &event, QAmbientLightReading *reading) Q_DECL_OVERRIDE; +}; + +#endif diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro index a088c1a4..fecd8276 100644 --- a/src/plugins/sensors/blackberry/blackberry.pro +++ b/src/plugins/sensors/blackberry/blackberry.pro @@ -13,6 +13,7 @@ DESTDIR = $$QT.sensors.plugins/sensors HEADERS += bbsensorbackend.h \ bbaccelerometer.h \ bbaltimeter.h \ + bbambientlightsensor.h \ bbcompass.h \ bbgyroscope.h \ bbirproximitysensor.h \ @@ -28,6 +29,7 @@ HEADERS += bbsensorbackend.h \ SOURCES += bbsensorbackend.cpp \ bbaccelerometer.cpp \ bbaltimeter.cpp \ + bbambientlightsensor.cpp \ bbcompass.cpp \ bbgyroscope.cpp \ bbirproximitysensor.cpp \ diff --git a/src/plugins/sensors/blackberry/main.cpp b/src/plugins/sensors/blackberry/main.cpp index c0d1f1d9..e5827760 100644 --- a/src/plugins/sensors/blackberry/main.cpp +++ b/src/plugins/sensors/blackberry/main.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "bbaccelerometer.h" #include "bbaltimeter.h" +#include "bbambientlightsensor.h" #include "bbcompass.h" #include "bbgyroscope.h" #include "bbirproximitysensor.h" @@ -56,6 +57,7 @@ static const char *bbAccelerometerId = "bbAccelerometer"; static const char *bbAltitmeterId = "bbAltimeter"; +static const char *bbAmbientLightSensorId = "bbAmbientLightSensor"; static const char *bbCompassId = "bbCompass"; static const char *bbGyroscopeId = "bbGyroscope"; static const char *bbIRProximitySensorId = "bbIRProximitySensor"; @@ -80,6 +82,8 @@ public: QSensorManager::registerBackend(QAccelerometer::type, bbAccelerometerId, this); if (sensorSupported(BbAltimeter::devicePath())) QSensorManager::registerBackend("BbAltimeter", bbAltitmeterId, this); + if (sensorSupported(BbAmbientLightSensor::devicePath())) + QSensorManager::registerBackend(QAmbientLightSensor::type, bbAmbientLightSensorId, this); if (sensorSupported(BbCompass::devicePath())) QSensorManager::registerBackend(QCompass::type, bbCompassId, this); if (sensorSupported(BbGyroscope::devicePath())) @@ -109,6 +113,8 @@ public: backend = new BbAccelerometer(sensor); if (sensor->identifier() == bbAltitmeterId) backend = new BbAltimeter(sensor); + if (sensor->identifier() == bbAmbientLightSensorId) + backend = new BbAmbientLightSensor(sensor); if (sensor->identifier() == bbCompassId) backend = new BbCompass(sensor); if (sensor->identifier() == bbGyroscopeId) -- cgit v1.2.3