From 9cf0b4ed7a8979d124ef0c222084816cca8c1f0a Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 2 Apr 2015 18:33:15 +1000 Subject: Fix crash in QtSensors client, when sensorfwd is not running. Change-Id: Iecb6fe8637001d3005aa04c58d1d888f534c5082 Reviewed-by: Alex Blasche --- src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/sensors') diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp index ba37628e..0ca815a5 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 -- cgit v1.2.3 From 26c99a8f7832a5549d315ad434e038ae3964e224 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 10 Apr 2015 15:14:15 +1000 Subject: Fix double negative values, sensorfw already transforms the accel values. No need to use a double negative in the chain of data to arrive at the correct values. Change-Id: I694037bb7f83083d3d281ec9544d7fa300861f1a Reviewed-by: Alex Blasche --- src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/sensors') diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp index 907a3dc9..6c962d33 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(); } -- cgit v1.2.3