summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-15 09:10:23 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-04-15 09:10:23 +0200
commitcbd16183528d6e6127891801048dc16014d26ae5 (patch)
tree9f0878ccbdb7e197029a9631b5fd8fb06e96a7b2
parentc333d25a2a89aeefa936810945fe965cf1086797 (diff)
parent26c99a8f7832a5549d315ad434e038ae3964e224 (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
index 32681b11..c0ff0b08 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
@@ -50,9 +50,9 @@ void sensorfwaccelerometer::slotDataAvailable(const XYZ& data)
{
// Convert from milli-Gs to meters per second per second
// Using 1 G = 9.80665 m/s^2
- m_reading.setX(-data.x() * GRAVITY_EARTH_THOUSANDTH);
- m_reading.setY(-data.y() * GRAVITY_EARTH_THOUSANDTH);
- m_reading.setZ(-data.z() * GRAVITY_EARTH_THOUSANDTH);
+ m_reading.setX(data.x() * GRAVITY_EARTH_THOUSANDTH);
+ m_reading.setY(data.y() * GRAVITY_EARTH_THOUSANDTH);
+ m_reading.setZ(data.z() * GRAVITY_EARTH_THOUSANDTH);
m_reading.setTimestamp(data.XYZData().timestamp_);
newReadingAvailable();
}
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
index 82302acd..8052b766 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
@@ -294,7 +294,8 @@ bool SensorfwSensorBase::initSensorInterface(QString const &name)
void SensorfwSensorBase::standyOverrideChanged()
{
- m_sensorInterface->setStandbyOverride(sensor()->isAlwaysOn());
+ if (m_sensorInterface)
+ m_sensorInterface->setStandbyOverride(sensor()->isAlwaysOn());
}
bool SensorfwSensorBase::isFeatureSupported(QSensor::Feature feature) const