|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-binder.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://git.sailfishos.org/mer-core/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision"></param>
+ <param name="revision">0.12.4</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
^
|
| @@ -22,8 +22,6 @@
#include "datatypes/utils.h"
#include "config.h"
-#define GRAVITY_RECIPROCAL_THOUSANDS 101.971621298
-
HybrisAccelerometerAdaptor::HybrisAccelerometerAdaptor(const QString& id) :
HybrisAdaptor(id,SENSOR_TYPE_ACCELEROMETER)
{
@@ -77,9 +75,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-//void HybrisAccelerometerAdaptor::init()
-//{
-//// introduceAvailableDataRange(DataRange(-HybrisAdaptor::maxRange, HybrisAdaptor::maxRange , 1));
-//// introduceAvailableInterval(DataRange(10, 586, 0));
-//}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.h
^
|
| @@ -51,7 +51,6 @@
protected:
void processSample(const sensors_event_t& data);
- // void init();
private:
DeviceAdaptorRingBuffer<AccelerationData>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
^
|
| @@ -136,7 +136,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisAlsAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.h
^
|
| @@ -56,7 +56,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.cpp
^
|
| @@ -27,8 +27,6 @@
#include <QtCore/qmath.h>
#include <QtGlobal>
-#define RADIANS_TO_DEGREES 57.2957795
-
/*
* azimuth: angle between the magnetic north direction and the Y axis, around
* the Z axis (0<=azimuth<360).
@@ -112,7 +110,3 @@
m_buffer->commit();
m_buffer->wakeUpReaders();
}
-
-void HybrisGeoRotationAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.h
^
|
| @@ -49,7 +49,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<CompassData>* m_buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
^
|
| @@ -23,9 +23,6 @@
#include "config.h"
#include <math.h>
-#define RADIANS_TO_DEGREESECONDS 57295.7795
-#define RADIANS_TO_DEGREES 57.2957795
-
HybrisGyroscopeAdaptor::HybrisGyroscopeAdaptor(const QString& id) :
HybrisAdaptor(id,SENSOR_TYPE_GYROSCOPE)
{
@@ -83,9 +80,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-
-void HybrisGyroscopeAdaptor::init()
-{
-
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.h
^
|
| @@ -51,7 +51,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<TimedXyzData>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
^
|
| @@ -94,7 +94,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisMagnetometerAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.h
^
|
| @@ -51,7 +51,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
^
|
| @@ -94,7 +94,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisOrientationAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.h
^
|
| @@ -49,7 +49,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<CompassData>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
^
|
| @@ -75,7 +75,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisPressureAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptor.h
^
|
| @@ -55,7 +55,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
^
|
| @@ -153,7 +153,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisProximityAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.h
^
|
| @@ -55,7 +55,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<ProximityData>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.cpp
^
|
| @@ -110,7 +110,3 @@
m_buffer->commit();
m_buffer->wakeUpReaders();
}
-
-void HybrisRotationAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.h
^
|
| @@ -49,7 +49,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<CompassData>* m_buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
^
|
| @@ -91,7 +91,3 @@
buffer->commit();
buffer->wakeUpReaders();
}
-
-void HybrisStepCounterAdaptor::init()
-{
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.h
^
|
| @@ -58,7 +58,6 @@
protected:
void processSample(const sensors_event_t& data);
- void init();
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* buffer;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/core/hybrisadaptor.cpp
^
|
| @@ -619,6 +619,37 @@
}
}
+float HybrisManager::scaleSensorValue(const float value, const int type) const
+{
+ float outValue;
+ switch (type) {
+ case SENSOR_TYPE_ACCELEROMETER:
+ case SENSOR_TYPE_GRAVITY:
+ case SENSOR_TYPE_LINEAR_ACCELERATION:
+ //sensorfw wants milli-G'
+ outValue = value * GRAVITY_RECIPROCAL_THOUSANDS;
+ break;
+ case SENSOR_TYPE_MAGNETIC_FIELD:
+ case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
+ // uT to nT
+ outValue = value * 1000;
+ break;
+ case SENSOR_TYPE_GYROSCOPE:
+ case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
+ // From rad/s to mdeg/s
+ outValue = value * RADIANS_TO_DEGREES * 1000;
+ break;
+ case SENSOR_TYPE_PRESSURE:
+ // From hPa to Pa
+ outValue = value * 100;
+ break;
+ default:
+ outValue = value;
+ break;
+ }
+ return outValue;
+}
+
float HybrisManager::getMaxRange(int handle) const
{
float range = 0;
@@ -627,7 +658,7 @@
if (index != -1) {
const struct sensor_t *sensor = &m_sensorArray[index];
- range = sensor->maxRange;
+ range = scaleSensorValue(sensor->maxRange, sensor->type);
sensordLogT("HYBRIS CTL getMaxRange(%d=%s) -> %g",
sensor->handle, sensorTypeName(sensor->type), range);
}
@@ -643,7 +674,7 @@
if (index != -1) {
const struct sensor_t *sensor = &m_sensorArray[index];
- resolution = sensor->resolution;
+ resolution = scaleSensorValue(sensor->resolution, sensor->type);
sensordLogT("HYBRIS CTL getResolution(%d=%s) -> %g",
sensor->handle, sensorTypeName(sensor->type), resolution);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/core/hybrisadaptor.h
^
|
| @@ -126,6 +126,10 @@
#define SENSOR_TYPE_WRIST_TILT_GESTURE (26)
#endif
+#define GRAVITY_RECIPROCAL_THOUSANDS 101.971621298
+#define RADIANS_TO_DEGREESECONDS 57295.7795
+#define RADIANS_TO_DEGREES 57.2957795
+
#define SENSORFW_MCE_WATCHER
class HybrisAdaptor;
@@ -221,6 +225,7 @@
private:
static void *halEventReaderThread(void *aptr);
#endif
+ float scaleSensorValue(const float value, const int type) const;
void processEvents(const sensors_event_t *buffer,
int numberOfEvents, bool &blockSuspend, bool &errorInInput);
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/debian/changelog
^
|
| @@ -1,21 +1,35 @@
+sensorfw-qt5 (0.12.4) unstable; urgency=medium
+
+ * [sensorfw] Remove /usr/include/filters from pkgconfig file as it is not installed
+
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com> Thu, 26 Aug 2021 16:52:00 +0300
+
+sensorfw-qt5 (0.12.3) unstable; urgency=medium
+
+ * [sensorfw] Discard any old sensor data before starting sensor
+ * [hybrisadaptor] Fix initialization of ranges and intervals
+ * [hybrisadaptor] Fix scaling of data ranges
+
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com> Thu, 22 Jul 2021 01:18:00 +0300
+
sensorfw-qt5 (0.12.2) unstable; urgency=medium
-[sensorfw] Move sensord.sock to /run
-[sensorfw] Properly handle angle rollover in built-in compass support
-[sensorfw] Cleanup Qt project files
-[packaging] Refine systemd unit install and test cleanup
+ * [sensorfw] Move sensord.sock to /run
+ * [sensorfw] Properly handle angle rollover in built-in compass support
+ * [sensorfw] Cleanup Qt project files
+ * [packaging] Refine systemd unit install and test cleanup
-- Matti Lehtimäki <matti.lehtimaki@jolla.com> Thu, 21 Jan 2021 22:34:31 +0300
sensorfw-qt5 (0.12.1) unstable; urgency=medium
-[hybrisadaptor] Fix building rotation vector adaptors with old Android versions
+ * [hybrisadaptor] Fix building rotation vector adaptors with old Android versions
-- Matti Lehtimäki <matti.lehtimaki@jolla.com> Wed, 09 Sep 2020 16:14:31 +0300
sensorfw-qt5 (0.12.0) unstable; urgency=medium
-[hybrisadaptor] Use of hybris rotation vectors for compass
+ * [hybrisadaptor] Use of hybris rotation vectors for compass
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 02 Sep 2020 15:12:31 +0300
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/qt-api/abstractsensor_i.cpp
^
|
| @@ -131,6 +131,11 @@
}
pimpl_->running_ = true;
+ // Discard any old data already in the socket
+ if (pimpl_->socketReader_.socket()->bytesAvailable() > 0) {
+ pimpl_->socketReader_.socket()->readAll();
+ }
+
connect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
QList<QVariant> argumentList;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.12.4.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.12.2
+Version: 0.12.4
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
+Cflags: -I${includedir} -I${includedir}/datatypes
|
