Blackberry: Implement axes remapping for all axes-based sensors

The remapping code was moved to BbSensorBackend.

Change-Id: I6ede875594a2aaa3745b7deb4aa0ed64c2d9b855
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h
index 3a5a99dc..030f28ba 100644
--- a/src/plugins/sensors/blackberry/bbsensorbackend.h
+++ b/src/plugins/sensors/blackberry/bbsensorbackend.h
@@ -66,7 +66,7 @@ public:
     BbSensorBackendBase(const QString &devicePath, sensor_type_e sensorType, QSensor *sensor);
 
     void initSensorInfo();
-    virtual void setGuiHelper(BbGuiHelper *guiHelper);
+    void setGuiHelper(BbGuiHelper *guiHelper);
 
     void start() Q_DECL_OVERRIDE;
     void stop() Q_DECL_OVERRIDE;
@@ -92,6 +92,13 @@ protected:
     // QtSensors expects tesla. This function would therefore convert from microtesla to tesla.
     virtual qreal convertValue(float bbValue);
 
+    bool isAutoAxisRemappingEnabled() const;
+
+    // These functions will automatically remap the matrix or the axes if auto axes remapping is
+    // enabled
+    void remapMatrix(const float inputMatrix[3*3], float outputMatrix[3*3]);
+    void remapAxes(float *x, float *y, float *z);
+
     virtual void processEvent(const sensor_event_t &sensorEvent) = 0;
 
 private slots:
@@ -99,12 +106,14 @@ private slots:
     void applyAlwaysOnProperty();
     void setPaused(bool paused);
     void updatePauseState();
+    void updateOrientation();
 
 private:
     QFile m_deviceFile;
     QScopedPointer<QSocketNotifier> m_socketNotifier;
     sensor_type_e m_sensorType;
     BbGuiHelper *m_guiHelper;
+    float m_mappingMatrix[4];
 };
 
 template<class SensorReading>