diff options
Diffstat (limited to 'src/plugins/sensors/winrt/winrtcompass.cpp')
| -rw-r--r-- | src/plugins/sensors/winrt/winrtcompass.cpp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/plugins/sensors/winrt/winrtcompass.cpp b/src/plugins/sensors/winrt/winrtcompass.cpp index 6a678e2a..4ae0d396 100644 --- a/src/plugins/sensors/winrt/winrtcompass.cpp +++ b/src/plugins/sensors/winrt/winrtcompass.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 +** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ @@ -94,7 +86,6 @@ public: qCWarning(lcWinRtSensors) << "Failed to get compass reading timestamp." << qt_error_string(hr); return hr; } -#ifndef Q_OS_WINPHONE // Windows Phone doesn't implement the accuracy interface ComPtr<ICompassReadingHeadingAccuracy> accuracyReading; hr = value.As(&accuracyReading); if (FAILED(hr)) { @@ -124,7 +115,7 @@ public: reading.setCalibrationLevel(1.00); break; } -#endif + reading.setAzimuth(heading); reading.setTimestamp(dateTimeToMsSinceEpoch(dateTime)); q->newReadingAvailable(); @@ -165,6 +156,9 @@ WinRtCompass::WinRtCompass(QSensor *sensor) return; } + addDataRate(1, 1000 / d->minimumReportInterval); // dataRate in Hz + sensor->setDataRate(1); + setReading<QCompassReading>(&d->reading); } @@ -189,7 +183,12 @@ void WinRtCompass::start() sensorError(hr); return; } - quint32 reportInterval = qMax(d->minimumReportInterval, quint32(1000/sensor()->dataRate())); + + int dataRate = sensor()->dataRate(); + if (!dataRate) + return; + + quint32 reportInterval = qMax(d->minimumReportInterval, quint32(1000/dataRate)); hr = d->sensor->put_ReportInterval(reportInterval); if (FAILED(hr)) { qCWarning(lcWinRtSensors) << "Unable to attach to set report interval." |