diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:01:35 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:01:35 +0200 |
commit | d1a1b62914d592bf0bb382accff29abc610d3fab (patch) | |
tree | b4a56c20985816859a4dfe0c77fbf54b9de04f4b /src/plugins/sensors/android/androidproximity.cpp | |
parent | c1b883f076f3f2a9f1f73ea20ea4688a7056b4c1 (diff) | |
parent | 2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Change-Id: Iff501d1162491fafeb9aaf0a68927ade79b3b6e7
Diffstat (limited to 'src/plugins/sensors/android/androidproximity.cpp')
-rw-r--r-- | src/plugins/sensors/android/androidproximity.cpp | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/src/plugins/sensors/android/androidproximity.cpp b/src/plugins/sensors/android/androidproximity.cpp new file mode 100644 index 00000000..000399b0 --- /dev/null +++ b/src/plugins/sensors/android/androidproximity.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2016 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "androidproximity.h" + +AndroidProximity::AndroidProximity(int type, QSensor *sensor, QObject *parent) + : SensorEventQueue<QProximityReading>(type, sensor, parent) +{ + m_maximumRange = m_sensorManager->getMaximumRange(m_sensor); + + // if we can't get the range, we arbitrarily define anything closer than 10 cm as "close" + if (m_maximumRange <= 0) + m_maximumRange = 10.0; +} + + +void AndroidProximity::dataReceived(const ASensorEvent &event) +{ + // https://developer.android.com/reference/android/hardware/SensorEvent.html#sensor.type_proximity: + bool close = qreal(event.distance) < m_maximumRange; + if (sensor()->skipDuplicates() && close == m_reader.close()) + return; + m_reader.setTimestamp(uint64_t(event.timestamp / 1000)); + m_reader.setClose(close); + newReadingAvailable(); +} |