|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-binder.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">e356bceee13b55ac3b15336282d193e4578dd11a</param>
+ <param name="revision">8e75c2316b4ab8913fb4ad6775f3007a4107235a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
^
|
| @@ -33,7 +33,7 @@
* 165.8 is the result of a reference measurement.
* We are going to correct it such that we get the correct acceleration in m/s^2
*/
-#define CORRECTION_FACTOR (165.8 / EARTH_GRAVITY)
+#define CORRECTION_FACTOR float(165.8 / EARTH_GRAVITY)
Mpu6050AccelAdaptor::Mpu6050AccelAdaptor (const QString& id) :
SysfsAdaptor (id, SysfsAdaptor::IntervalMode)
@@ -114,13 +114,13 @@
case X_AXIS:
currentData = buffer->nextSlot();
currentData->timestamp_ = Utils::getTimeStamp();
- currentData->x_ = qRound(val / CORRECTION_FACTOR);
+ currentData->x_ = val / CORRECTION_FACTOR;
break;
case Y_AXIS:
- currentData->y_ = qRound(val / CORRECTION_FACTOR);
+ currentData->y_ = val / CORRECTION_FACTOR;
break;
case Z_AXIS:
- currentData->z_ = qRound(val / CORRECTION_FACTOR);
+ currentData->z_ = val / CORRECTION_FACTOR;
buffer->commit();
buffer->wakeUpReaders();
break;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/adaptors/tapadaptor/tapadaptor.cpp
^
|
| @@ -96,5 +96,7 @@
bool TapAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
+ Q_UNUSED(sessionId);
+ Q_UNUSED(interval_us);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/core/abstractsensor.cpp
^
|
| @@ -137,9 +137,9 @@
if(samples.size() < bufferSize)
continue;
- long x = 0;
- long y = 0;
- long z = 0;
+ float x = 0;
+ float y = 0;
+ float z = 0;
foreach(const TimedXyzData& data, samples)
{
x += data.x_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/datatypes/genericdata.h
^
|
| @@ -65,11 +65,11 @@
* @param y Y coordinate.
* @param z Z coordinate.
*/
- TimedXyzData(const quint64& timestamp, int x, int y, int z) : TimedData(timestamp), x_(x), y_(y), z_(z) {}
+ TimedXyzData(const quint64& timestamp, float x, float y, float z) : TimedData(timestamp), x_(x), y_(y), z_(z) {}
- int x_; /**< X value */
- int y_; /**< Y value */
- int z_; /**< Z value */
+ float x_; /**< X value */
+ float y_; /**< Y value */
+ float z_; /**< Z value */
};
Q_DECLARE_METATYPE ( TimedXyzData )
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/datatypes/orientation.h
^
|
| @@ -90,21 +90,21 @@
*
* @return X coordinate.
*/
- int x() const { return data_.x_; }
+ float x() const { return data_.x_; }
/**
* Accessor for Y coordinate.
*
* @return Y coordinate.
*/
- int y() const { return data_.y_; }
+ float y() const { return data_.y_; }
/**
* Accessor for Z coordinate.
*
* @return Z coordinate.
*/
- int z() const { return data_.z_; }
+ float z() const { return data_.z_; }
/**
* Accessor for display orientation.
@@ -132,6 +132,7 @@
*/
inline QDBusArgument &operator<<(QDBusArgument &argument, const Orientation &orientation)
{
+ // No floats on D-Bus: Implicit float to double conversion
argument.beginStructure();
argument << orientation.orientationData().timestamp_ << orientation.orientationData().x_ << orientation.orientationData().y_ << orientation.orientationData().z_;
argument.endStructure();
@@ -147,8 +148,13 @@
*/
inline const QDBusArgument &operator>>(const QDBusArgument &argument, Orientation &orientation)
{
+ // No floats on D-Bus: Explicit double to float conversion
argument.beginStructure();
- argument >> orientation.data_.timestamp_ >> orientation.data_.x_ >> orientation.data_.y_ >> orientation.data_.z_;
+ double x, y, z;
+ argument >> orientation.data_.timestamp_ >> x >> y >> z;
+ orientation.data_.x_ = float(x);
+ orientation.data_.y_ = float(y);
+ orientation.data_.z_ = float(z);
argument.endStructure();
return argument;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/datatypes/xyz.h
^
|
| @@ -27,6 +27,8 @@
#ifndef XYZ_H
#define XYZ_H
+#include <math.h>
+
#include <QDBusArgument>
#include <datatypes/orientationdata.h>
@@ -72,19 +74,19 @@
* Returns the value for X.
* @return x value.
*/
- int x() const { return data_.x_; }
+ float x() const { return data_.x_; }
/**
* Returns the value for Y.
* @return y value.
*/
- int y() const { return data_.y_; }
+ float y() const { return data_.y_; }
/**
* Returns the value for Z.
* @return z value.
*/
- int z() const { return data_.z_; }
+ float z() const { return data_.z_; }
/**
* Assignment operator.
@@ -97,21 +99,6 @@
return *this;
}
- /**
- * Comparison operator.
- *
- * @param right Object to compare to.
- * @return comparison result.
- */
- bool operator==(const XYZ& right) const
- {
- TimedXyzData rdata = right.XYZData();
- return (data_.x_ == rdata.x_ &&
- data_.y_ == rdata.y_ &&
- data_.z_ == rdata.z_ &&
- data_.timestamp_ == rdata.timestamp_);
- }
-
private:
TimedXyzData data_; /**< Contained data. */
@@ -129,6 +116,7 @@
*/
inline QDBusArgument &operator<<(QDBusArgument &argument, const XYZ &xyz)
{
+ // No floats on D-Bus: Implicit float to double conversion
argument.beginStructure();
argument << xyz.XYZData().timestamp_ << xyz.XYZData().x_ << xyz.XYZData().y_ << xyz.XYZData().z_;
argument.endStructure();
@@ -144,8 +132,13 @@
*/
inline const QDBusArgument &operator>>(const QDBusArgument &argument, XYZ &xyz)
{
+ // No floats on D-Bus: Explicit double to float conversion
argument.beginStructure();
- argument >> xyz.data_.timestamp_ >> xyz.data_.x_ >> xyz.data_.y_ >> xyz.data_.z_;
+ double x, y, z;
+ argument >> xyz.data_.timestamp_ >> x >> y >> z;
+ xyz.data_.x_ = float(x);
+ xyz.data_.y_ = float(y);
+ xyz.data_.z_ = float(z);
argument.endStructure();
return argument;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,11 @@
+sensorfw-qt5 (0.14.0) unstable; urgency=medium
+
+ * [tapadaptor] Silence unused parameter warnings
+ * [clientapitest] Move unit test operator== away from API header
+ * [sensorfwd] Use float values for XYZ data. Fixes JB#60407
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com> Thu, 30 Mar 2023 18:35:56 +0300
+
sensorfw-qt5 (0.13.0) unstable; urgency=medium
* [hybrisadaptor] Fix setDelay() return value
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/filters/downsamplefilter/downsamplefilter.cpp
^
|
| @@ -77,9 +77,9 @@
if(static_cast<unsigned int>(buffer_.size()) < bufferSize_)
return;
- long x = 0;
- long y = 0;
- long z = 0;
+ float x = 0;
+ float y = 0;
+ float z = 0;
foreach(const TimedXyzData& data, buffer_)
{
x += data.x_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/filters/orientationinterpreter/orientationinterpreter.cpp
^
|
| @@ -34,7 +34,7 @@
#include <stdlib.h>
#include <limits.h>
-const float OrientationInterpreter::RADIANS_TO_DEGREES = 180.0/M_PI;
+const double OrientationInterpreter::RADIANS_TO_DEGREES = 180.0/M_PI;
const int OrientationInterpreter::SAME_AXIS_LIMIT = 5;
const int OrientationInterpreter::OVERFLOW_MIN = 0;
const int OrientationInterpreter::OVERFLOW_MAX = INT_MAX;
@@ -94,9 +94,9 @@
}
//Calculate average
- long x = 0;
- long y = 0;
- long z = 0;
+ float x = 0;
+ float y = 0;
+ float z = 0;
foreach (const AccelerationData& sample, dataBuffer)
{
x += sample.x_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/filters/orientationinterpreter/orientationinterpreter.h
^
|
| @@ -93,7 +93,7 @@
int orientationCheck(const AccelerationData&, OrientationMode) const;
PoseData orientationRotation(const AccelerationData&, OrientationMode, PoseData (OrientationInterpreter::*)(int));
- static const float RADIANS_TO_DEGREES;
+ static const double RADIANS_TO_DEGREES;
static const int SAME_AXIS_LIMIT;
static const int OVERFLOW_MIN;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/filters/rotationfilter/rotationfilter.cpp
^
|
| @@ -39,7 +39,7 @@
void RotationFilter::interpret(unsigned, const TimedXyzData* data)
{
- const int RADIANS_TO_DEGREES = 180/M_PI;
+ const double RADIANS_TO_DEGREES = 180/M_PI;
rotation_.timestamp_ = data->timestamp_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.13.0
+Version: 0.14.0
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
Cflags: -I${includedir} -I${includedir}/datatypes
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.0.tar.bz2/tests/client/clientapitest.cpp
^
|
| @@ -38,6 +38,16 @@
#include "clientapitest.h"
#include <QSettings>
+namespace {
+bool areTheSameSample(const XYZ &sample1, const XYZ &sample2)
+{
+ return sample1.XYZData().timestamp_ == sample2.XYZData().timestamp_
+ && sample1.XYZData().x_ == sample2.XYZData().x_
+ && sample1.XYZData().y_ == sample2.XYZData().y_
+ && sample1.XYZData().z_ == sample2.XYZData().z_;
+}
+}
+
ClientApiTest::ClientApiTest()
{
bufferingSensors.append("magnetometersensor");
@@ -195,7 +205,7 @@
XYZ sample1 = sensorIfc->get();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("value"));
- QVERIFY(sample1 == sample2);
+ QVERIFY(areTheSameSample(sample1, sample2));
}
@@ -227,7 +237,7 @@
XYZ sample1 = sensorIfc->get();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("value"));
- QVERIFY(sample1 == sample2);
+ QVERIFY(areTheSameSample(sample1, sample2));
delete sensorIfc;
}
@@ -259,7 +269,7 @@
MagneticField sample2 = qvariant_cast<MagneticField>(sensorIfc->property("magneticField"));
// Background process keeps magnetometer on -- values are changing, and subsequent
// calls are likely to give different values. This makes thus no sense.
- // QVERIFY(sample1 == sample2);
+ // QVERIFY(areTheSameSample(sample1, sample2));
// test start
QDBusReply<void> reply = sensorIfc->start();
@@ -452,7 +462,7 @@
// Need simulated data to make sensible test ouf of this.
XYZ sample1 = sensorIfc->rotation();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("rotation"));
- QVERIFY(sample1 == sample2);
+ QVERIFY(areTheSameSample(sample1, sample2));
// test start
QDBusReply<void> reply = sensorIfc->start();
|
