[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/mer-core/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">ff2d99c7bc0b4df643ed8e142e288880837635a8</param>
+ <param name="revision">24e73a77eacd3aa0fd15ec7eb6d95d5742c84495</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.2.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
@@ -45,6 +45,7 @@
#include <QTimer>
#include <QDirIterator>
#include <qmath.h>
+#include <QRegularExpression>
#include <deviceadaptor.h>
#include "datatypes/orientationdata.h"
@@ -84,6 +85,7 @@
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "accel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O accelerometer (" + iioDevice.name +")";
@@ -99,6 +101,7 @@
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "anglvel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O gyroscope (" + iioDevice.name +")";
@@ -113,8 +116,8 @@
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "magn";
devNodeNumber = findSensor(inputMatch);
-
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O magnetometer (" + iioDevice.name +")";
magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
@@ -127,6 +130,7 @@
const QString name = "als";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
+ iioDevice.channelTypeName = "illuminance";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
QString desc = "Industrial I/O light sensor (" + iioDevice.name +")";
@@ -142,8 +146,11 @@
// setValid(false);
return;
}
- iioDevice.channels = scanElementsEnable(devNodeNumber,1);
- scanElementsEnable(devNodeNumber,0);
+
+ if (mode() != SysfsAdaptor::IntervalMode) {
+ scanElementsEnable(devNodeNumber,1);
+ scanElementsEnable(devNodeNumber,0);
+ }
/* Override the scaling factor if asked */
bool ok;
@@ -203,13 +210,13 @@
qDebug() << "attr" << name << value;
QString attributeName(name);
- if (attributeName.endsWith("scale")) {
+ if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*scale$"))) {
iioDevice.scale = QString(value).toDouble(&ok);
if (ok) {
// scale = num;
qDebug() << "scale is" << iioDevice.scale;
}
- } else if (attributeName.endsWith("offset")) {
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*offset$"))) {
iioDevice.offset = QString(value).toDouble(&ok);
if (ok)
qDebug() << "offset is" << value;
@@ -218,13 +225,14 @@
if (ok)
// frequency = num;
qDebug() << "frequency is" << iioDevice.frequency;
- } else if (attributeName.endsWith("raw")) {
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*raw$"))) {
qDebug() << "adding to paths:" << iioDevice.devicePath
<< attributeName << iioDevice.index;
addPath(iioDevice.devicePath + attributeName, j);
j++;
}
}
+ iioDevice.channels = j;
// in_rot_from_north_magnetic_tilt_comp_raw ?
@@ -271,7 +279,7 @@
if (enable == 1) {
// FIXME: should enable sensors for this device? Assuming enabled already
- iioDevice.channels = scanElementsEnable(device, enable);
+ scanElementsEnable(device, enable);
sysfsWriteInt(pathLength, IIO_BUFFER_LEN);
sysfsWriteInt(pathEnable, enable);
} else {
@@ -347,7 +355,7 @@
// Find all the *_en file and write 0/1 to it
QStringList filters;
- filters << "*_en";
+ filters << ("*" + iioDevice.channelTypeName + "*_en");
dir.setNameFilters(filters);
QFileInfoList list = dir.entryInfoList();
@@ -516,7 +524,8 @@
return false;
qDebug() << Q_FUNC_INFO;
- deviceEnable(devNodeNumber, true);
+ if (mode() != SysfsAdaptor::IntervalMode)
+ deviceEnable(devNodeNumber, true);
return SysfsAdaptor::startSensor();
}
@@ -525,6 +534,7 @@
if (devNodeNumber == -1)
return;
qDebug() << Q_FUNC_INFO;
- deviceEnable(devNodeNumber, false);
+ if (mode() != SysfsAdaptor::IntervalMode)
+ deviceEnable(devNodeNumber, false);
SysfsAdaptor::stopSensor();
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.2.tar.bz2/adaptors/iioadaptor/iioadaptor.h
^
|
@@ -68,6 +68,7 @@
QString devicePath;
int index;
IioSensorType sensorType;
+ QString channelTypeName;
};
public:
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.2.tar.bz2/adaptors/iioadaptor/iioadaptor.pro
^
|
@@ -1,5 +1,4 @@
-TARGET = iioaccelerometeradaptor
-#TARGET = iiosensorsadaptor
+TARGET = iiosensorsadaptor
HEADERS += iioadaptor.h \
iioadaptorplugin.h
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.2.tar.bz2/debian/control
^
|
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: Lorn Potter <lorn.potter@gmail.com>
Uploaders:
-Build-Depends: debhelper (>=5), qt5-default, libudev-dev, libsystemd-dev, doxygen, graphviz
+Build-Depends: debhelper (>=5),
+ qt5-default,
+ libudev-dev,
+ libsystemd-dev,
+ doxygen,
+ graphviz,
+ pkg-config,
+ libhardware-dev,
+ android-headers,
+ libhybris-dev
Standards-Version: 3.7.3
Package: sensorfw-qt5
@@ -55,7 +64,7 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
@@ -63,6 +72,6 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.2.tar.bz2/sensorfw.pro
^
|
@@ -81,13 +81,13 @@
equals(QT_MAJOR_VERSION, 4):{
PKGCONFIGFILES.files = sensord.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" $$_PRO_FILE_PWD_/sensord.pc'
QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
}
equals(QT_MAJOR_VERSION, 5):{
PKGCONFIGFILES.files = sensord-qt5.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" $$_PRO_FILE_PWD_/sensord-qt5.pc'
QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
}
|