diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sensors/blackberry/bbdistancesensor.cpp | 58 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/bbdistancesensor.h | 60 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/blackberry.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/main.cpp | 6 |
4 files changed, 126 insertions, 0 deletions
diff --git a/src/plugins/sensors/blackberry/bbdistancesensor.cpp b/src/plugins/sensors/blackberry/bbdistancesensor.cpp new file mode 100644 index 00000000..c40845a4 --- /dev/null +++ b/src/plugins/sensors/blackberry/bbdistancesensor.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "bbdistancesensor.h" + +BbDistanceSensor::BbDistanceSensor(QSensor *sensor) + : BbSensorBackend<QDistanceReading>(devicePath(), SENSOR_TYPE_PROXIMITY, sensor) +{ + setDescription(QLatin1String("Distance")); +} + +QString BbDistanceSensor::devicePath() +{ + return QLatin1String("/dev/sensor/prox"); +} + +bool BbDistanceSensor::updateReadingFromEvent(const sensor_event_t &event, QDistanceReading *reading) +{ + reading->setDistance(event.proximity_s.distance); + return true; +} diff --git a/src/plugins/sensors/blackberry/bbdistancesensor.h b/src/plugins/sensors/blackberry/bbdistancesensor.h new file mode 100644 index 00000000..c9ea48fe --- /dev/null +++ b/src/plugins/sensors/blackberry/bbdistancesensor.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef BBDISTANCESENSOR_H +#define BBDISTANCESENSOR_H + +#include "bbsensorbackend.h" +#include <qdistancesensor.h> + +class BbDistanceSensor : public BbSensorBackend<QDistanceReading> +{ + Q_OBJECT + +public: + explicit BbDistanceSensor(QSensor *sensor); + + static QString devicePath(); + +protected: + bool updateReadingFromEvent(const sensor_event_t &event, QDistanceReading *reading) Q_DECL_OVERRIDE; +}; + +#endif diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro index 902239c4..b03d4028 100644 --- a/src/plugins/sensors/blackberry/blackberry.pro +++ b/src/plugins/sensors/blackberry/blackberry.pro @@ -21,6 +21,7 @@ HEADERS += bbsensorbackend.h \ bbaltimeter.h \ bbambientlightsensor.h \ bbcompass.h \ + bbdistancesensor.h \ bbgyroscope.h \ bbirproximitysensor.h \ bblightsensor.h \ @@ -38,6 +39,7 @@ SOURCES += bbsensorbackend.cpp \ bbaltimeter.cpp \ bbambientlightsensor.cpp \ bbcompass.cpp \ + bbdistancesensor.cpp \ bbgyroscope.cpp \ bbirproximitysensor.cpp \ bblightsensor.cpp \ diff --git a/src/plugins/sensors/blackberry/main.cpp b/src/plugins/sensors/blackberry/main.cpp index 61f9aa08..9037e66b 100644 --- a/src/plugins/sensors/blackberry/main.cpp +++ b/src/plugins/sensors/blackberry/main.cpp @@ -54,6 +54,7 @@ #include "bbproximitysensor.h" #include "bbrotationsensor.h" #include "bbtemperaturesensor.h" +#include "bbdistancesensor.h" #include "bbguihelper.h" #include <qsensormanager.h> @@ -75,6 +76,7 @@ static const char *bbPressureSensorId = "bbPressureSensor"; static const char *bbProximitySensorId = "bbProximitySensor"; static const char *bbRotationSensorId = "bbRotationSensor"; static const char *bbTemperatureSensorId = "bbTemperatureSensor"; +static const char *bbDistanceSensorId = "bbDistanceSensor"; class BbSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { @@ -115,6 +117,8 @@ public: QSensorManager::registerBackend(QRotationSensor::type, bbRotationSensorId, this); if (sensorSupported(BbTemperatureSensor::devicePath())) QSensorManager::registerBackend(QAmbientTemperatureSensor::type, bbTemperatureSensorId, this); + if (sensorSupported(BbDistanceSensor::devicePath())) + QSensorManager::registerBackend(QDistanceSensor::type, bbDistanceSensorId, this); } QSensorBackend *createBackend(QSensor *sensor) Q_DECL_OVERRIDE @@ -150,6 +154,8 @@ public: backend = new BbRotationSensor(sensor); if (sensor->identifier() == bbTemperatureSensorId) backend = new BbTemperatureSensor(sensor); + if (sensor->identifier() == bbDistanceSensorId) + backend = new BbDistanceSensor(sensor); backend->initSensorInfo(); backend->setGuiHelper(&m_guiHelper); return backend; |