summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2013-04-08 11:24:19 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-16 21:23:38 +0200
commit48b6efda253189ea7e3c3238c10cdced61927a10 (patch)
tree9c7e18123f1c0ff51d36c6e7600dc5283f8aa181 /src
parenta16f81a365b7d9a6629b04bd298a3b45fc1b7628 (diff)
iOS: implement compass
Change-Id: I639a472cd2dfca177282cb4961d589f11f924e36 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sensors/ios/ios.pro8
-rw-r--r--src/plugins/sensors/ios/ioscompass.h72
-rw-r--r--src/plugins/sensors/ios/ioscompass.mm128
-rw-r--r--src/plugins/sensors/ios/main.mm5
-rw-r--r--src/sensors/doc/src/compatmap.qdoc2
5 files changed, 211 insertions, 4 deletions
diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro
index 0776d8cb..2cb0bc9d 100644
--- a/src/plugins/sensors/ios/ios.pro
+++ b/src/plugins/sensors/ios/ios.pro
@@ -10,12 +10,14 @@ OTHER_FILES = plugin.json
HEADERS += iosaccelerometer.h \
iosmotionmanager.h \
iosgyroscope.h \
- iosmagnetometer.h
+ iosmagnetometer.h \
+ ioscompass.h
OBJECTIVE_SOURCES += main.mm \
iosaccelerometer.mm \
iosmotionmanager.mm \
iosgyroscope.mm \
- iosmagnetometer.mm
+ iosmagnetometer.mm \
+ ioscompass.mm
-LIBS += -framework UIKit -framework CoreMotion
+LIBS += -framework UIKit -framework CoreMotion -framework CoreLocation
diff --git a/src/plugins/sensors/ios/ioscompass.h b/src/plugins/sensors/ios/ioscompass.h
new file mode 100644
index 00000000..c33cf1fd
--- /dev/null
+++ b/src/plugins/sensors/ios/ioscompass.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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 IOSCompass_H
+#define IOSCompass_H
+
+#import <CoreLocation/CLLocationManager.h>
+
+#include <qsensorbackend.h>
+#include <qcompass.h>
+
+QT_BEGIN_NAMESPACE
+
+class IOSCompass : public QSensorBackend
+{
+public:
+ static char const * const id;
+
+ explicit IOSCompass(QSensor *sensor);
+ ~IOSCompass();
+
+ void start();
+ void stop();
+
+ void headingChanged(qreal heading, quint64 timestamp, qreal calibrationLevel);
+
+private:
+ CLLocationManager *m_locationManager;
+ QCompassReading m_reading;
+};
+QT_END_NAMESPACE
+
+#endif // IOSCompass_H
+
diff --git a/src/plugins/sensors/ios/ioscompass.mm b/src/plugins/sensors/ios/ioscompass.mm
new file mode 100644
index 00000000..ded26e3d
--- /dev/null
+++ b/src/plugins/sensors/ios/ioscompass.mm
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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$
+**
+****************************************************************************/
+
+#import <CoreLocation/CLHeading.h>
+#import <CoreLocation/CLLocationManagerDelegate.h>
+#include <QtCore/qglobal.h>
+
+#include "ioscompass.h"
+
+char const * const IOSCompass::id("ios.compass");
+
+QT_BEGIN_NAMESPACE
+
+@interface locationDelegate : NSObject <CLLocationManagerDelegate>
+{
+ IOSCompass *m_iosCompass;
+}
+@end
+
+@implementation locationDelegate
+
+- (id)initWithQIOSCompass:(IOSCompass*)iosCompass
+{
+ self = [super init];
+ if (self) {
+ m_iosCompass = iosCompass;
+ }
+ return self;
+}
+
+- (void)locationManager:(CLLocationManager *)manager didUpdateHeading:(CLHeading *)newHeading
+{
+ Q_UNUSED(manager);
+ // Convert NSDate to microseconds:
+ quint64 timestamp = quint64(newHeading.timestamp.timeIntervalSinceReferenceDate * 1e6);
+ double accuracy = newHeading.headingAccuracy;
+ // Accuracy is the maximum number of degrees the reading can be off. The QtSensors scale
+ // goes from 1 to 0, with 1 being the best (0 degrees off), and 0 worst (365 degrees off):
+ qreal calibrationLevel = (accuracy < 0) ? 0 : qMax(0., 1 - (accuracy / 365));
+ qreal heading = qreal(newHeading.magneticHeading);
+ m_iosCompass->headingChanged(heading, timestamp, calibrationLevel);
+}
+
+- (BOOL)locationManagerShouldDisplayHeadingCalibration:(CLLocationManager *)manager
+{
+ Q_UNUSED(manager);
+ return YES;
+}
+
+@end
+
+IOSCompass::IOSCompass(QSensor *sensor)
+ : QSensorBackend(sensor)
+ , m_locationManager(0)
+{
+ setReading<QCompassReading>(&m_reading);
+ addDataRate(1, 70);
+ addOutputRange(0, 359, 1);
+}
+
+IOSCompass::~IOSCompass()
+{
+ [m_locationManager release];
+}
+
+void IOSCompass::start()
+{
+ if (!m_locationManager) {
+ m_locationManager = [[CLLocationManager alloc] init];
+ m_locationManager.desiredAccuracy = kCLLocationAccuracyBest;
+ m_locationManager.headingFilter = kCLHeadingFilterNone;
+ m_locationManager.delegate = [[locationDelegate alloc] initWithQIOSCompass:this];
+ }
+ [m_locationManager startUpdatingHeading];
+}
+
+void IOSCompass::headingChanged(qreal heading, quint64 timestamp, qreal calibrationLevel)
+{
+ m_reading.setAzimuth(heading);
+ m_reading.setTimestamp(timestamp);
+ m_reading.setCalibrationLevel(calibrationLevel);
+ newReadingAvailable();
+}
+
+void IOSCompass::stop()
+{
+ [m_locationManager stopUpdatingHeading];
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/sensors/ios/main.mm b/src/plugins/sensors/ios/main.mm
index 25b41b60..8797b8ee 100644
--- a/src/plugins/sensors/ios/main.mm
+++ b/src/plugins/sensors/ios/main.mm
@@ -47,6 +47,7 @@
#include "iosaccelerometer.h"
#include "iosgyroscope.h"
#include "iosmagnetometer.h"
+#include "ioscompass.h"
class IOSSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
{
@@ -61,6 +62,8 @@ public:
QSensorManager::registerBackend(QGyroscope::type, IOSGyroscope::id, this);
if ([QIOSMotionManager sharedManager].magnetometerAvailable)
QSensorManager::registerBackend(QMagnetometer::type, IOSMagnetometer::id, this);
+ if ([CLLocationManager headingAvailable])
+ QSensorManager::registerBackend(QCompass::type, IOSCompass::id, this);
}
QSensorBackend *createBackend(QSensor *sensor)
@@ -71,6 +74,8 @@ public:
return new IOSGyroscope(sensor);
if (sensor->identifier() == IOSMagnetometer::id)
return new IOSMagnetometer(sensor);
+ if (sensor->identifier() == IOSCompass::id)
+ return new IOSCompass(sensor);
return 0;
}
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 7fbe3bb5..4eeff238 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -101,7 +101,7 @@
<td bgcolor="green"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
- <td bgcolor="gray"></td>
+ <td bgcolor="green"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
</tr>