|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">0.12.6</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
^
|
| @@ -107,12 +107,35 @@
d->y_ = orientationValue_.y_;
d->z_ = orientationValue_.z_;
-// sensordLogT() << id() << "Accelerometer reading: " << d->x_ << ", " << d->y_ << ", " << d->z_;
+// sensordLogT() << "Accelerometer reading: " << d->x_ << ", " << d->y_ << ", " << d->z_;
accelerometerBuffer_->commit();
accelerometerBuffer_->wakeUpReaders();
}
+unsigned int AccelerometerAdaptor::evaluateIntervalRequests(int& sessionId) const
+{
+ if (m_intervalMap.size() == 0) {
+ sessionId = -1;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it = m_intervalMap.constBegin();
+ unsigned int highestValue = it.value();
+ int winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if (((it.value() < highestValue) && (it.value() > 0)) || highestValue == 0) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool AccelerometerAdaptor::resume()
{
startSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.h
^
|
| @@ -70,6 +70,11 @@
AccelerometerAdaptor(const QString& id);
~AccelerometerAdaptor();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<AccelerationData>* accelerometerBuffer_;
AccelerationData orientationValue_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/adaptors.pro
^
|
| @@ -1,21 +1,18 @@
TEMPLATE = subdirs
include( ../common-config.pri )
-
-HYBRIS_SUBDIRS = hybrisaccelerometer \
- hybrisalsadaptor \
- hybrisgyroscopeadaptor \
- hybrismagnetometeradaptor \
- hybrispressureadaptor \
- hybrisproximityadaptor \
- hybrisorientationadaptor \
- hybrisrotationadaptor \
- hybrisgeorotationadaptor \
- hybrisstepcounteradaptor
-
# split like this as Sailfish only installs hybris plugins
contains(CONFIG,hybris) {
- SUBDIRS += $$HYBRIS_SUBDIRS
+ SUBDIRS = hybrisaccelerometer
+ SUBDIRS += hybrisalsadaptor
+ SUBDIRS += hybrisgyroscopeadaptor
+ SUBDIRS += hybrismagnetometeradaptor
+ SUBDIRS += hybrispressureadaptor
+ SUBDIRS += hybrisproximityadaptor
+ SUBDIRS += hybrisorientationadaptor
+ SUBDIRS += hybrisrotationadaptor
+ SUBDIRS += hybrisgeorotationadaptor
+ SUBDIRS += hybrisstepcounteradaptor
} else {
@@ -42,10 +39,6 @@
SUBDIRS += pressureadaptor
SUBDIRS += temperatureadaptor
-config_hybris {
- SUBDIRS += $$HYBRIS_SUBDIRS
-}
-
contains(CONFIG,legacy) {
SUBDIRS += mrstaccelerometer
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
^
|
| @@ -57,13 +57,13 @@
QFile sysFile(rangeFilePath_);
if (!(sysFile.open(QIODevice::ReadOnly))) {
- sensordLogW() << NodeBase::id() << "Unable to config ALS range from sysfs";
+ sensordLogW() << "Unable to config ALS range from sysfs";
} else {
sysFile.readLine(buf, sizeof(buf));
int range = QString(buf).toInt();
introduceAvailableDataRange(DataRange(0, range, 1));
- sensordLogT() << NodeBase::id() << "Ambient light range: " << range;
+ sensordLogT() << "Ambient light range: " << range;
}
}
powerStatePath = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
@@ -79,12 +79,12 @@
Q_UNUSED(pathId);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read():" << strerror(errno);
+ sensordLogW() << "read():" << strerror(errno);
return;
}
buf[sizeof(buf)-1] = '\0';
- sensordLogT() << id() << "Ambient light value: " << buf;
+ sensordLogT() << "Ambient light value: " << buf;
__u16 idata = atoi(buf);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
^
|
| @@ -45,8 +45,7 @@
setDescription("Input device als adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
ALSAdaptorEvdev::~ALSAdaptorEvdev()
@@ -86,6 +85,33 @@
alsBuffer_->wakeUpReaders();
}
+unsigned int ALSAdaptorEvdev::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool ALSAdaptorEvdev::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/alsadaptor-evdev/alsevdevadaptor.h
^
|
| @@ -59,6 +59,11 @@
ALSAdaptorEvdev(const QString& id);
~ALSAdaptorEvdev();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* alsBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.cpp
^
|
| @@ -62,11 +62,11 @@
idata = atoi(asciidata);
if (bytesRead <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << id() << "Ambient light value: " << idata;
+ sensordLogT() << "Ambient light value: " << idata;
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = idata;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/alsadaptor/alsadaptor.cpp
^
|
| @@ -84,7 +84,7 @@
{
if(!alsEnabled)
{
- sensordLogT() << id() << "Requesting MCE to enable ALS";
+ sensordLogT() << "Requesting MCE to enable ALS";
dbusIfc->call(QDBus::NoBlock, "req_als_enable");
alsEnabled = true;
}
@@ -94,7 +94,7 @@
{
if(alsEnabled)
{
- sensordLogT() << id() << "Requesting MCE to disable ALS";
+ sensordLogT() << "Requesting MCE to disable ALS";
dbusIfc->call(QDBus::NoBlock, "req_als_disable");
alsEnabled = false;
}
@@ -165,10 +165,10 @@
int bytesRead = read(fd, &als_data, sizeof(als_data));
if (bytesRead <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << id() << "Ambient light value: " << als_data.lux;
+ sensordLogT() << "Ambient light value: " << als_data.lux;
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = als_data.lux;
@@ -182,10 +182,10 @@
int bytesRead = read(fd, &als_data, sizeof(als_data));
if (bytesRead <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << id() << "Ambient light value: " << als_data.lux;
+ sensordLogT() << "Ambient light value: " << als_data.lux;
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = als_data.lux;
@@ -197,24 +197,24 @@
memset(buffer, 0, sizeof(buffer));
int bytesRead = read(fd, &buffer, sizeof(buffer));
if (bytesRead <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
QVariant value(buffer);
bool ok;
double fValue(value.toDouble(&ok));
if(!ok) {
- sensordLogT() << id() << "read(): failed to parse float from: " << buffer;
+ sensordLogT() << "read(): failed to parse float from: " << buffer;
return;
}
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = fValue * 10;
lux->timestamp_ = Utils::getTimeStamp();
- sensordLogT() << id() << "Ambient light value: " << lux->value_;
+ sensordLogT() << "Ambient light value: " << lux->value_;
}
else
{
- sensordLogW() << id() << "Not known device type: " << deviceType_;
+ sensordLogW() << "Not known device type: " << deviceType_;
return;
}
alsBuffer_->commit();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
^
|
| @@ -45,8 +45,7 @@
setDescription("Input device gyroscope adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
// introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
GyroAdaptorEvdev::~GyroAdaptorEvdev()
@@ -95,6 +94,33 @@
gyroscopeBuffer_->wakeUpReaders();
}
+unsigned int GyroAdaptorEvdev::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool GyroAdaptorEvdev::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.h
^
|
| @@ -59,6 +59,11 @@
GyroAdaptorEvdev(const QString& id);
~GyroAdaptorEvdev();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<TimedXyzData>* gyroscopeBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
^
|
| @@ -56,10 +56,10 @@
char buf[32];
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read():" << strerror(errno);
+ sensordLogW() << "read():" << strerror(errno);
return;
}
- sensordLogT() << id() << "gyroscope output value: " << buf;
+ sensordLogT() << "gyroscope output value: " << buf;
sscanf(buf, "%hd %hd %hd\n", &x, &y, &z);
@@ -70,18 +70,14 @@
gyroscopeBuffer_->wakeUpReaders();
}
-bool GyroscopeAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
+bool GyroscopeAdaptor::setInterval(const unsigned int value, const int sessionId)
{
if (mode() == SysfsAdaptor::IntervalMode)
- return SysfsAdaptor::setInterval(sessionId, interval_us);
+ return SysfsAdaptor::setInterval(value, sessionId);
- int rate_Hz = 0;
- if (interval_us > 0)
- rate_Hz = 1000000 / interval_us;
- if (rate_Hz <= 0)
- rate_Hz = 100;
- sensordLogD() << id() << "Setting poll interval for " << dataRatePath_ << " to " << rate_Hz;
- QByteArray dataRateString(QString("%1\n").arg(rate_Hz).toLocal8Bit());
+ int rate = value==0?100:1000/value;
+ sensordLogD() << "Setting poll interval for " << dataRatePath_ << " to " << rate;
+ QByteArray dataRateString(QString("%1\n").arg(rate).toLocal8Bit());
return writeToFile(dataRatePath_, dataRateString);
}
@@ -90,7 +86,5 @@
if (mode() == SysfsAdaptor::IntervalMode)
return SysfsAdaptor::interval();
QByteArray byteArray = readFromFile(dataRatePath_);
- int rate_Hz = byteArray.size() > 0 ? byteArray.toInt() : 0;
- int interval_us = rate_Hz > 0 ? 1000000 / rate_Hz : 0;
- return interval_us;
+ return byteArray.size() > 0 ? byteArray.toInt() : 0;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptor.h
^
|
| @@ -69,7 +69,7 @@
*/
~GyroscopeAdaptor();
- bool setInterval(const int sessionId, const unsigned int interval_us);
+ bool setInterval(const unsigned int value, const int sessionId);
unsigned int interval() const;
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/humidityadaptor/humidityadaptor.cpp
^
|
| @@ -42,8 +42,7 @@
setDescription("Input device humidity adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("humidity/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
HumidityAdaptor::~HumidityAdaptor()
@@ -83,6 +82,33 @@
humidityBuffer_->wakeUpReaders();
}
+unsigned int HumidityAdaptor::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool HumidityAdaptor::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/humidityadaptor/humidityadaptor.h
^
|
| @@ -59,6 +59,11 @@
HumidityAdaptor(const QString& id);
~HumidityAdaptor();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* humidityBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
^
|
| @@ -30,8 +30,7 @@
setDescription("Hybris accelerometer");
powerStatePath = SensorFrameworkConfig::configuration()->value("accelerometer/powerstate_path").toByteArray();
-// unsigned int interval_us = 50 * 1000;
-// setDefaultInterval(interval_us);
+// setDefaultInterval(50);
}
HybrisAccelerometerAdaptor::~HybrisAccelerometerAdaptor()
@@ -45,7 +44,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "Hybris AccelAdaptor start";
+ sensordLogD() << "Hybris AccelAdaptor start\n";
return true;
}
@@ -54,7 +53,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "Hybris AccelAdaptor stop";
+ sensordLogD() << "Hybris AccelAdaptor stop\n";
}
void HybrisAccelerometerAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
^
|
| @@ -38,7 +38,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -54,7 +54,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "Hybris HybrisAlsAdaptor start";
+ sensordLogD() << "Hybris HybrisAlsAdaptor start\n";
return true;
}
@@ -80,7 +80,7 @@
}
if (inputDev.isEmpty()) {
- sensordLogD() << id() << "No sysfs als device found";
+ sensordLogW() << "No sysfs als device found";
return;
}
@@ -101,11 +101,11 @@
buffer->commit();
buffer->wakeUpReaders();
} else {
- qDebug() << id() << "ioctl not opened" ;
+ qDebug() << "ioctl not opened" ;
}
close(fd);
} else {
- qDebug() << id() << "could not open als evdev";
+ qDebug() << "could not open als evdev";
TimedUnsigned *d = buffer->nextSlot();
d->timestamp_ = Utils::getTimeStamp();
d->value_ = lastLightValue;
@@ -120,7 +120,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "Hybris HybrisAlsAdaptor stop";
+ sensordLogD() << "Hybris HybrisAlsAdaptor stop\n";
}
void HybrisAlsAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.cpp
^
|
| @@ -43,7 +43,7 @@
setDescription("Hybris georotation");
m_powerStatePath = SensorFrameworkConfig::configuration()->value("georotation/powerstate_path").toByteArray();
if (!m_powerStatePath.isEmpty() && !QFile::exists(m_powerStatePath)) {
- sensordLogW() << NodeBase::id() << "Path does not exists: " << m_powerStatePath;
+ sensordLogW() << "Path does not exists: " << m_powerStatePath;
m_powerStatePath.clear();
}
}
@@ -59,7 +59,7 @@
return false;
if (isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "1");
- sensordLogD() << id() << "Hybris GeoRotationAdaptor start";
+ sensordLogD() << "Hybris GeoRotationAdaptor start";
return true;
}
@@ -68,7 +68,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "0");
- sensordLogD() << id() << "Hybris GeoRotationAdaptor stop";
+ sensordLogD() << "Hybris GeoRotationAdaptor stop";
}
void HybrisGeoRotationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
^
|
| @@ -33,11 +33,10 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
- unsigned int interval_us = 50 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(50);
}
HybrisGyroscopeAdaptor::~HybrisGyroscopeAdaptor()
@@ -51,7 +50,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "HybrisGyroscopeAdaptor start";
+ sensordLogD() << "HybrisGyroscopeAdaptor start\n";
return true;
}
@@ -60,7 +59,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() &&!powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "HybrisGyroscopeAdaptor stop";
+ sensordLogD() << "HybrisGyroscopeAdaptor stop\n";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
^
|
| @@ -32,12 +32,11 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
//setStandbyOverride(false);
- unsigned int interval_us = 50 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(50);
}
HybrisMagnetometerAdaptor::~HybrisMagnetometerAdaptor()
@@ -51,7 +50,7 @@
return false;
if (isRunning() &&!powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "HybrisMagnetometerAdaptor start";
+ sensordLogD() << "HybrisMagnetometerAdaptor start\n";
return true;
}
@@ -60,7 +59,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "HybrisMagnetometerAdaptor stop";
+ sensordLogD() << "HybrisMagnetometerAdaptor stop\n";
}
void HybrisMagnetometerAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
^
|
| @@ -49,11 +49,10 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("orientation/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
-// unsigned int interval_us = 50 * 1000;
-// setDefaultInterval(interval_us);
+// setDefaultInterval(50);
}
HybrisOrientationAdaptor::~HybrisOrientationAdaptor()
@@ -67,7 +66,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "Hybris OrientationAdaptor start";
+ sensordLogD() << "Hybris OrientationAdaptor start\n";
return true;
}
@@ -76,7 +75,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "Hybris OrientationAdaptor stop";
+ sensordLogD() << "Hybris OrientationAdaptor stop\n";
}
void HybrisOrientationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
^
|
| @@ -35,7 +35,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("pressure/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -51,7 +51,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "Hybris HybrisPressureAdaptor start";
+ sensordLogD() << "Hybris HybrisPressureAdaptor start\n";
return true;
}
@@ -60,7 +60,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "Hybris HybrisPressureAdaptor stop";
+ sensordLogD() << "Hybris HybrisPressureAdaptor stop\n";
}
void HybrisPressureAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
^
|
| @@ -40,7 +40,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("proximity/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -59,7 +59,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "HybrisProximityAdaptor start";
+ sensordLogD() << "HybrisProximityAdaptor start\n";
return true;
}
@@ -85,7 +85,7 @@
}
if (inputDev.isEmpty()) {
- sensordLogD() << id() << "No sysfs proximity device found";
+ sensordLogW() << "No sysfs proximity device found";
return;
}
@@ -106,11 +106,11 @@
buffer->commit();
buffer->wakeUpReaders();
} else {
- qDebug() << id() << "ioctl not opened" ;
+ qDebug() << "ioctl not opened" ;
}
close(fd);
} else {
- qDebug() << id() << "could not open proximity evdev";
+ qDebug() << "could not open proximity evdev";
ProximityData *d = buffer->nextSlot();
d->timestamp_ = Utils::getTimeStamp();
@@ -128,7 +128,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "HybrisProximityAdaptor stop";
+ sensordLogD() << "HybrisProximityAdaptor stop\n";
}
void HybrisProximityAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.cpp
^
|
| @@ -45,7 +45,7 @@
setDescription("Hybris rotation");
m_powerStatePath = SensorFrameworkConfig::configuration()->value("rotation/powerstate_path").toByteArray();
if (!m_powerStatePath.isEmpty() && !QFile::exists(m_powerStatePath)) {
- sensordLogW() << NodeBase::id() << "Path does not exists: " << m_powerStatePath;
+ sensordLogW() << "Path does not exists: " << m_powerStatePath;
m_powerStatePath.clear();
}
}
@@ -61,7 +61,7 @@
return false;
if (isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "1");
- sensordLogD() << id() << "Hybris RotationAdaptor start";
+ sensordLogD() << "Hybris RotationAdaptor start";
return true;
}
@@ -70,7 +70,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "0");
- sensordLogD() << id() << "Hybris RotationAdaptor stop";
+ sensordLogD() << "Hybris RotationAdaptor stop";
}
void HybrisRotationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
^
|
| @@ -37,7 +37,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("stepcounter/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -53,13 +53,13 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << id() << "Hybris HybrisStepCounterAdaptor start";
+ sensordLogD() << "Hybris HybrisStepCounterAdaptor start\n";
return true;
}
void HybrisStepCounterAdaptor::sendInitialData()
{
- sensordLogW() << id() << "No initial data for step counter";
+ sensordLogW() << "No initial data for step counter";
}
void HybrisStepCounterAdaptor::stopSensor()
@@ -67,7 +67,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << id() << "Hybris HybrisStepCounterAdaptor stop";
+ sensordLogD() << "Hybris HybrisStepCounterAdaptor stop\n";
}
void HybrisStepCounterAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
| @@ -67,7 +67,7 @@
SysfsAdaptor(id, SysfsAdaptor::IntervalMode, true),
deviceId(id)
{
- sensordLogD() << "Creating IioAdaptor with id:" << NodeBase::id();
+ sensordLogD() << "Creating IioAdaptor with id: " << id;
setup();
}
@@ -85,18 +85,18 @@
void IioAdaptor::setup()
{
- qDebug() << id() << Q_FUNC_INFO << deviceId;
+ qDebug() << Q_FUNC_INFO << deviceId;
if (deviceId.startsWith("accel")) {
const QString name = "accelerometer";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
- qDebug() << id() << "input_match" << inputMatch;
+ qDebug() << "input_match" << inputMatch;
iioDevice.channelTypeName = "accel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O accelerometer (" + iioDevice.name +")";
- qDebug() << id() << Q_FUNC_INFO << "Accelerometer found";
+ qDebug() << Q_FUNC_INFO << "Accelerometer found";
iioXyzBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(1);
setAdaptedSensor(name, desc, iioXyzBuffer_);
@@ -105,7 +105,7 @@
} else if (deviceId.startsWith("gyro")) {
const QString name = "gyroscope";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
- qDebug() << id() << "input_match" << inputMatch;
+ qDebug() << "input_match" << inputMatch;
iioDevice.channelTypeName = "anglvel";
devNodeNumber = findSensor(inputMatch);
@@ -119,7 +119,7 @@
} else if (deviceId.startsWith("mag")) {
const QString name = "magnetometer";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
- qDebug() << id() << "input_match" << inputMatch;
+ qDebug() << "input_match" << inputMatch;
iioDevice.channelTypeName = "magn";
devNodeNumber = findSensor(inputMatch);
@@ -138,7 +138,7 @@
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
QString desc = "Industrial I/O light sensor (" + iioDevice.name +")";
- qDebug() << id() << desc;
+ qDebug() << desc;
alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
setAdaptedSensor(name, desc, alsBuffer_);
iioDevice.sensorType = IioAdaptor::IIO_ALS;
@@ -146,14 +146,14 @@
} else if (deviceId.startsWith("prox")) {
const QString name = "proximity";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
- qDebug() << id() << name + ":" << "input_match" << inputMatch;
+ qDebug() << name + ":" << "input_match" << inputMatch;
iioDevice.channelTypeName = "proximity";
devNodeNumber = findSensor(inputMatch);
proximityThreshold = SensorFrameworkConfig::configuration()->value<QString>(name + "/threshold", QString(PROXIMITY_DEFAULT_THRESHOLD)).toInt();
if (devNodeNumber!= -1) {
QString desc = "Industrial I/O proximity sensor (" + iioDevice.name +")";
- qDebug() << id() << desc;
+ qDebug() << desc;
proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
setAdaptedSensor(name, desc, proximityBuffer_);
iioDevice.sensorType = IioAdaptor::IIO_PROXIMITY;
@@ -161,7 +161,7 @@
}
if (devNodeNumber == -1) {
- qDebug() << id() << Q_FUNC_INFO << "sensor is invalid";
+ qDebug() << Q_FUNC_INFO << "sensor is invalid";
// setValid(false);
return;
}
@@ -175,18 +175,13 @@
bool ok;
double scale_override = SensorFrameworkConfig::configuration()->value(iioDevice.name + "/scale").toDouble(&ok);
if (ok) {
- sensordLogD() << id() << "Overriding scale to" << scale_override;
+ sensordLogD() << "Overriding scale to" << scale_override;
iioDevice.scale = scale_override;
}
introduceAvailableDataRange(DataRange(0, 65535, 1));
-
- unsigned int min_interval_us = 0 * 1000;
- unsigned int max_interval_us = 586 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(0, 586, 0));
+ setDefaultInterval(10);
}
int IioAdaptor::findSensor(const QString &sensorName)
@@ -225,7 +220,7 @@
iioDevice.offset = 0.0;
iioDevice.scale = 1.0;
iioDevice.frequency = 1.0;
- qDebug() << id() << Q_FUNC_INFO << "Syspath for sensor (" + sensorName + "):" << iioDevice.devicePath;
+ qDebug() << Q_FUNC_INFO << "Syspath for sensor (" + sensorName + "):" << iioDevice.devicePath;
udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(dev)) {
const char *name;
@@ -235,26 +230,26 @@
value = udev_device_get_sysattr_value(dev, name);
if (value == NULL)
continue;
- qDebug() << id() << "attr" << name << value;
+ qDebug() << "attr" << name << value;
QString attributeName(name);
if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*scale$"))) {
iioDevice.scale = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << id() << sensorName + ":" << "Scale is" << iioDevice.scale;
+ qDebug() << sensorName + ":" << "Scale is" << iioDevice.scale;
}
} else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*offset$"))) {
iioDevice.offset = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << id() << sensorName + ":" << "Offset is" << value;
+ qDebug() << sensorName + ":" << "Offset is" << value;
}
} else if (attributeName.endsWith("frequency")) {
iioDevice.frequency = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << id() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
+ qDebug() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
}
} else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*raw$"))) {
- qDebug() << id() << "adding to paths:" << iioDevice.devicePath
+ qDebug() << "adding to paths:" << iioDevice.devicePath
<< attributeName << iioDevice.index;
addPath(iioDevice.devicePath + attributeName, j);
j++;
@@ -290,10 +285,10 @@
bool IioAdaptor::deviceEnable(int device, int enable)
{
- qDebug() << id() << Q_FUNC_INFO <<"device"<< device <<"enable" << enable;
- qDebug() << id() << "devicePath" << iioDevice.devicePath << iioDevice.name;
- qDebug() << id() << "dev_accl_" << devNodeNumber;
- qDebug() << id() << "scale" << (double)iioDevice.scale
+ qDebug() << Q_FUNC_INFO <<"device"<< device <<"enable" << enable;
+ qDebug() << "devicePath" << iioDevice.devicePath << iioDevice.name;
+ qDebug() << "dev_accl_" << devNodeNumber;
+ qDebug() << "scale" << (double)iioDevice.scale
<< "offset" << iioDevice.offset
<< "frequency" << iioDevice.frequency;
@@ -303,7 +298,7 @@
QString pathEnable = iioDevice.devicePath + "buffer/enable";
QString pathLength = iioDevice.devicePath + "buffer/length";
- qDebug() << id() << pathEnable << pathLength;
+ qDebug() << pathEnable << pathLength;
if (enable == 1) {
// FIXME: should enable sensors for this device? Assuming enabled already
@@ -323,7 +318,7 @@
{
QFile file(filename);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- sensordLogW() << id() << "Failed to open " << filename;
+ sensordLogW() << "Failed to open " << filename;
return false;
}
@@ -339,7 +334,7 @@
{
QFile file(filename);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- sensordLogW() << id() << "Failed to open " << filename;
+ sensordLogW() << "Failed to open " << filename;
return QString();
}
@@ -362,7 +357,7 @@
int value = string.toInt(&ok);
if (!ok) {
- sensordLogW() << id() << "Failed to parse '" << string << "' to int from file " << filename;
+ sensordLogW() << "Failed to parse '" << string << "' to int from file " << filename;
}
return value;
@@ -377,7 +372,7 @@
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/iioadaptor/iioadaptor.h
^
|
| @@ -104,7 +104,7 @@
~IioAdaptor();
- bool setInterval(const int sessionId, const unsigned int interval_us);
+ bool setInterval(const unsigned int value, const int sessionId);
// unsigned int interval() const;
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/kbslideradaptor/kbslideradaptor.cpp
^
|
| @@ -88,7 +88,7 @@
void KeyboardSliderAdaptor::commitOutput()
{
- sensordLogD() << id() << "KB Slider state change detected: " << currentState_;
+ sensordLogD() << "KB Slider state change detected: " << currentState_;
KeyboardSliderState *state = kbstateBuffer_->nextSlot();
@@ -103,9 +103,9 @@
return 0;
}
-bool KeyboardSliderAdaptor::setInterval(int sessionId, unsigned int interval_us)
+bool KeyboardSliderAdaptor::setInterval(unsigned int value, int sessionId)
{
- Q_UNUSED(interval_us);
+ Q_UNUSED(value);
Q_UNUSED(sessionId);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/kbslideradaptor/kbslideradaptor.h
^
|
| @@ -66,7 +66,7 @@
~KeyboardSliderAdaptor();
virtual unsigned int interval() const;
- virtual bool setInterval(int sessionId, unsigned int interval_us);
+ virtual bool setInterval(unsigned int value, int sessionId);
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp
^
|
| @@ -75,12 +75,12 @@
// there can be two lid sensors, so try and use both
void LidSensorAdaptorEvdev::init()
{
- qDebug() << id() << Q_FUNC_INFO << name();
+ qDebug() << Q_FUNC_INFO << name();
QStringList strList = SensorFrameworkConfig::configuration()->value<QStringList>(name() + "/input_match");
- qDebug() << id() << strList;
+ qDebug() << strList;
foreach (const QString str, strList) {
if (!getInputDevices(str)) {
- sensordLogW() << id() << "Input device not found.";
+ sensordLogW() << "Input device not found.";
SysfsAdaptor::init();
}
}
@@ -128,7 +128,7 @@
lidData->timestamp_ = Utils::getTimeStamp(ev);
lidData->value_ = currentValue_;
lidData->type_ = currentType_;
- sensordLogD() << id() << "Lid state change detected: "
+ sensordLogD() << "Lid state change detected: "
<< (currentType_ == 0 ? "front" : "back")
<< (currentValue_ == 0 ? "OPEN": "CLOSED");
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp
^
|
| @@ -58,10 +58,10 @@
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << id() << "Magnetometer output value: " << buf;
+ sensordLogT() << "Magnetometer output value: " << buf;
sscanf(buf, "%hx:%hx:%hx\n", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
^
|
| @@ -44,8 +44,7 @@
setDescription("Input device magnetometer adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
// introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
MagAdaptorEvdev::~MagAdaptorEvdev()
@@ -94,6 +93,33 @@
magnetometerBuffer_->wakeUpReaders();
}
+unsigned int MagAdaptorEvdev::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool MagAdaptorEvdev::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.h
^
|
| @@ -62,6 +62,11 @@
MagAdaptorEvdev(const QString& id);
~MagAdaptorEvdev();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
^
|
| @@ -32,32 +32,31 @@
MagnetometerAdaptorNCDK::MagnetometerAdaptorNCDK(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::IntervalMode),
- m_powerState(false)
+ powerState_(false)
{
- int intervalCompensation_ms = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
- m_intervalCompensation_us = intervalCompensation_ms * 1000;
- m_powerStateFilePath = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_power_state", "");
- m_sensAdjFilePath = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_sens_adjust", "");
- m_magnetometerBuffer = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(128);
- setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", m_magnetometerBuffer);
+ intervalCompensation_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
+ powerStateFilePath_ = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_power_state", "");
+ sensAdjFilePath_ = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_sens_adjust", "");
+ magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(128);
+ setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
setDescription("Magnetometer adaptor (ak8975) for NCDK");
//get sensitivity adjustment
- getSensitivityAdjustment(m_x_adj, m_y_adj, m_z_adj);
+ getSensitivityAdjustment(x_adj, y_adj, z_adj);
- m_overflowLimit = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
+ overflowLimit_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
}
MagnetometerAdaptorNCDK::~MagnetometerAdaptorNCDK()
{
- delete m_magnetometerBuffer;
+ delete magnetometerBuffer_;
}
void MagnetometerAdaptorNCDK::processSample(int pathId, int fd)
{
Q_UNUSED(pathId);
- if (!m_powerState)
+ if (!powerState_)
return;
char buf[32];
@@ -70,37 +69,37 @@
if (isOK) {
strList = QByteArray(buf, bytesRead).split(':');
if (strList.size() == 3) {
- x = adjustPos(strList.at(0).toInt(), m_x_adj);
- y = adjustPos(strList.at(1).toInt(), m_y_adj);
- z = adjustPos(strList.at(2).toInt(), m_z_adj);
+ x = adjustPos(strList.at(0).toInt(), x_adj);
+ y = adjustPos(strList.at(1).toInt(), y_adj);
+ z = adjustPos(strList.at(2).toInt(), z_adj);
}
} else {
- sensordLogW() << id() << "Reading magnetometer error: " << strerror(errno);
+ sensordLogW() << "Reading magnetometer error: " << strerror(errno);
return;
}
- sensordLogT() << id() << "Magnetometer Reading: " << x << ", " << y << ", " << z;
+ sensordLogT() << "Magnetometer Reading: " << x << ", " << y << ", " << z;
- CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
+ CalibratedMagneticFieldData* sample = magnetometerBuffer_->nextSlot();
sample->timestamp_ = Utils::getTimeStamp();
sample->x_ = x;
sample->y_ = y;
sample->z_ = z;
- m_magnetometerBuffer->commit();
- m_magnetometerBuffer->wakeUpReaders();
+ magnetometerBuffer_->commit();
+ magnetometerBuffer_->wakeUpReaders();
}
bool MagnetometerAdaptorNCDK::setPowerState(bool value) const
{
- sensordLogD() << id() << "Setting power state for compass driver" << " to " << value;
+ sensordLogD() << "Setting power state for compass driver" << " to " << value;
QByteArray powerStateStr = QByteArray::number(value);
- if (!writeToFile(m_powerStateFilePath, powerStateStr))
+ if (!writeToFile(powerStateFilePath_, powerStateStr))
{
- sensordLogW() << id() << "Unable to set power state for compass driver";
+ sensordLogW() << "Unable to set power state for compass driver";
return false;
}
return true;
@@ -108,7 +107,7 @@
void MagnetometerAdaptorNCDK::getSensitivityAdjustment(int &x, int &y, int &z) const
{
- QByteArray byteArray = readFromFile(m_sensAdjFilePath);
+ QByteArray byteArray = readFromFile(sensAdjFilePath_);
QList<QByteArray> strList = byteArray.split(':');
if (strList.size() == 3)
@@ -128,11 +127,11 @@
{
if (!setPowerState(true))
{
- sensordLogW() << id() << "Unable to set power on for compass driver";
+ sensordLogW() << "Unable to set power on for compass driver";
}
else
{
- m_powerState = true;
+ powerState_ = true;
}
return SysfsAdaptor::startSensor();
@@ -142,31 +141,31 @@
{
if (!setPowerState(false))
{
- sensordLogW() << id() << "Unable to set power off for compass driver";
+ sensordLogW() << "Unable to set power off for compass driver";
}
else
{
- m_powerState = false;
+ powerState_ = false;
}
SysfsAdaptor::stopSensor();
}
-bool MagnetometerAdaptorNCDK::setInterval(const int sessionId, const unsigned int interval_us)
+bool MagnetometerAdaptorNCDK::setInterval(const unsigned int value, const int sessionId)
{
- if(m_intervalCompensation_us)
+ if(intervalCompensation_)
{
- return SysfsAdaptor::setInterval(sessionId, (int)interval_us > m_intervalCompensation_us ? interval_us - m_intervalCompensation_us : 0);
+ return SysfsAdaptor::setInterval((int)value > intervalCompensation_ ? value - intervalCompensation_ : 0, sessionId);
}
- return SysfsAdaptor::setInterval(sessionId, interval_us);
+ return SysfsAdaptor::setInterval(value, sessionId);
}
void MagnetometerAdaptorNCDK::setOverflowLimit(int limit)
{
- m_overflowLimit = limit;
+ overflowLimit_ = limit;
}
int MagnetometerAdaptorNCDK::overflowLimit() const
{
- return m_overflowLimit;
+ return overflowLimit_;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.h
^
|
| @@ -58,7 +58,7 @@
MagnetometerAdaptorNCDK(const QString& id);
~MagnetometerAdaptorNCDK();
- bool setInterval(const int sessionId, const unsigned int interval_us);
+ bool setInterval(const unsigned int value, const int sessionId);
private:
@@ -71,22 +71,18 @@
*/
void processSample(int pathId, int fd);
- QByteArray m_powerStateFilePath;
- QByteArray m_sensAdjFilePath;
+ QByteArray powerStateFilePath_;
+ QByteArray sensAdjFilePath_;
- int m_x_adj;
- int m_y_adj;
- int m_z_adj;
- bool m_powerState;
-
- DeviceAdaptorRingBuffer<CalibratedMagneticFieldData> *m_magnetometerBuffer;
+ int x_adj, y_adj, z_adj;
+ bool powerState_;
+ DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
bool setPowerState(bool value) const;
void getSensitivityAdjustment(int &x, int &y, int &z) const;
-
int adjustPos(const int value, const int adj) const;
- int m_intervalCompensation_us;
- int m_overflowLimit;
+ int intervalCompensation_;
+ int overflowLimit_;
/**
* Sets the overflow limit of the sensor, checked when calibrated
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
^
|
| @@ -29,7 +29,7 @@
void MagnetometerAdaptorPluginNCDK::Register(class Loader&)
{
- sensordLogD() << id() << "registering magnetometeradaptor";
+ sensordLogD() << "registering magnetometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
^
|
| @@ -46,17 +46,16 @@
MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::IntervalMode, false)
{
- int intervalCompensation_ms = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
- m_intervalCompensation_us = intervalCompensation_ms * 1000;
- m_magnetometerBuffer = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
- setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", m_magnetometerBuffer);
- m_overflowLimit = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
+ intervalCompensation_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
+ magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
+ setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
+ overflowLimit_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
setDescription("Input device Magnetometer adaptor (ak897x)");
}
MagnetometerAdaptor::~MagnetometerAdaptor()
{
- delete m_magnetometerBuffer;
+ delete magnetometerBuffer_;
}
void MagnetometerAdaptor::processSample(int pathId, int fd)
@@ -68,43 +67,43 @@
unsigned int bytesRead = read(fd, &mag_data, sizeof(mag_data));
if (bytesRead < sizeof(mag_data)) {
- sensordLogW() << id() << "read " << bytesRead << " bytes out of expected " << sizeof(mag_data) << " bytes. Previous error: " << strerror(errno);
+ sensordLogW() << "read " << bytesRead << " bytes out of expected " << sizeof(mag_data) << " bytes. Previous error: " << strerror(errno);
//return;
}
if (!mag_data.valid) {
// Can't trust this, printed for curiosity
- sensordLogD() << id() << "Invalid sample received from magnetometer";
+ sensordLogD() << "Invalid sample received from magnetometer";
}
- sensordLogT() << id() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
+ sensordLogT() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
- CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
+ CalibratedMagneticFieldData* sample = magnetometerBuffer_->nextSlot();
sample->timestamp_ = Utils::getTimeStamp();
sample->x_ = mag_data.x;
sample->y_ = mag_data.y;
sample->z_ = mag_data.z;
- m_magnetometerBuffer->commit();
- m_magnetometerBuffer->wakeUpReaders();
+ magnetometerBuffer_->commit();
+ magnetometerBuffer_->wakeUpReaders();
}
-bool MagnetometerAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
+bool MagnetometerAdaptor::setInterval(const unsigned int value, const int sessionId)
{
- if(m_intervalCompensation_us)
+ if(intervalCompensation_)
{
- return SysfsAdaptor::setInterval(sessionId, (signed)interval_us >m_intervalCompensation_us ? interval_us - m_intervalCompensation_us : 0);
+ return SysfsAdaptor::setInterval((signed)value >intervalCompensation_ ? value - intervalCompensation_ : 0, sessionId);
}
- return SysfsAdaptor::setInterval(sessionId, interval_us);
+ return SysfsAdaptor::setInterval(value, sessionId);
}
void MagnetometerAdaptor::setOverflowLimit(int limit)
{
- m_overflowLimit = limit;
+ overflowLimit_ = limit;
}
int MagnetometerAdaptor::overflowLimit() const
{
- return m_overflowLimit;
+ return overflowLimit_;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptor.h
^
|
| @@ -64,7 +64,7 @@
MagnetometerAdaptor(const QString& id);
~MagnetometerAdaptor();
- bool setInterval(const int sessionId, const unsigned int interval_us);
+ bool setInterval(const unsigned int value, const int sessionId);
private:
@@ -91,9 +91,9 @@
*/
int overflowLimit() const;
- DeviceAdaptorRingBuffer<CalibratedMagneticFieldData> *m_magnetometerBuffer;
- int m_intervalCompensation_us;
- int m_overflowLimit;
+ DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
+ int intervalCompensation_;
+ int overflowLimit_;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.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 float(165.8 / EARTH_GRAVITY)
+#define CORRECTION_FACTOR (165.8 / EARTH_GRAVITY)
Mpu6050AccelAdaptor::Mpu6050AccelAdaptor (const QString& id) :
SysfsAdaptor (id, SysfsAdaptor::IntervalMode)
@@ -66,11 +66,8 @@
setDescription("MPU 6050 accelerometer");
// introduceAvailableDataRange(DataRange(-16384, 16384, 1));
-// unsigned int min_interval_us = 10 * 1000;
-// unsigned int max_interval_us = 586 * 1000;
-// introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-// unsigned int interval_us = 100 * 1000;
-// setDefaultInterval(interval_us);
+// introduceAvailableInterval(DataRange(10, 586, 0));
+// setDefaultInterval(100);
}
Mpu6050AccelAdaptor::~Mpu6050AccelAdaptor () {
@@ -81,13 +78,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << id() << "MPU6050 AccelAdaptor start";
+ sensordLogD() << "MPU6050 AccelAdaptor start\n";
return true;
}
void Mpu6050AccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << id() << "MPU6050 AccelAdaptor stop";
+ sensordLogD() << "MPU6050 AccelAdaptor stop\n";
}
void Mpu6050AccelAdaptor::processSample (int pathId, int fd) {
@@ -95,18 +92,18 @@
int val;
if ( pathId < X_AXIS || pathId > Z_AXIS ) {
- sensordLogW() << id() << "Wrong pathId: " << pathId;
+ sensordLogW() << "Wrong pathId: " << pathId;
return;
}
lseek (fd, 0, SEEK_SET);
if (read (fd, buf, sizeof(buf)) < 0) {
- sensordLogW() << id() << "Read failed";
+ sensordLogW() << "Read failed";
return;
}
if (sscanf (buf, "%d", &val) == 0 ) {
- sensordLogW() << id() << "Wrong data format: " << buf;
+ sensordLogW() << "Wrong data format: " << buf;
return;
}
@@ -114,18 +111,18 @@
case X_AXIS:
currentData = buffer->nextSlot();
currentData->timestamp_ = Utils::getTimeStamp();
- currentData->x_ = val / CORRECTION_FACTOR;
+ currentData->x_ = qRound(val / CORRECTION_FACTOR);
break;
case Y_AXIS:
- currentData->y_ = val / CORRECTION_FACTOR;
+ currentData->y_ = qRound(val / CORRECTION_FACTOR);
break;
case Z_AXIS:
- currentData->z_ = val / CORRECTION_FACTOR;
+ currentData->z_ = qRound(val / CORRECTION_FACTOR);
buffer->commit();
buffer->wakeUpReaders();
break;
default:
- sensordLogW() << id() << "Invalid pathId: " << pathId;
+ sensordLogW() << "Invalid pathId: " << pathId;
break;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
^
|
| @@ -25,7 +25,7 @@
void Mpu6050AccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering mpu6050accelerometeradaptor";
+ sensordLogD() << "registering mpu6050accelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
^
|
| @@ -29,7 +29,7 @@
void MRSTAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering mrstaccelerometeradaptor";
+ sensordLogD() << "registering mrstaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
^
|
| @@ -26,13 +26,8 @@
setDescription("Oaktrail accelerometer");
introduceAvailableDataRange(DataRange(-256, 256, 1));
-
- unsigned int min_interval_us = 10 * 1000;
- unsigned int max_interval_us = 586 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 100 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(10, 586, 0));
+ setDefaultInterval(100);
}
OaktrailAccelAdaptor::~OaktrailAccelAdaptor () {
@@ -43,13 +38,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << id() << "Oaktrail AccelAdaptor start";
+ sensordLogD() << "Oaktrail AccelAdaptor start\n";
return true;
}
void OaktrailAccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << id() << "Oaktrail AccelAdaptor stop";
+ sensordLogD() << "Oaktrail AccelAdaptor stop\n";
}
void OaktrailAccelAdaptor::processSample (int pathId, int fd) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void OaktrailAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering oaktrailaccelerometeradaptor";
+ sensordLogD() << "registering oaktrailaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
^
|
| @@ -26,13 +26,8 @@
setDescription("OEM tablet accelerometer");
introduceAvailableDataRange(DataRange(-256, 256, 1));
-
- unsigned int min_interval_us = 10 * 1000;
- unsigned int max_interval_us = 586 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- // FIXME: what meaning zero default interval is supposed to have here?
- // setDefaultInterval(0);
+ introduceAvailableInterval(DataRange(10, 586, 0));
+ setDefaultInterval(0);
}
OemtabletAccelAdaptor::~OemtabletAccelAdaptor () {
@@ -43,13 +38,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << id() << "OEM tablet AccelAdaptor start";
+ sensordLogD() << "OEM tablet AccelAdaptor start\n";
return true;
}
void OemtabletAccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << id() << "OEM tablet AccelAdaptor stop";
+ sensordLogD() << "OEM tablet AccelAdaptor stop\n";
}
void OemtabletAccelAdaptor::processSample (int pathId, int fd) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void OemtabletAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering oemtabletaccelerometeradaptor";
+ sensordLogD() << "registering oemtabletaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp
^
|
| @@ -19,20 +19,20 @@
QFile sysFile(SensorFrameworkConfig::configuration()->value("als-ascii_range_sysfs_path").toString());
if (!(sysFile.open(QIODevice::ReadOnly))) {
- sensordLogW() << id() << "Unable to config ALS range from sysfs, using default value: " << DEFAULT_RANGE;
+ sensordLogW() << "Unable to config ALS range from sysfs, using default value: " << DEFAULT_RANGE;
} else {
sysFile.readLine(buf, sizeof(buf));
range = QString(buf).toInt();
}
- sensordLogT() << id() << "Ambient light range: " << range;
+ sensordLogT() << "Ambient light range: " << range;
// Locate the actual handle
QString devPath = SensorFrameworkConfig::configuration()->value("als-ascii_sysfs_path").toString();
if (devPath.isEmpty())
{
- sensordLogW() << id() << "No driver handle found for ALS. Data not available.";
+ sensordLogW() << "No driver handle found for ALS. Data not available.";
return;
}
@@ -42,13 +42,8 @@
setDescription("Ambient light");
introduceAvailableDataRange(DataRange(0, range, 1));
-
- unsigned int min_interval_us = 10 * 1000;
- unsigned int max_interval_us = 98 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 90 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(10, 98, 0));
+ setDefaultInterval(90);
}
OEMTabletALSAdaptorAscii::~OEMTabletALSAdaptorAscii()
@@ -60,12 +55,12 @@
Q_UNUSED(pathId);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read():" << strerror(errno);
+ sensordLogW() << "read():" << strerror(errno);
return;
}
buf[sizeof(buf)-1] = '\0';
- sensordLogT() << id() << "Ambient light value: " << buf;
+ sensordLogT() << "Ambient light value: " << buf;
__u16 idata = atoi(buf);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OEMTabletALSAdaptorAsciiPlugin::Register(class Loader&)
{
- sensordLogW() << id() << "registering oemtabletalsadaptor-ascii";
+ sensordLogW() << "registering oemtabletalsadaptor-ascii";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptor.cpp
^
|
| @@ -14,13 +14,8 @@
setAdaptedSensor("gyroscope", "mpu3050", gyroscopeBuffer_);
introduceAvailableDataRange(DataRange(-32768, 32767, 1));
-
- unsigned int min_interval_us = 10 * 1000;
- unsigned int max_interval_us = 113 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 100 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(10, 113, 0));
+ setDefaultInterval(100);
}
OEMTabletGyroscopeAdaptor::~OEMTabletGyroscopeAdaptor()
@@ -35,10 +30,10 @@
char buf[32];
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read():" << strerror(errno);
+ sensordLogW() << "read():" << strerror(errno);
return;
}
- sensordLogT() << id() << "gyroscope output value: " << buf;
+ sensordLogT() << "gyroscope output value: " << buf;
sscanf(buf, "%hd %hd %hd\n", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OEMTabletGyroscopeAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering oemtabletgyroscopeadaptor";
+ sensordLogD() << "registering oemtabletgyroscopeadaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptor.cpp
^
|
| @@ -11,7 +11,7 @@
devId(0)
{
if (access(SYSFS_MAGNET_PATH, R_OK) < 0) {
- sensordLogW() << id() << SYSFS_MAGNET_PATH << ": "<< strerror(errno);
+ sensordLogW() << SYSFS_MAGNET_PATH << ": "<< strerror(errno);
return;
}
addPath(SYSFS_MAGNET_PATH, devId);
@@ -20,13 +20,8 @@
setDescription("OEM tablet magnetometer");
introduceAvailableDataRange(DataRange(-2048, 2048, 1));
-
- unsigned int min_interval_us = 10 * 1000;
- unsigned int max_interval_us = 556 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 500 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(10, 556, 0));
+ setDefaultInterval(500);
}
OemtabletMagnetometerAdaptor::~OemtabletMagnetometerAdaptor()
@@ -39,15 +34,15 @@
int x, y, z;
if (pathId != devId) {
- sensordLogW() << id() << "pathId != devId";
+ sensordLogW() << "pathId != devId";
return;
}
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read():" << strerror(errno);
+ sensordLogW() << "read():" << strerror(errno);
return;
}
- sensordLogT() << id() << "Magnetometer output value: " << buf;
+ sensordLogT() << "Magnetometer output value: " << buf;
sscanf(buf, "(%d,%d,%d)", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OemtabletMagnetometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering OemtabletMagnetometerAdaptor";
+ sensordLogD() << "registering OemtabletMagnetometerAdaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptor.cpp
^
|
| @@ -23,7 +23,7 @@
sleep(5);
if (!getInputDevices(DEVICE_MATCH_STRING)) {
- sensordLogW() << id() << "Input device not found.";
+ sensordLogW() << "Input device not found.";
}
accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(128);
@@ -32,15 +32,9 @@
// Set Metadata
setDescription("Input device accelerometer adaptor (Pegtron Lucid Tablet)");
introduceAvailableDataRange(DataRange(-512, 512, 1));
-
introduceAvailableInterval(DataRange(0, 0, 0));
-
- unsigned int min_interval_us = 50 * 1000;
- unsigned int max_interval_us = 2000 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
-
- unsigned int interval_us = 300 * 1000;
- setDefaultInterval(interval_us);
+ introduceAvailableInterval(DataRange(50, 2000, 0)); // -> [1,100] Hz
+ setDefaultInterval(300);
}
PegatronAccelerometerAdaptor::~PegatronAccelerometerAdaptor()
@@ -80,7 +74,7 @@
{
OrientationData* d = accelerometerBuffer_->nextSlot();
- d->timestamp_ = Utils::getTimeStamp(ev);
+ d->timestamp_ = Utils::getTimeStamp(&(ev->time));
d->x_ = orientationValue_.x_;
d->y_ = orientationValue_.y_;
d->z_ = orientationValue_.z_;
@@ -88,3 +82,32 @@
accelerometerBuffer_->commit();
accelerometerBuffer_->wakeUpReaders();
}
+
+unsigned int PegatronAccelerometerAdaptor::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0)
+ {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it)
+ {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptor.h
^
|
| @@ -27,6 +27,11 @@
PegatronAccelerometerAdaptor(const QString& id);
~PegatronAccelerometerAdaptor();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<OrientationData>* accelerometerBuffer_;
OrientationData orientationValue_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void PegatronAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering pegatronaccelerometeradaptor";
+ sensordLogD() << "registering pegatronaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/pressureadaptor/pressureadaptor.cpp
^
|
| @@ -42,8 +42,7 @@
setDescription("Input device pressure adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("pressure/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
PressureAdaptor::~PressureAdaptor()
@@ -83,6 +82,33 @@
pressureBuffer_->wakeUpReaders();
}
+unsigned int PressureAdaptor::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool PressureAdaptor::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/pressureadaptor/pressureadaptor.h
^
|
| @@ -59,6 +59,11 @@
PressureAdaptor(const QString& id);
~PressureAdaptor();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* pressureBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp
^
|
| @@ -56,10 +56,10 @@
char buf[16];
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << id() << "Proximity output value: " << buf;
+ sensordLogT() << "Proximity output value: " << buf;
ProximityData* proximity = proximityBuffer_->nextSlot();
sscanf(buf, "%d", &proximity->value_);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
^
|
| @@ -80,7 +80,7 @@
static ProximityState oldState = ProximityStateUnknown;
if (currentState_ != oldState) {
- sensordLogD() << id() << "Proximity state change detected: " << currentState_;
+ sensordLogD() << "Proximity state change detected: " << currentState_;
ProximityData *proximityData = proximityBuffer_->nextSlot();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/proximityadaptor/proximityadaptor.cpp
^
|
| @@ -98,9 +98,9 @@
int bytesRead = read(fd, &ps_data, sizeof(ps_data));
if (bytesRead > 0) {
- sensordLogT() << id() << "Proximity Values: " << ps_data.led1 << ", " << ps_data.led2 << ", " << ps_data.led3;
+ sensordLogT() << "Proximity Values: " << ps_data.led1 << ", " << ps_data.led2 << ", " << ps_data.led3;
} else {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
@@ -115,9 +115,9 @@
int bytesRead = read(fd, &ps_data, sizeof(ps_data));
if (bytesRead > 0) {
- sensordLogT() << id() << "Proximity Values: " << ps_data.ps << ", " << ps_data.ps_raw << ", " << ps_data.status;
+ sensordLogT() << "Proximity Values: " << ps_data.ps << ", " << ps_data.ps_raw << ", " << ps_data.status;
} else {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
@@ -132,18 +132,18 @@
memset(buffer, 0, sizeof(buffer));
int bytesRead = read(fd, &buffer, sizeof(buffer));
if (bytesRead <= 0) {
- sensordLogW() << id() << "read(): " << strerror(errno);
+ sensordLogW() << "read(): " << strerror(errno);
return;
}
sscanf(buffer, "%d", &rawdata);
if ( (signed)rawdata > threshold_ ) {
ret = 1;
}
- sensordLogT() << id() << "Proximity value: " << rawdata;
+ sensordLogT() << "Proximity value: " << rawdata;
}
else
{
- sensordLogW() << id() << "Not known device type: " << deviceType_;
+ sensordLogW() << "Not known device type: " << deviceType_;
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
^
|
| @@ -18,10 +18,8 @@
{
buffer = new DeviceAdaptorRingBuffer<OrientationData>(128);
setAdaptedSensor("accelerometer", "ste accelerometer", buffer);
+ introduceAvailableInterval(DataRange(50, 1000, 0));
- unsigned int min_interval_us = 50 * 1000;
- unsigned int max_interval_us = 1000 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
/*
range
0: +/- 2g (1 mg/LSB)
@@ -90,7 +88,7 @@
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) < 0 ) {
- sensordLogW() << id() << "Read failed";
+ sensordLogW() << "Read failed";
stopSensor();
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void SteAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering steaccelerometeradaptor";
+ sensordLogD() << "registering steaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/tapadaptor/tapadaptor.cpp
^
|
| @@ -64,7 +64,7 @@
break;
default:
dir = TapData::X;
- sensordLogW() << id() << "TapAdaptor: Unknown event-code received: " << ev->code;
+ sensordLogW() << "TapAdaptor: Unknown event-code received: " << ev->code;
break;
}
TapData tapValue;
@@ -94,9 +94,7 @@
tapBuffer_->wakeUpReaders();
}
-bool TapAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
+bool TapAdaptor::setInterval(const unsigned int, const int)
{
- Q_UNUSED(sessionId);
- Q_UNUSED(interval_us);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/tapadaptor/tapadaptor.h
^
|
| @@ -59,7 +59,7 @@
TapAdaptor(const QString& id);
~TapAdaptor();
- virtual bool setInterval(const int sessionId, const unsigned int interval_us);
+ virtual bool setInterval(const unsigned int value, const int sessionId);
private:
DeviceAdaptorRingBuffer<TapData>* tapBuffer_; /**< Output buffer */
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/temperatureadaptor/temperatureadaptor.cpp
^
|
| @@ -42,8 +42,7 @@
setDescription("Input device temperature adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("temperature/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- unsigned int interval_us = 10 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(10);
}
TemperatureAdaptor::~TemperatureAdaptor()
@@ -83,6 +82,33 @@
temperatureBuffer_->wakeUpReaders();
}
+unsigned int TemperatureAdaptor::evaluateIntervalRequests(int& sessionId) const
+{
+ unsigned int highestValue = 0;
+ int winningSessionId = -1;
+
+ if (m_intervalMap.size() == 0) {
+ sessionId = winningSessionId;
+ return defaultInterval();
+ }
+
+ // Get the smallest positive request, 0 is reserved for HW wakeup
+ QMap<int, unsigned int>::const_iterator it;
+ it = m_intervalMap.begin();
+ highestValue = it.value();
+ winningSessionId = it.key();
+
+ for (++it; it != m_intervalMap.constEnd(); ++it) {
+ if ((it.value() < highestValue) && (it.value() > 0)) {
+ highestValue = it.value();
+ winningSessionId = it.key();
+ }
+ }
+
+ sessionId = winningSessionId;
+ return highestValue > 0 ? highestValue : defaultInterval();
+}
+
bool TemperatureAdaptor::startSensor()
{
if (!powerStatePath_.isEmpty()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/temperatureadaptor/temperatureadaptor.h
^
|
| @@ -58,6 +58,11 @@
TemperatureAdaptor(const QString& id);
~TemperatureAdaptor();
+ /**
+ * Reimplement to allow for 0 interval to be the slowest entry.
+ */
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+
private:
DeviceAdaptorRingBuffer<TimedUnsigned>* temperatureBuffer_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/adaptors/touchadaptor/touchadaptor.cpp
^
|
| @@ -63,7 +63,7 @@
ioctl(fd, EVIOCGNAME(sizeof(deviceName)), deviceName);
if (ioctl(fd, EVIOCGBIT(0, sizeof(evtype_bitmask)), evtype_bitmask) < 0) {
- sensordLogW() << id() << __PRETTY_FUNCTION__ << deviceName << "EVIOCGBIT error";
+ sensordLogW() << __PRETTY_FUNCTION__ << deviceName << "EVIOCGBIT error";
close(fd);
return false;
}
@@ -76,13 +76,13 @@
}
if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(evtype_bitmask)), evtype_bitmask) < 0) {
- sensordLogW() << id() << __PRETTY_FUNCTION__ << deviceName << "EVIOGBIT EV_ABS error.";
+ sensordLogW() << __PRETTY_FUNCTION__ << deviceName << "EVIOGBIT EV_ABS error.";
close(fd);
return false;
}
if (!test_bit(ABS_X, evtype_bitmask) || !test_bit(ABS_Y, evtype_bitmask)) {
- sensordLogW() << id() << __PRETTY_FUNCTION__ << deviceName << "Testbit ABS_X or ABS_Y failed.";
+ sensordLogW() << __PRETTY_FUNCTION__ << deviceName << "Testbit ABS_X or ABS_Y failed.";
close(fd);
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/chains/accelerometerchain/accelerometerchain.cpp
^
|
| @@ -57,7 +57,7 @@
{
if (!setMatrixFromString(aconvString))
{
- sensordLogW() << NodeBase::id() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
+ sensordLogW() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
}
}
@@ -77,10 +77,10 @@
// Join filterchain buffers
if (!filterBin_->join("accelerometer", "source", "acccoordinatealigner", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer/acccoordinatealigner join failed";
+ qDebug() << Q_FUNC_INFO << "accelerometer/acccoordinatealigner join failed";
if (!filterBin_->join("acccoordinatealigner", "source", "buffer", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "acccoordinatealigner/buffer join failed";
+ qDebug() << Q_FUNC_INFO << "acccoordinatealigner/buffer join failed";
// Join datasources to the chain
connectToSource(accelerometerAdaptor_, "accelerometer", accelerometerReader_);
@@ -108,12 +108,12 @@
bool AccelerometerChain::start()
{
if (!accelerometerAdaptor_) {
- sensordLogD() << id() << "No accelerometer adaptor to start.";
+ sensordLogD() << "No accelerometer adaptor to start.";
return false;
}
if (AbstractSensorChannel::start()) {
- sensordLogD() << id() << "Starting AccelerometerChain";
+ sensordLogD() << "Starting AccelerometerChain";
filterBin_->start();
accelerometerAdaptor_->startSensor();
}
@@ -123,12 +123,12 @@
bool AccelerometerChain::stop()
{
if (!accelerometerAdaptor_) {
- sensordLogD() << id() << "No accelerometer adaptor to stop.";
+ sensordLogD() << "No accelerometer adaptor to stop.";
return false;
}
if (AbstractSensorChannel::stop()) {
- sensordLogD() << id() << "Stopping AccelerometerChain";
+ sensordLogD() << "Stopping AccelerometerChain";
accelerometerAdaptor_->stopSensor();
filterBin_->stop();
}
@@ -139,7 +139,7 @@
{
QStringList strList = str.split(',');
if (strList.size() != 9) {
- sensordLogW() << id() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
+ sensordLogW() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/chains/compasschain/compasschain.cpp
^
|
| @@ -115,56 +115,53 @@
// accelchain > avg filter > downsamplefilter > compassfilter
if (!filterBin->join("magnetometer", "source", "compassfilter", "magsink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer join failed";
+ qDebug() << Q_FUNC_INFO << "magnetometer join failed";
if (!filterBin->join("accelerometer", "source", "avgaccelerometer", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer join failed";
+ qDebug() << Q_FUNC_INFO << "accelerometer join failed";
if (!filterBin->join("avgaccelerometer", "source", "downsamplefilter", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "avgaccelerometer join failed";
+ qDebug() << Q_FUNC_INFO << "avgaccelerometer join failed";
if (!filterBin->join("downsamplefilter", "source", "compassfilter", "accsink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "downsamplefilter join failed";
+ qDebug() << Q_FUNC_INFO << "downsamplefilter join failed";
if (!filterBin->join("compassfilter", "magnorthangle", "magneticnorth", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "compassfilter/magnorth join failed";
+ qDebug() << Q_FUNC_INFO << "compassfilter/magnorth join failed";
if (!filterBin->join("compassfilter", "magnorthangle", "declinationcorrection", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "compassfilter/declination join failed";
+ qDebug() << Q_FUNC_INFO << "compassfilter/declination join failed";
} else {
////////////////////
if (!filterBin->join("orientation", "source", "orientationfilter", "orientsink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation join failed";
+ qDebug() << Q_FUNC_INFO << "orientation join failed";
if (!filterBin->join("orientationfilter", "magnorthangle", "magneticnorth", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation2 join failed";
+ qDebug() << Q_FUNC_INFO << "orientation2 join failed";
if (!filterBin->join("orientationfilter", "magnorthangle", "declinationcorrection", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation3 join failed";
+ qDebug() << Q_FUNC_INFO << "orientation3 join failed";
}
if (!filterBin->join("declinationcorrection", "source", "truenorth", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "declinationfilter join failed";
+ qDebug() << Q_FUNC_INFO << "declinationfilter join failed";
if (!hasOrientationAdaptor) {
if (!connectToSource(accelerometerChain, "accelerometer", accelerometerReader))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer connect failed";
+ qDebug() << Q_FUNC_INFO << "accelerometer connect failed";
if (!connectToSource(magChain, "calibratedmagnetometerdata", magReader))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer connect failed";
+ qDebug() << Q_FUNC_INFO << "magnetometer connect failed";
} else {
////////////////////
if (!connectToSource(orientAdaptor, "orientation", orientationdataReader))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation connect failed";
+ qDebug() << Q_FUNC_INFO << "orientation connect failed";
}
setDescription("Compass direction"); //compass north in degrees
introduceAvailableDataRange(DataRange(0, 359, 1));
-
- unsigned int min_interval_us = 50 * 1000;
- unsigned int max_interval_us = 200 * 1000;
- introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
+ introduceAvailableInterval(DataRange(50,200,0));
if (!hasOrientationAdaptor) {
DownsampleFilter *filter = static_cast<DownsampleFilter *>(downsampleFilter);
@@ -211,7 +208,7 @@
bool CompassChain::start()
{
if (AbstractSensorChannel::start()) {
- sensordLogD() << id() << "Starting compassChain" << hasOrientationAdaptor;
+ sensordLogD() << "Starting compassChain" << hasOrientationAdaptor;
filterBin->start();
if (hasOrientationAdaptor) {
orientAdaptor->startSensor();
@@ -220,7 +217,7 @@
magChain->start();
}
} else {
- qDebug() << id() << Q_FUNC_INFO <<"Failed: not started";
+ qDebug() << Q_FUNC_INFO <<"Failed: not started";
}
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/chains/magcalibrationchain/calibrationfilter.cpp
^
|
| @@ -113,6 +113,10 @@
transformed.level_ = calLevel;
+ transformed.x_ -= offsetX;
+ transformed.y_ -= offsetY;
+ transformed.z_ -= offsetZ;
+
///////////////////// soft iron
qreal vmaxX = minMaxList.at(0).second - ((minMaxList.at(0).first + minMaxList.at(0).second) * 0.5);
qreal vmaxY = minMaxList.at(1).second - ((minMaxList.at(1).first + minMaxList.at(1).second) * 0.5);
@@ -137,10 +141,6 @@
zScale = (avgRad/avgZ);
}
- transformed.x_ -= offsetX;
- transformed.y_ -= offsetY;
- transformed.z_ -= offsetZ;
-
transformed.x_ *= xScale;
transformed.y_ *= yScale;
transformed.z_ *= zScale;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/chains/magcalibrationchain/magcalibrationchain.cpp
^
|
| @@ -58,7 +58,7 @@
QString aconvString = SensorFrameworkConfig::configuration()->value<QString>("magnetometer/transformation_matrix", "");
if (aconvString.size() > 0) {
if (!setMatrixFromString(aconvString)) {
- sensordLogW()<< NodeBase::id() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
+ sensordLogW() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
}
}
@@ -95,19 +95,19 @@
filterBin->add(magCalFilter, "calibration");
if (!filterBin->join("calibratedmagneticfield", "source", "magcoordinatealigner", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
+ qDebug() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
if (!filterBin->join("magcoordinatealigner", "source", "calibration", "magsink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "magcoordinatealigner/calibration join failed";
+ qDebug() << Q_FUNC_INFO << "magcoordinatealigner/calibration join failed";
if (!filterBin->join("calibration", "source", "calibratedmagnetometerdata", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibration/calibratedmagnetometerdata join failed";
+ qDebug() << Q_FUNC_INFO << "calibration/calibratedmagnetometerdata join failed";
} else {
if (!filterBin->join("calibratedmagneticfield", "source", "magcoordinatealigner", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
+ qDebug() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
if (!filterBin->join("magcoordinatealigner", "source", "calibratedmagnetometerdata", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "magcoordinatealigner/calibratedmagnetometerdata join failed";
+ qDebug() << Q_FUNC_INFO << "magcoordinatealigner/calibratedmagnetometerdata join failed";
}
// Join datasources to the chain
@@ -137,12 +137,12 @@
bool MagCalibrationChain::start()
{
if (!magAdaptor) {
- sensordLogD() << id() << "No magnetometer adaptor to start.";
+ sensordLogD() << "No magnetometer adaptor to start.";
return false;
}
if (AbstractSensorChannel::start()) {
- sensordLogD() << id() << "Starting MagCalibrationChain";
+ sensordLogD() << "Starting MagCalibrationChain";
filterBin->start();
magAdaptor->startSensor();
}
@@ -152,12 +152,12 @@
bool MagCalibrationChain::stop()
{
if (!magAdaptor) {
- sensordLogD() << id() << "No magnetometer adaptor to stop.";
+ sensordLogD() << "No magnetometer adaptor to stop.";
return false;
}
if (AbstractSensorChannel::stop()) {
- sensordLogD() << id() << "Stopping MagCalibrationChain";
+ sensordLogD() << "Stopping MagCalibrationChain";
magAdaptor->stopSensor();
filterBin->stop();
}
@@ -169,7 +169,7 @@
if (needsCalibration) {
CalibrationFilter *filter = static_cast<CalibrationFilter *>(magCalFilter);
if (!filter) {
- sensordLogD() << id() << "Can not reset calibration without filter.";
+ sensordLogD() << "Can not reset calibration without filter.";
return;
}
filter->dropCalibration();
@@ -180,7 +180,7 @@
{
QStringList strList = str.split(',');
if (strList.size() != 9) {
- sensordLogW() << id() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
+ sensordLogW() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/chains/orientationchain/orientationchain.cpp
^
|
| @@ -61,13 +61,13 @@
// Join filterchain buffers
if (!filterBin_->join("accelerometer", "source", "orientationinterpreter", "accsink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "accelerometer/orientationinterpreter join failed";
+ qDebug() << Q_FUNC_INFO << "accelerometer/orientationinterpreter join failed";
if (!filterBin_->join("orientationinterpreter", "topedge", "topedgebuffer", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "orientationinterpreter/topedgebuffer join failed";
+ qDebug() << Q_FUNC_INFO << "orientationinterpreter/topedgebuffer join failed";
if (!filterBin_->join("orientationinterpreter", "face", "facebuffer", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "orientationinterpreter/facebuffer join failed";
+ qDebug() << Q_FUNC_INFO << "orientationinterpreter/facebuffer join failed";
if (!filterBin_->join("orientationinterpreter", "orientation", "orientationbuffer", "sink"))
- qDebug()<< NodeBase::id() << Q_FUNC_INFO << "orientationinterpreter/orientationbuffer join failed";
+ qDebug() << Q_FUNC_INFO << "orientationinterpreter/orientationbuffer join failed";
// Join datasources to the chain
connectToSource(accelerometerChain_, "accelerometer", accelerometerReader_);
@@ -93,7 +93,7 @@
bool OrientationChain::start()
{
if (AbstractSensorChannel::start()) {
- sensordLogD() << id() << "Starting AccelerometerChain";
+ sensordLogD() << "Starting AccelerometerChain";
filterBin_->start();
accelerometerChain_->start();
}
@@ -103,7 +103,7 @@
bool OrientationChain::stop()
{
if (AbstractSensorChannel::stop()) {
- sensordLogD() << id() << "Stopping AccelerometerChain";
+ sensordLogD() << "Stopping AccelerometerChain";
accelerometerChain_->stop();
filterBin_->stop();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/common-config.pri
^
|
| @@ -44,7 +44,3 @@
}
}
-config_hybris {
- CONFIG += link_pkgconfig
- PKGCONFIG += android-headers libhardware
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/abstractsensor.cpp
^
|
| @@ -43,7 +43,7 @@
void AbstractSensorChannel::setError(SensorError errorCode, const QString& errorString)
{
- sensordLogC() << id() << "SensorError: " << errorString;
+ sensordLogC() << "SensorError: " << errorString;
errorCode_ = errorCode;
errorString_ = errorString;
@@ -89,7 +89,7 @@
bool AbstractSensorChannel::writeToSession(int sessionId, const void* source, int size)
{
if (!(SensorManager::instance().write(sessionId, source, size))) {
- sensordLogD() << id() << "AbstractSensor failed to write to session " << sessionId;
+ sensordLogD() << "AbstractSensor failed to write to session " << sessionId;
return false;
}
return true;
@@ -137,9 +137,9 @@
if(samples.size() < bufferSize)
continue;
- float x = 0;
- float y = 0;
- float z = 0;
+ long x = 0;
+ long y = 0;
+ long z = 0;
foreach(const TimedXyzData& data, samples)
{
x += data.x_;
@@ -239,7 +239,7 @@
{
if(downsamplingSupported())
{
- sensordLogT() << id() << "Downsampling state for session " << sessionId << ": " << value;
+ sensordLogT() << "Downsampling state for session " << sessionId << ": " << value;
downsampling_[sessionId] = value;
}
}
@@ -296,6 +296,6 @@
RingBufferBase* AbstractSensorChannel::findBuffer(const QString&) const
{
- sensordLogW() << id() << "Tried to locate buffer from SensorChannel!";
+ sensordLogW() << "Tried to locate buffer from SensorChannel!";
return NULL;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/abstractsensor_a.cpp
^
|
| @@ -64,22 +64,12 @@
unsigned int AbstractSensorChannelAdaptor::interval() const
{
- // D-Bus interface -> interval is milliseconds
- int interval_ms = 0;
- int interval_us = node()->getInterval();
- if (interval_us > 0)
- interval_ms = (interval_us + 999) / 1000;
- return interval_ms;
+ return node()->getInterval();
}
unsigned int AbstractSensorChannelAdaptor::bufferInterval() const
{
- // D-Bus interface -> interval is milliseconds
- int interval_ms = 0;
- int interval_us = node()->bufferInterval();
- if (interval_us > 0)
- interval_ms = (interval_us + 999) / 1000;
- return interval_ms;
+ return node()->bufferInterval();
}
unsigned int AbstractSensorChannelAdaptor::bufferSize() const
@@ -109,24 +99,10 @@
node()->stop(sessionId);
}
-void AbstractSensorChannelAdaptor::setInterval(int sessionId, int interval_ms)
+void AbstractSensorChannelAdaptor::setInterval(int sessionId, int value)
{
- // D-Bus interface -> interval is milliseconds
- int interval_us = 0;
- if (interval_ms > 0)
- interval_us = interval_ms * 1000;
- node()->setIntervalRequest(sessionId, interval_us);
- SensorManager::instance().socketHandler().setInterval(sessionId, interval_us);
-}
-
-void AbstractSensorChannelAdaptor::setDataRate(int sessionId, double dataRate_Hz)
-{
- // interval_us rounded down -> effective dataRate rounded up
- int interval_us = 0;
- if (dataRate_Hz > 0)
- interval_us = (int)(1000000.0 / dataRate_Hz);
- node()->setIntervalRequest(sessionId, interval_us);
- SensorManager::instance().socketHandler().setInterval(sessionId, interval_us);
+ node()->setIntervalRequest(sessionId, value);
+ SensorManager::instance().socketHandler().setInterval(sessionId, value);
}
bool AbstractSensorChannelAdaptor::standbyOverride() const
@@ -161,12 +137,7 @@
DataRangeList AbstractSensorChannelAdaptor::getAvailableIntervals()
{
- // D-Bus interface -> interval is milliseconds
- DataRangeList ranges_us(node()->getAvailableIntervals());
- DataRangeList ranges_ms;
- for (auto it = ranges_us.begin(); it != ranges_us.end(); ++it)
- ranges_ms.append(DataRange(it->min * 0.001, it->max * 0.001, it->resolution));
- return ranges_ms;
+ return node()->getAvailableIntervals();
}
bool AbstractSensorChannelAdaptor::setDefaultInterval(int sessionId)
@@ -176,26 +147,22 @@
return ok;
}
-void AbstractSensorChannelAdaptor::setBufferInterval(int sessionId, unsigned int interval_ms)
+void AbstractSensorChannelAdaptor::setBufferInterval(int sessionId, unsigned int value)
{
- // D-Bus interface -> interval is milliseconds
- int interval_us = 0;
- if (interval_ms > 0)
- interval_us = interval_ms * 1000;
bool hwBuffering = false;
node()->getAvailableBufferIntervals(hwBuffering);
if(hwBuffering)
{
- if(interval_us == 0)
+ if(value == 0)
node()->clearBufferInterval(sessionId);
else
- node()->setBufferInterval(sessionId, interval_us);
- interval_us = 0;
+ node()->setBufferInterval(sessionId, value);
+ value = 0;
}
- if(interval_us == 0)
+ if(value == 0)
SensorManager::instance().socketHandler().clearBufferInterval(sessionId);
else
- SensorManager::instance().socketHandler().setBufferInterval(sessionId, interval_us);
+ SensorManager::instance().socketHandler().setBufferInterval(sessionId, value);
}
void AbstractSensorChannelAdaptor::setBufferSize(int sessionId, unsigned int value)
@@ -217,14 +184,8 @@
IntegerRangeList AbstractSensorChannelAdaptor::getAvailableBufferIntervals() const
{
- // D-Bus interface -> interval is milliseconds
bool dummy;
- IntegerRangeList list(node()->getAvailableBufferIntervals(dummy));
- for (auto it = list.begin(); it != list.end(); ++it) {
- (*it).first = ((*it).first + 999) / 1000;
- (*it).second = ((*it).second + 999) / 1000;
- }
- return list;
+ return node()->getAvailableBufferIntervals(dummy);
}
IntegerRangeList AbstractSensorChannelAdaptor::getAvailableBufferSizes() const
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/abstractsensor_a.h
^
|
| @@ -124,13 +124,7 @@
*
* Will also configure interval for the data connection.
*/
- void setInterval(int sessionId, int interval_ms);
-
- /** AbstractSensorChannel::setDataRate(int, double)
- *
- * Will also configure interval for the data connection.
- */
- void setDataRate(int sessionId, double dataRate_Hz);
+ void setInterval(int sessionId, int value);
/** AbstractSensorChannel::getAvailableIntervals() */
DataRangeList getAvailableIntervals();
@@ -144,13 +138,13 @@
/** AbstractSensorChannel::setDownsampling(int, bool) */
void setDownsampling(int sessionId, bool value);
- /** AbstractSensorChannel::setBufferInterval(int, unsigned int)
+ /** AbstractSensorChannel::isValid(int, unsigned int)
*
* Will also configure buffer interval for the data connection.
*/
- void setBufferInterval(int sessionId, unsigned int interval_ms);
+ void setBufferInterval(int sessionId, unsigned int value);
- /** AbstractSensorChannel::setBufferSize(int, unsigned int)
+ /** AbstractSensorChannel::isValid(int, unsigned int)
*
* Will also configure buffer size for the data connection.
*/
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/hybris.pro
^
|
| @@ -13,15 +13,14 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
+
SOURCES += hybrisadaptor.cpp
HEADERS += hybrisadaptor.h
-LIBS += -L$$[QT_INSTALL_LIBS] -L../datatypes -lsensordatatypes-qt5 -L. -lsensorfw-qt5
-
-CONFIG += link_pkgconfig
+LIBS += -L$$[QT_INSTALL_LIBS] -L../datatypes
!contains(CONFIG,binder) {
- LIBS += -lhybris-common
- PKGCONFIG += android-headers libhardware
+ LIBS += -lhybris-common -lhardware
}
include(../common-install.pri)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/hybrisadaptor.cpp
^
|
| @@ -132,9 +132,9 @@
* ========================================================================= */
HybrisSensorState::HybrisSensorState()
- : m_minDelay_us(0)
- , m_maxDelay_us(0)
- , m_delay_us(-1)
+ : m_minDelay(0)
+ , m_maxDelay(0)
+ , m_delay(-1)
, m_active(-1)
{
memset(&m_fallbackEvent, 0, sizeof m_fallbackEvent);
@@ -148,12 +148,6 @@
* HybrisManager
* ========================================================================= */
-/* hybrisManager object is created on demand - which ought to happen
- * well after QCoreApplication object has already been instantiated.
- * Cleanup actions are executed on QCoreApplication::aboutToQuit signal.
- * Destructor gets called after exit from main() and should be as
- * close to nop as possible.
- */
Q_GLOBAL_STATIC(HybrisManager, hybrisManager)
HybrisManager::HybrisManager(QObject *parent)
@@ -179,11 +173,6 @@
, m_indexOfType()
, m_indexOfHandle()
{
- /* Arrange it so that sensors get stopped on exit from mainloop
- */
- connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
- this, &HybrisManager::cleanup);
-
#ifdef USE_BINDER
startConnect();
#else
@@ -262,13 +251,13 @@
// Pick wake-up variant for the types which are wake-up sensors by default
if (typeRequiresWakeup(m_sensorArray[i].type)) {
if ((m_sensorArray[i].flags & SENSOR_FLAG_WAKE_UP) == 0) {
- sensordLogD() << "Ignoring non-wake-up sensor of type " << m_sensorArray[i].type << sensorTypeName(m_sensorArray[i].type);
+ sensordLogD() << "Ignoring non-wake-up sensor of type " << m_sensorArray[i].type;
use = false;
}
} else {
// All other sensors shall use non-wake-up sensor variant
if ((m_sensorArray[i].flags & SENSOR_FLAG_WAKE_UP) != 0) {
- sensordLogD() << "Ignoring wake-up sensor of type " << m_sensorArray[i].type << sensorTypeName(m_sensorArray[i].type);
+ sensordLogD() << "Ignoring wake-up sensor of type " << m_sensorArray[i].type;
use = false;
}
}
@@ -276,7 +265,7 @@
sensordLogD() << Q_FUNC_INFO
<< (use ? "SELECT" : "IGNORE")
- << "type:" << m_sensorArray[i].type << sensorTypeName(m_sensorArray[i].type)
+ << "type:" << m_sensorArray[i].type
#ifdef USE_BINDER
<< "name:" << (m_sensorArray[i].name.data.str ?: "n/a");
#else
@@ -284,16 +273,16 @@
#endif
if (use) {
- // min/max delay in hal is specified in [us]
- int minDelay_us = m_sensorArray[i].minDelay;
- int maxDelay_us = -1; // Assume: not defined by hal
+ // min/max delay is specified in [us] -> convert to [ms]
+ int minDelay = (m_sensorArray[i].minDelay + 999) / 1000;
+ int maxDelay = -1; // Assume: not defined by hal
#ifdef USE_BINDER
- maxDelay_us = m_sensorArray[i].maxDelay;
+ maxDelay = (m_sensorArray[i].maxDelay + 999) / 1000;
#else
#ifdef SENSORS_DEVICE_API_VERSION_1_3
if (m_halDevice->common.version >= SENSORS_DEVICE_API_VERSION_1_3)
- maxDelay_us = m_sensorArray[i].maxDelay;
+ maxDelay = (m_sensorArray[i].maxDelay + 999) / 1000;
#endif
#endif
@@ -305,10 +294,10 @@
* For now use: minDelay * 2, but at least 1000 ms.
*/
- if (maxDelay_us < 0 && minDelay_us > 0) {
- maxDelay_us = (minDelay_us < 500000) ? 1000000 : (minDelay_us * 2);
- sensordLogD("hal does not specify maxDelay, fallback: %d us",
- maxDelay_us);
+ if (maxDelay < 0 && minDelay > 0) {
+ maxDelay = (minDelay < 500) ? 1000 : (minDelay * 2);
+ sensordLogD("hal does not specify maxDelay, fallback: %d ms",
+ maxDelay);
}
// Positive minDelay means delay /can/ be set - but depending
@@ -318,25 +307,25 @@
// failing to explicitly set delays / using delays that would
// get rejected by upper levels of sensorfwd logic -> setup
// 200 ms delay (capped to reported min/max range).
- if (minDelay_us >= 0) {
- if (maxDelay_us < minDelay_us)
- maxDelay_us = minDelay_us;
-
- int delay_us = minDelay_us ? 200000 : 0;
- if (delay_us < minDelay_us)
- delay_us = minDelay_us;
- else if (delay_us > maxDelay_us)
- delay_us = maxDelay_us;
+ if (minDelay >= 0) {
+ if (maxDelay < minDelay)
+ maxDelay = minDelay;
+
+ int delay = minDelay ? 200 : 0;
+ if (delay < minDelay)
+ delay = minDelay;
+ else if (delay > maxDelay )
+ delay = maxDelay;
- m_sensorState[i].m_minDelay_us = minDelay_us;
- m_sensorState[i].m_maxDelay_us = maxDelay_us;
+ m_sensorState[i].m_minDelay = minDelay;
+ m_sensorState[i].m_maxDelay = maxDelay;
- setDelay(m_sensorArray[i].handle, delay_us, true);
+ setDelay(m_sensorArray[i].handle, delay, true);
sensordLogD("delay = %d [%d, %d]",
- m_sensorState[i].m_delay_us,
- m_sensorState[i].m_minDelay_us,
- m_sensorState[i].m_maxDelay_us);
+ m_sensorState[i].m_delay,
+ m_sensorState[i].m_minDelay,
+ m_sensorState[i].m_maxDelay);
}
m_indexOfType.insert(m_sensorArray[i].type, i);
@@ -402,56 +391,23 @@
HybrisManager::~HybrisManager()
{
- /* This is exectuted after exiting main() function.
- * No actions that need core application, binder ipc,
- * android hal libraries, etc should be made.
- */
+ cleanup();
+
+#ifdef USE_BINDER
+ if (m_serviceManager) {
+ gbinder_servicemanager_unref(m_serviceManager);
+ m_serviceManager = NULL;
+ }
+#endif
}
void HybrisManager::cleanup()
{
- /* Stop any sensors that are active
- */
-
sensordLogD() << "stop all sensors";
foreach (HybrisAdaptor *adaptor, m_registeredAdaptors.values()) {
adaptor->stopSensor();
}
- /* Stop reacting to async events
- */
-
-#ifdef USE_BINDER
- gbinder_remote_object_remove_handler(m_remote, m_deathId);
- m_deathId = 0;
-
- if (m_pollTransactId) {
- gbinder_client_cancel(m_client, m_pollTransactId);
- m_pollTransactId = 0;
-
- // The above code just marks down pending POLL transaction as
- // to be cancelled later on when handler thread gets woken up.
- //
- // If we are exiting right after cleanup(), that is never going
- // to happen and gbinder_ipc_exit() cleanup code blocks sensorfwd
- // exit indefinitely.
- //
- // As a workaround: make a dummy POLL transaction, for which a
- // reply is sent immediately, which then wakes up the handler
- // thread, the cancellation gets processed and exit is unblocked.
-
- GBinderLocalRequest *req = gbinder_client_new_request2(m_client, POLL);
- int32_t status = 0;
- gbinder_local_request_append_int32(req, 0);
- GBinderRemoteReply *reply = gbinder_client_transact_sync_reply(m_client, POLL, req, &status);
- gbinder_remote_reply_unref(reply);
- gbinder_local_request_unref(req);
- }
-
- gbinder_local_object_unref(m_sensorCallback);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/hybrisadaptor.h
^
|
| @@ -139,9 +139,9 @@
HybrisSensorState();
~HybrisSensorState();
- int m_minDelay_us;
- int m_maxDelay_us;
- int m_delay_us;
+ int m_minDelay;
+ int m_maxDelay;
+ int m_delay;
int m_active;
sensors_event_t m_fallbackEvent;
};
@@ -170,7 +170,7 @@
int getMinDelay (int handle) const;
int getMaxDelay (int handle) const;
int getDelay (int handle) const;
- bool setDelay (int handle, int delay_us, bool force);
+ bool setDelay (int handle, int delay_ms, bool force);
bool getActive (int handle) const;
bool setActive (int handle, bool active);
@@ -274,7 +274,8 @@
unsigned int maxInterval() const;
virtual unsigned int interval() const;
- virtual bool setInterval(const int sessionId, const unsigned int interval_us);
+ virtual bool setInterval(const unsigned int value, const int sessionId);
+ virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
static bool writeToFile(const QByteArray& path, const QByteArray& content);
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/inputdevadaptor.cpp
^
|
| @@ -45,11 +45,11 @@
InputDevAdaptor::InputDevAdaptor(const QString& id, int maxDeviceCount) :
SysfsAdaptor(id, SysfsAdaptor::SelectMode, false),
- m_deviceCount(0),
- m_maxDeviceCount(maxDeviceCount),
- m_cachedInterval_us(0)
+ deviceCount_(0),
+ maxDeviceCount_(maxDeviceCount),
+ cachedInterval_(0)
{
- memset(m_evlist, 0x0, sizeof(input_event)*64);
+ memset(evlist_, 0x0, sizeof(input_event)*64);
}
InputDevAdaptor::~InputDevAdaptor()
@@ -58,31 +58,31 @@
int InputDevAdaptor::getInputDevices(const QString& typeName)
{
- qDebug() << id() << Q_FUNC_INFO << typeName;
+ qDebug() << Q_FUNC_INFO << typeName;
QString deviceSysPathString = SensorFrameworkConfig::configuration()->value("global/device_sys_path").toString();
QString devicePollFilePath = SensorFrameworkConfig::configuration()->value("global/device_poll_file_path").toString();
int deviceNumber = 0;
- m_deviceString = typeName;
+ deviceString_ = typeName;
// Check if this device name is defined in configuration
QString deviceName = SensorFrameworkConfig::configuration()->value<QString>(typeName + "/device", "");
// Do not perform strict checks for the input device
if (deviceName.size() && checkInputDevice(deviceName, typeName, false)) {
- addPath(deviceName, m_deviceCount);
- ++m_deviceCount;
+ addPath(deviceName, deviceCount_);
+ ++deviceCount_;
} else if(deviceSysPathString.contains("%1")) {
const int MAX_EVENT_DEV = 16;
-qDebug() << id() << deviceNumber << m_deviceCount << m_maxDeviceCount;
+qDebug() << deviceNumber << deviceCount_ << maxDeviceCount_;
// No configuration for this device, try find the device from the device system path
- while (deviceNumber < MAX_EVENT_DEV && m_deviceCount < m_maxDeviceCount) {
+ while (deviceNumber < MAX_EVENT_DEV && deviceCount_ < maxDeviceCount_) {
deviceName = deviceSysPathString.arg(deviceNumber);
- qDebug() << id() << Q_FUNC_INFO << deviceName;
+ qDebug() << Q_FUNC_INFO << deviceName;
if (checkInputDevice(deviceName, typeName)) {
- addPath(deviceName, m_deviceCount);
- ++m_deviceCount;
+ addPath(deviceName, deviceCount_);
+ ++deviceCount_;
break;
}
++deviceNumber;
@@ -91,33 +91,32 @@
QString pollConfigKey = QString(typeName + "/poll_file");
if (SensorFrameworkConfig::configuration()->exists(pollConfigKey)) {
- m_usedDevicePollFilePath = SensorFrameworkConfig::configuration()->value<QString>(pollConfigKey, "");
+ usedDevicePollFilePath_ = SensorFrameworkConfig::configuration()->value<QString>(pollConfigKey, "");
} else {
- m_usedDevicePollFilePath = devicePollFilePath.arg(deviceNumber);
+ usedDevicePollFilePath_ = devicePollFilePath.arg(deviceNumber);
}
-qDebug() << id() << Q_FUNC_INFO << m_usedDevicePollFilePath;
+qDebug() << Q_FUNC_INFO << usedDevicePollFilePath_;
- if (m_deviceCount == 0) {
- sensordLogW() << id() << "Cannot find any device for: " << typeName;
+ if (deviceCount_ == 0) {
+ sensordLogW() << "Cannot find any device for: " << typeName;
setValid(false);
} else {
- QByteArray byteArray = readFromFile(m_usedDevicePollFilePath.toLatin1());
- int interval_ms = byteArray.size() > 0 ? byteArray.toInt() : 0;
- m_cachedInterval_us = interval_ms * 1000;
+ QByteArray byteArray = readFromFile(usedDevicePollFilePath_.toLatin1());
+ cachedInterval_ = byteArray.size() > 0 ? byteArray.toInt() : 0;
}
- return m_deviceCount;
+ return deviceCount_;
}
int InputDevAdaptor::getEvents(int fd)
{
- int bytes = read(fd, m_evlist, sizeof(struct input_event)*64);
+ int bytes = read(fd, evlist_, sizeof(struct input_event)*64);
if (bytes == -1) {
- sensordLogW() << id() << "Error occured: " << strerror(errno);
+ sensordLogW() << "Error occured: " << strerror(errno);
return 0;
}
if (bytes % sizeof(struct input_event)) {
- sensordLogW() << id() << "Short read or stray bytes.";
+ sensordLogW() << "Short read or stray bytes.";
return 0;
}
return bytes/sizeof(struct input_event);
@@ -128,12 +127,12 @@
int numEvents = getEvents(fd);
for (int i = 0; i < numEvents; ++i) {
- switch (m_evlist[i].type) {
+ switch (evlist_[i].type) {
case EV_SYN:
- interpretSync(pathId, &(m_evlist[i]));
+ interpretSync(pathId, &(evlist_[i]));
break;
default:
- interpretEvent(pathId, &(m_evlist[i]));
+ interpretEvent(pathId, &(evlist_[i]));
break;
}
}
@@ -143,7 +142,7 @@
{
char deviceName[256] = {0,};
bool check = true;
-qDebug() << id() << Q_FUNC_INFO << path << matchString << strictChecks;
+qDebug() << Q_FUNC_INFO << path << matchString << strictChecks;
int fd = open(path.toLocal8Bit().constData(), O_RDONLY);
if (fd == -1) {
return false;
@@ -151,13 +150,13 @@
if (strictChecks) {
int result = ioctl(fd, EVIOCGNAME(sizeof(deviceName)), deviceName);
- qDebug() << id() << Q_FUNC_INFO << "open result:" << result << deviceName;
+ qDebug() << Q_FUNC_INFO << "open result:" << result << deviceName;
if (result == -1) {
- sensordLogW() << id() << "Could not read devicename for " << path;
+ sensordLogW() << "Could not read devicename for " << path;
check = false;
} else {
if (QString(deviceName).contains(matchString, Qt::CaseInsensitive)) {
- sensordLogT() << id() << "\"" << matchString << "\"" << " matched in device name: " << deviceName;
+ sensordLogT() << "\"" << matchString << "\"" << " matched in device name: " << deviceName;
check = true;
} else {
check = false;
@@ -172,20 +171,18 @@
unsigned int InputDevAdaptor::interval() const
{
- return m_cachedInterval_us;
+ return cachedInterval_;
}
-bool InputDevAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
+bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
{
Q_UNUSED(sessionId);
- // XXX: is this supposed to be sampling frequency or sample time?
- int interval_ms = (interval_us + 999) / 1000;
- sensordLogD() << id() << "Setting poll interval for " << m_deviceString << " to " << interval_ms << "ms";
- QByteArray frequencyString(QString("%1\n").arg(interval_ms).toLocal8Bit());
- if(writeToFile(m_usedDevicePollFilePath.toLocal8Bit(), frequencyString))
+ sensordLogD() << "Setting poll interval for " << deviceString_ << " to " << value;
+ QByteArray frequencyString(QString("%1\n").arg(value).toLocal8Bit());
+ if(writeToFile(usedDevicePollFilePath_.toLocal8Bit(), frequencyString))
{
- m_cachedInterval_us = interval_ms * 1000;
+ cachedInterval_ = value;
return true;
}
return false;
@@ -193,14 +190,14 @@
void InputDevAdaptor::init()
{
- qDebug() << id() << Q_FUNC_INFO << name();
+ qDebug() << Q_FUNC_INFO << name();
if (!getInputDevices(SensorFrameworkConfig::configuration()->value<QString>(name() + "/input_match", name()))) {
- sensordLogW() << id() << "Input device not found.";
+ sensordLogW() << "Input device not found.";
SysfsAdaptor::init();
}
}
int InputDevAdaptor::getDeviceCount() const
{
- return m_deviceCount;
+ return deviceCount_;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/inputdevadaptor.h
^
|
| @@ -108,24 +108,24 @@
virtual unsigned int interval() const;
- virtual bool setInterval(const int sessionId, const unsigned int interval_us);
+ virtual bool setInterval(const unsigned int value, const int sessionId);
private:
/**
* Read events from file descriptor. The read events are stored in
- * #m_evlist array.
+ * #evlist_ array.
*
* @param fd File descriptor to read from.
* @return Number of read events.
*/
int getEvents(int fd);
- QString m_usedDevicePollFilePath; /**< sysfs path to input device poll file */
- QString m_deviceString; /**< input device name */
- int m_deviceCount; /**< number of available input devices */
- const int m_maxDeviceCount; /**< maximum number of supported devices */
- input_event m_evlist[64]; /**< input event buffer */
- unsigned int m_cachedInterval_us; /**< cached interval reading */
+ QString usedDevicePollFilePath_; /**< sysfs path to input device poll file */
+ QString deviceString_; /**< input device name */
+ int deviceCount_; /**< number of available input devices */
+ const int maxDeviceCount_; /**< maximum number of supported devices */
+ input_event evlist_[64]; /**< input event buffer */
+ unsigned int cachedInterval_; /**< cached interval reading */
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/logging.h
^
|
| @@ -27,8 +27,7 @@
#ifndef LOGGING_H
#define LOGGING_H
-// QUARANTINE #include <QDebug>
-#include <QtDebug>
+#include <QDebug>
#define sensordLogT(ARGS_...) (qDebug(ARGS_))
#define sensordLogD(ARGS_...) (qInfo(ARGS_))
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/lsclient.cpp
^
|
| @@ -73,7 +73,7 @@
LSErrorFree(&lserror);
}
- qDebug() << id() << "Unable to start service.";
+ qDebug() << "Unable to start service.";
}
bool LSClient::displayEnabled() const
@@ -188,4 +188,4 @@
json_object_put(root);
return true;
-}
+}
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/nodebase.cpp
^
|
| @@ -31,12 +31,15 @@
NodeBase::NodeBase(const QString& id, QObject* parent) :
QObject(parent),
+ m_bufferSize(0),
+ m_bufferInterval(0),
m_dataRangeSource(NULL),
m_intervalSource(NULL),
m_hasDefault(false),
- m_defaultInterval_us(0),
- m_id(id),
- m_isValid(false)
+ m_defaultInterval(0),
+ DEFAULT_DATA_RANGE_REQUEST(-1),
+ id_(id),
+ isValid_(false)
{
}
@@ -46,12 +49,12 @@
const QString& NodeBase::id() const
{
- return m_id;
+ return id_;
}
bool NodeBase::isValid() const
{
- return m_isValid;
+ return isValid_;
}
bool NodeBase::isMetadataValid() const
@@ -77,7 +80,7 @@
{
if (!m_dataRangeList.contains(range))
{
- sensordLogD() << "Introduced new data range for '" << id() << "':" << range.min << "-" << range.max << "," << range.resolution;
+ sensordLogD() << "Introduced new data range for '" << id_ << "':" << range.min << "-" << range.max << "," << range.resolution;
m_dataRangeList.append(range);
}
}
@@ -162,7 +165,7 @@
DataRangeRequest currentRequest = getCurrentDataRange();
if (!setDataRange(currentRequest.range, currentRequest.id))
{
- sensordLogW() << id() << "Failed to set DataRange.";
+ sensordLogW() << "Failed to set DataRange.";
}
emit propertyChanged("datarange");
}
@@ -183,7 +186,7 @@
}
if (index < 0) {
- sensordLogD() << id() << "No data range request for sessionId " << sessionId;
+ sensordLogD() << "No data range request for id " << sessionId;
return;
}
@@ -205,7 +208,7 @@
DataRangeRequest currentRequest = getCurrentDataRange();
if (!setDataRange(currentRequest.range, currentRequest.id))
{
- sensordLogW() << id() << "Failed to set DataRange.";
+ sensordLogW() << "Failed to set DataRange.";
}
emit propertyChanged("datarange");
}
@@ -270,7 +273,7 @@
{
if (!m_intervalList.contains(interval))
{
- sensordLogD() << "Introduced new interval for '" << id() << "':" << interval.min << "-" << interval.max;
+ sensordLogD() << "Introduced new interval for '" << id_ << "':" << interval.min << "-" << interval.max;
m_intervalList.append(interval);
}
}
@@ -281,12 +284,9 @@
if(ranges.isValid())
{
DataRangeList list(parseDataRangeList(ranges.toString(), 0));
- foreach(const DataRange& range_ms, list)
+ foreach(const DataRange& range, list)
{
- DataRange range_us(range_ms);
- range_us.min *= 1000;
- range_us.max *= 1000;
- introduceAvailableInterval(range_us);
+ introduceAvailableInterval(range);
}
}
}
@@ -314,19 +314,23 @@
return it.value();
}
-bool NodeBase::setIntervalRequest(const int sessionId, const unsigned int interval_us)
+bool NodeBase::setIntervalRequest(const int sessionId, const unsigned int value)
{
// Has single defined source, pass the request that way
if (!hasLocalInterval())
{
- return m_intervalSource->setIntervalRequest(sessionId, interval_us);
+ return m_intervalSource->setIntervalRequest(sessionId, value);
}
// Validate interval request
- unsigned int validatedInterval_us = validateIntervalRequest(interval_us);
+ if (!isValidIntervalRequest(value))
+ {
+ sensordLogW() << "Invalid interval requested for node '" << id() << "' by session '" << sessionId << "': " << value;
+ return false;
+ }
// Store the request for the session
- m_intervalMap[sessionId] = validatedInterval_us;
+ m_intervalMap[sessionId] = value;
// Store the current interval
unsigned int previousInterval = interval();
@@ -337,7 +341,7 @@
if (winningSessionId >= 0) {
sensordLogD() << "Setting new interval for node: " << id() << ". Evaluation won by session '" << winningSessionId << "' with request: " << winningRequest;
- setInterval(winningSessionId, winningRequest);
+ setInterval(winningRequest, winningSessionId);
}
// Signal listeners about change
@@ -423,45 +427,42 @@
unsigned int NodeBase::evaluateIntervalRequests(int& sessionId) const
{
- int chosenSessionId = -1;
- unsigned int chosenInterval_us = 0;
+ if (m_intervalMap.size() == 0)
+ {
+ sessionId = -1;
+ return defaultInterval();
+ }
+
+ // Get the winning request
+ QMap<int, unsigned int>::const_iterator it = m_intervalMap.constBegin();
+ unsigned int highestValue = it.value();
+ int winningSessionId = it.key();
- // Get the smallest positive request, 0 is reserved for HW wakeup
- for (QMap<int, unsigned int>::const_iterator it = m_intervalMap.constBegin(); it != m_intervalMap.constEnd(); ++it) {
- int iterSessionId = it.key();
- unsigned int iterInterval_us = it.value();
- if ((iterInterval_us > 0 && iterInterval_us < chosenInterval_us) || (chosenInterval_us == 0)) {
- chosenInterval_us = iterInterval_us;
- chosenSessionId = iterSessionId;
+ for (++it; it != m_intervalMap.constEnd(); ++it)
+ {
+ if (it.value() < highestValue) {
+ highestValue = it.value();
+ winningSessionId = it.key();
}
}
- if (chosenInterval_us == 0)
- chosenInterval_us = defaultInterval();
- sessionId = chosenSessionId;
- return chosenInterval_us;
+ sessionId = winningSessionId;
+ return highestValue;
}
unsigned int NodeBase::defaultInterval() const
{
- return m_defaultInterval_us;
+ return m_defaultInterval;
}
-bool NodeBase::setDefaultInterval(const unsigned int interval_us)
+bool NodeBase::setDefaultInterval(const unsigned int value)
{
- unsigned int validatedInterval_us = validateIntervalRequest(interval_us);
- if (validatedInterval_us == 0)
+ if (!isValidIntervalRequest(value))
{
- // With "use closes match" in use, the only way we get here is that:
- // a) zero interval was requested -> useless
- // b) no interval ranges were defined -> logic error
- if (interval_us == 0)
- sensordLogW() << id() << "Attempting to set invalid default data rate:" << interval_us;
- else
- sensordLogW() << id() << "Attempting to set default data rate:" << interval_us << "without defining possible data rates";
+ sensordLogW() << "Attempting to define invalid default data rate:" << value;
return false;
}
- m_defaultInterval_us = validatedInterval_us;
+ m_defaultInterval = value;
m_hasDefault = true;
return true;
}
@@ -501,7 +502,7 @@
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/nodebase.h
^
|
| @@ -182,7 +182,7 @@
* @param value interval value is milliseconds.
* @return was request succesful.
*/
- bool setIntervalRequest(int sessionId, unsigned int interval_us);
+ bool setIntervalRequest(int sessionId, unsigned int value);
/**
* Request default interval for the node.
@@ -248,7 +248,7 @@
/**
* Get current buffer interval of the node.
*
- * @return current buffer interval in microseconds.
+ * @return current buffer interval in milliseconds.
*/
virtual unsigned int bufferInterval() const { return 0; }
@@ -276,7 +276,7 @@
* @param value interval in milliseconds.
* @return was interval se succesfully.
*/
- bool setBufferInterval(int sessionId, unsigned int interval_us);
+ bool setBufferInterval(int sessionId, unsigned int value);
/**
* Clear buffer interval requests of given session.
@@ -431,7 +431,7 @@
* @param sessionId Session ID.
* @return was interval set succesfully.
*/
- virtual bool setInterval(int sessionId, unsigned int interval_us);
+ virtual bool setInterval(unsigned int value, int sessionId);
/**
* Does node have locally set interval.
@@ -474,7 +474,7 @@
* @param value Value to use as default interval.
* @return was interval set succesfully.
*/
- bool setDefaultInterval(unsigned int interval_us);
+ bool setDefaultInterval(unsigned int value);
/**
* Validate an interval request.
@@ -482,7 +482,7 @@
* @param value Value to validate.
* @return is valid request.
*/
- unsigned int validateIntervalRequest(unsigned int interval_us) const;
+ bool isValidIntervalRequest(unsigned int value) const;
/**
* Find buffer with given name.
@@ -508,10 +508,13 @@
* @param value buffer interval.
* @return was buffer interval set succesfully.
*/
- virtual bool setBufferInterval(unsigned int interval_us);
+ virtual bool setBufferInterval(unsigned int value);
QMap<int, unsigned int> m_intervalMap; /**< active interval requests for sessions */
+ unsigned int m_bufferSize; /** buffer size */
+ unsigned int m_bufferInterval; /** buffer interval */
+
private:
/**
* Returns whether the class defines its own output data range, or
@@ -555,7 +558,7 @@
QList<DataRange> m_intervalList; /**< available intervals */
NodeBase* m_intervalSource; /**< interval sources */
bool m_hasDefault; /**< does node have locally set interval */
- unsigned int m_defaultInterval_us; /**< locally set interval */
+ unsigned int m_defaultInterval; /**< locally set interval */
QList<NodeBase*> m_sourceList; /**< source nodes */
@@ -563,8 +566,10 @@
QMap<int, unsigned int> m_bufferSizeMap; /**< buffersize requests for sessions. */
QMap<int, unsigned int> m_bufferIntervalMap; /**< buffer interval requests for sessions. */
- QString m_id; /**< node ID */
- bool m_isValid; /**< is node correctly initialized */
+ const DataRangeRequest DEFAULT_DATA_RANGE_REQUEST; /**< default data range request */
+
+ QString id_; /**< node ID */
+ bool isValid_; /**< is node correctly initialized */
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/sockethandler.cpp
^
|
| @@ -29,33 +29,32 @@
#include <QLocalSocket>
#include <QLocalServer>
#include <sys/socket.h>
-#include <sys/time.h>
#include "logging.h"
#include "sockethandler.h"
#include <unistd.h>
#include <limits.h>
SessionData::SessionData(QLocalSocket* socket, QObject* parent) : QObject(parent),
- m_socket(socket),
- m_interval_us(-1),
- m_buffer(nullptr),
- m_size(0),
- m_count(0),
- m_bufferSize(1),
- m_bufferInterval_us(0),
- m_downsampling(false)
-{
- m_lastWrite.tv_sec = 0;
- m_lastWrite.tv_usec = 0;
- m_timer.setSingleShot(true);
- connect(&m_timer, SIGNAL(timeout()), this, SLOT(timerTimeout()));
+ socket(socket),
+ interval(-1),
+ buffer(0),
+ size(0),
+ count(0),
+ bufferSize(1),
+ bufferInterval(0),
+ downsampling(false)
+{
+ lastWrite.tv_sec = 0;
+ lastWrite.tv_usec = 0;
+ timer.setSingleShot(true);
+ connect(&timer, SIGNAL(timeout()), this, SLOT(timerTimeout()));
}
SessionData::~SessionData()
{
- m_timer.stop();
- delete m_socket;
- delete[] m_buffer;
+ timer.stop();
+ delete socket;
+ delete[] buffer;
}
void SessionData::timerTimeout()
@@ -65,25 +64,22 @@
long SessionData::sinceLastWrite() const
{
- if(m_lastWrite.tv_sec == 0)
+ if(lastWrite.tv_sec == 0)
return LONG_MAX;
- struct timeval now = {0, 0};
+ struct timeval now;
gettimeofday(&now, 0);
- struct timeval diff;
- timersub(&now, &m_lastWrite, &diff);
- long interval_us = diff.tv_sec * 1000000L + diff.tv_usec;
- return interval_us;
+ return (now.tv_sec - lastWrite.tv_sec) * 1000 + ((now.tv_usec - lastWrite.tv_usec) / 1000);
}
bool SessionData::write(void* source, int size, unsigned int count)
{
- if(m_socket && count)
+ if(socket && count)
{
memcpy(source, &count, sizeof(unsigned int));
- int written = m_socket->write((const char*)source, size * count + sizeof(unsigned int));
+ int written = socket->write((const char*)source, size * count + sizeof(unsigned int));
if(written < 0)
{
- sensordLogW() << "[SocketHandler]: failed to write payload to the socket: " << m_socket->errorString();
+ sensordLogW() << "[SocketHandler]: failed to write payload to the socket: " << socket->errorString();
return false;
}
return true;
@@ -93,48 +89,44 @@
bool SessionData::write(const void* source, int size)
{
- long since_us = sinceLastWrite();
- int allocSize = m_bufferSize * size + sizeof(unsigned int);
- if(!m_buffer)
+ long since = sinceLastWrite();
+ int allocSize = bufferSize * size + sizeof(unsigned int);
+ if(!buffer)
+ buffer = new char[allocSize];
+ else if(size != this->size)
{
- m_buffer = new char[allocSize];
- }
- else if(size != m_size)
- {
- m_socket->waitForBytesWritten();
- delete[] m_buffer;
- m_buffer = new char[allocSize];
+ socket->waitForBytesWritten();
+ delete[] buffer;
+ buffer = new char[allocSize];
}
- m_size = size;
- if(m_bufferSize <= 1)
+ this->size = size;
+ if(bufferSize <= 1)
{
- memcpy(m_buffer + sizeof(unsigned int), source, size);
- if(!m_downsampling || (m_downsampling && since_us >= m_interval_us))
+ memcpy(buffer + sizeof(unsigned int), source, size);
+ if(!downsampling || (downsampling && since >= interval))
{
- gettimeofday(&m_lastWrite, 0);
- return write(m_buffer, size, 1);
+ gettimeofday(&lastWrite, 0);
+ return write(buffer, size, 1);
}
}
else
{
- memcpy(m_buffer + sizeof(unsigned int) + size * m_count, source, size);
- ++m_count;
- if(m_bufferSize == m_count)
+ memcpy(buffer + sizeof(unsigned int) + size * count, source, size);
+ ++count;
+ if(bufferSize == count)
{
return delayedWrite();
}
}
- if(!m_timer.isActive())
+ if(!timer.isActive())
{
- if(m_bufferSize > 1 && m_bufferInterval_us)
+ if(bufferSize > 1 && bufferInterval)
{
- int interval_ms = (m_bufferInterval_us + 999) / 1000;
- m_timer.start(interval_ms);
+ timer.start(bufferInterval);
}
- else if(!m_bufferSize && m_interval_us > since_us)
+ else if(!bufferSize && (interval - since) > 0)
{
- int interval_ms = (m_interval_us - since_us + 999) / 1000;
- m_timer.start(interval_ms);
+ timer.start(interval - since);
}
}
return true;
@@ -142,81 +134,81 @@
bool SessionData::delayedWrite()
{
- if(m_timer.isActive())
- m_timer.stop();
- gettimeofday(&m_lastWrite, 0);
- bool ret = write(m_buffer, m_size, m_count);
- m_count = 0;
+ if(timer.isActive())
+ timer.stop();
+ gettimeofday(&lastWrite, 0);
+ bool ret = write(buffer, size, count);
+ count = 0;
return ret;
}
QLocalSocket* SessionData::stealSocket()
{
- QLocalSocket *tmpsocket = m_socket;
- m_socket = nullptr;
+ QLocalSocket* tmpsocket = socket;
+ socket = 0;
return tmpsocket;
}
QLocalSocket* SessionData::getSocket() const
{
- return m_socket;
+ return socket;
}
-void SessionData::setInterval(int interval_us)
+void SessionData::setInterval(int interval)
{
- m_interval_us = interval_us;
+ this->interval = interval;
}
int SessionData::getInterval() const
{
- return m_interval_us;
+ return interval;
}
-void SessionData::setBufferInterval(unsigned int interval_us)
+void SessionData::setBufferInterval(unsigned int interval)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/sockethandler.h
^
|
| @@ -92,7 +92,7 @@
*
* @param interval Interval in milliseconds.
*/
- void setInterval(int interval_us);
+ void setInterval(int interval);
/**
* Get used interval for the data stream.
@@ -122,7 +122,7 @@
*
* @param interval interval in milliseconds.
*/
- void setBufferInterval(unsigned int interval_us);
+ void setBufferInterval(unsigned int interval);
/**
* Get buffer inteval for the data stream.
@@ -171,16 +171,16 @@
*/
bool delayedWrite();
- QLocalSocket *m_socket; /**< socket pointer. */
- int m_interval_us; /**< interval in milliseconds. */
- char *m_buffer; /**< pointer to buffer allocation. */
- int m_size; /**< allocated buffer size. */
- unsigned int m_count; /**< how many elements are in the buffer */
- struct timeval m_lastWrite; /**< when data was written last time */
- QTimer m_timer; /**< timer for delayed write */
- unsigned int m_bufferSize; /**< buffer size */
- unsigned int m_bufferInterval_us; /**< buffer interval in milliseconds */
- bool m_downsampling; /**< sample dropping */
+ QLocalSocket* socket; /**< socket pointer. */
+ int interval; /**< interval in milliseconds. */
+ char* buffer; /**< pointer to buffer allocation. */
+ int size; /**< allocated buffer size. */
+ unsigned int count; /**< how many elements are in the buffer */
+ struct timeval lastWrite; /**< when data was written last time */
+ QTimer timer; /**< timer for delayed write */
+ unsigned int bufferSize; /**< buffer size */
+ unsigned int bufferInterval; /**< buffer interval in milliseconds */
+ bool downsampling; /**< sample dropping */
private slots:
@@ -260,7 +260,7 @@
* @param sessionId Session ID.
* @param value Interval in milliseconds.
*/
- void setInterval(int sessionId, int interval_us);
+ void setInterval(int sessionId, int value);
/**
* Remove set interval from given session.
@@ -310,7 +310,7 @@
* @param sessionId Session ID.
* @param value buffer inteval in milliseconds.
*/
- void setBufferInterval(int sessionId, unsigned int interval_us);
+ void setBufferInterval(int sessionId, unsigned int value);
/**
* Remove set buffer inteval for given session.
@@ -324,7 +324,7 @@
* #SessionData::bufferInterval().
*
* @param sessionId Session ID.
- * @return interval in microseconds.
+ * @return interval in milliseconds.
*/
unsigned int bufferInterval(int sessionId) const;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/sysfsadaptor.cpp
^
|
| @@ -43,21 +43,21 @@
const QString& path,
const int pathId) :
DeviceAdaptor(id),
- m_reader(this),
- m_mode(mode),
- m_epollDescriptor(-1),
- m_interval_us(0),
- m_inStandbyMode(false),
- m_running(false),
- m_shouldBeRunning(false),
- m_doSeek(seek)
+ reader_(this),
+ mode_(mode),
+ epollDescriptor_(-1),
+ interval_(0),
+ inStandbyMode_(false),
+ running_(false),
+ shouldBeRunning_(false),
+ doSeek_(seek)
{
if (!path.isEmpty()) {
addPath(path, pathId);
}
- m_pipeDescriptors[0] = -1;
- m_pipeDescriptors[1] = -1;
+ pipeDescriptors_[0] = -1;
+ pipeDescriptors_[1] = -1;
}
SysfsAdaptor::~SysfsAdaptor()
@@ -67,21 +67,21 @@
bool SysfsAdaptor::addPath(const QString& path, const int id)
{
- qDebug() << NodeBase::id() << Q_FUNC_INFO << path;
+ qDebug() << Q_FUNC_INFO << path;
if (!QFile::exists(path)) {
return false;
}
- m_paths.append(path);
- m_pathIds.append(id);
+ paths_.append(path);
+ pathIds_.append(id);
return true;
}
bool SysfsAdaptor::isRunning() const
{
- return m_running;
+ return running_;
}
bool SysfsAdaptor::startAdaptor()
@@ -102,7 +102,7 @@
AdaptedSensorEntry *entry = getAdaptedSensor();
if (entry == NULL) {
- sensordLogW() << id() << "Sensor not found: " << name();
+ sensordLogW() << "Sensor not found: " << name();
return false;
}
@@ -114,27 +114,27 @@
return false;
}
- m_shouldBeRunning = true;
+ shouldBeRunning_ = true;
// Do not open if in standby mode.
- if (m_inStandbyMode && !deviceStandbyOverride()) {
+ if (inStandbyMode_ && !deviceStandbyOverride()) {
return false;
}
/// We are waking up from standby or starting fresh, no matter
- m_inStandbyMode = false;
+ inStandbyMode_ = false;
if (!startReaderThread()) {
- sensordLogW() << id() << "Failed to start adaptor " << name();
+ sensordLogW() << "Failed to start adaptor " << name();
entry->removeReference();
entry->setIsRunning(false);
- m_running = false;
- m_shouldBeRunning = false;
+ running_ = false;
+ shouldBeRunning_ = false;
return false;
}
entry->setIsRunning(true);
- m_running = true;
+ running_ = true;
return true;
}
@@ -144,25 +144,25 @@
AdaptedSensorEntry *entry = getAdaptedSensor();
if (entry == NULL) {
- sensordLogW() << id() << "Sensor not found " << name();
+ sensordLogW() << "Sensor not found " << name();
return;
}
entry->removeReference();
if (entry->referenceCount() <= 0) {
- if (!m_inStandbyMode) {
+ if (!inStandbyMode_) {
stopReaderThread();
closeAllFds();
}
entry->setIsRunning(false);
- m_running = false;
+ running_ = false;
}
}
bool SysfsAdaptor::standby()
{
sensordLogD() << "Adaptor '" << id() << "' requested to go to standby";
- if (m_inStandbyMode) {
+ if (inStandbyMode_) {
sensordLogD() << "Adaptor '" << id() << "' not going to standby: already in standby";
return false;
}
@@ -175,13 +175,13 @@
return false;
}
- m_inStandbyMode = true;
- m_shouldBeRunning = true;
+ inStandbyMode_ = true;
+ shouldBeRunning_ = true;
sensordLogD() << "Adaptor '" << id() << "' going to standby";
stopReaderThread();
closeAllFds();
- m_running = false;
+ running_ = false;
stopAdaptor();
return true;
}
@@ -191,59 +191,59 @@
sensordLogD() << "Adaptor '" << id() << "' requested to resume from standby";
// Don't resume if not in standby
- if (!m_inStandbyMode) {
+ if (!inStandbyMode_) {
sensordLogD() << "Adaptor '" << id() << "' not resuming: not in standby";
return false;
}
- if (!m_shouldBeRunning) {
+ if (!shouldBeRunning_) {
sensordLogD() << "Adaptor '" << id() << "' not resuming from standby: not running";
return false;
}
sensordLogD() << "Adaptor '" << id() << "' resuming from standby";
- m_inStandbyMode = false;
+ inStandbyMode_ = false;
if (!startReaderThread()) {
sensordLogW() << "Adaptor '" << id() << "' failed to resume from standby!";
return false;
}
- m_running = true;
+ running_ = true;
startAdaptor();
return true;
}
bool SysfsAdaptor::openFds()
{
- QMutexLocker locker(&m_mutex);
+ QMutexLocker locker(&mutex_);
int fd;
- for (int i = 0; i < m_paths.size(); i++) {
- if ((fd = open(m_paths.at(i).toLatin1().constData(), O_RDONLY)) == -1) {
- sensordLogW() << id() << "open(): " << strerror(errno);
+ for (int i = 0; i < paths_.size(); i++) {
+ if ((fd = open(paths_.at(i).toLatin1().constData(), O_RDONLY)) == -1) {
+ sensordLogW() << "open(): " << strerror(errno);
return false;
}
- m_sysfsDescriptors.append(fd);
+ sysfsDescriptors_.append(fd);
}
// Set up epoll for select mode
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/core/sysfsadaptor.h
^
|
| @@ -73,8 +73,8 @@
void startReader();
private:
- bool m_running; /**< should thread be running or not */
- SysfsAdaptor *m_parent; /**< parent object. */
+ bool running_; /**< should thread be running or not */
+ SysfsAdaptor *parent_; /**< parent object. */
};
/**
@@ -204,7 +204,7 @@
* to allow for proper state maintenance.
* @return \c true on successfull set (valid value), \c false otherwise.
*/
- virtual bool setInterval(const int sessionId, const unsigned int interval_us);
+ virtual bool setInterval(const unsigned int value, const int sessionId);
/**
* Tells which mode the adaptor is using for getting input.
@@ -245,19 +245,19 @@
*/
bool checkIntervalUsage() const;
- SysfsAdaptorReader m_reader; /**< reader thread instance */
- PollMode m_mode; /**< used poll mode */
- int m_epollDescriptor; /**< open epoll descriptors */
- int m_pipeDescriptors[2]; /**< open pipe descriptors */
- QStringList m_paths; /**< added paths. */
- QList<int> m_pathIds; /**< added path IDs. */
- unsigned int m_interval_us; /**< used interval */
- bool m_inStandbyMode; /**< are we in standby */
- bool m_running; /**< are we running */
- bool m_shouldBeRunning; /**< should we be running */
- bool m_doSeek; /**< should lseek() be performed after reading */
- QList<int> m_sysfsDescriptors; /**< List of open file descriptors. */
- QMutex m_mutex; /**< mutex protecting starting and stopping. */
+ SysfsAdaptorReader reader_; /**< reader thread instance */
+ PollMode mode_; /**< used poll mode */
+ int epollDescriptor_; /**< open epoll descriptors */
+ int pipeDescriptors_[2]; /**< open pipe descriptors */
+ QStringList paths_; /**< added paths. */
+ QList<int> pathIds_; /**< added path IDs. */
+ unsigned int interval_; /**< used interval */
+ bool inStandbyMode_; /**< are we in standby */
+ bool running_; /**< are we running */
+ bool shouldBeRunning_; /**< should we be running */
+ bool doSeek_; /**< should lseek() be performed after reading */
+ QList<int> sysfsDescriptors_; /**< List of open file descriptors. */
+ QMutex mutex_; /** mutex protecting starting and stopping. */
friend class SysfsAdaptorReader;
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/datatypes/genericdata.h
^
|
| @@ -65,11 +65,11 @@
* @param y Y coordinate.
* @param z Z coordinate.
*/
- TimedXyzData(const quint64& timestamp, float x, float y, float z) : TimedData(timestamp), x_(x), y_(y), z_(z) {}
+ TimedXyzData(const quint64& timestamp, int x, int y, int z) : TimedData(timestamp), x_(x), y_(y), z_(z) {}
- float x_; /**< X value */
- float y_; /**< Y value */
- float z_; /**< Z value */
+ int x_; /**< X value */
+ int y_; /**< Y value */
+ int z_; /**< Z value */
};
Q_DECLARE_METATYPE ( TimedXyzData )
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/datatypes/orientation.h
^
|
| @@ -90,21 +90,21 @@
*
* @return X coordinate.
*/
- float x() const { return data_.x_; }
+ int x() const { return data_.x_; }
/**
* Accessor for Y coordinate.
*
* @return Y coordinate.
*/
- float y() const { return data_.y_; }
+ int y() const { return data_.y_; }
/**
* Accessor for Z coordinate.
*
* @return Z coordinate.
*/
- float z() const { return data_.z_; }
+ int z() const { return data_.z_; }
/**
* Accessor for display orientation.
@@ -132,7 +132,6 @@
*/
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();
@@ -148,13 +147,8 @@
*/
inline const QDBusArgument &operator>>(const QDBusArgument &argument, Orientation &orientation)
{
- // No floats on D-Bus: Explicit double to float conversion
argument.beginStructure();
- 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 >> orientation.data_.timestamp_ >> orientation.data_.x_ >> orientation.data_.y_ >> orientation.data_.z_;
argument.endStructure();
return argument;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/datatypes/xyz.h
^
|
| @@ -27,8 +27,6 @@
#ifndef XYZ_H
#define XYZ_H
-#include <math.h>
-
#include <QDBusArgument>
#include <datatypes/orientationdata.h>
@@ -74,19 +72,19 @@
* Returns the value for X.
* @return x value.
*/
- float x() const { return data_.x_; }
+ int x() const { return data_.x_; }
/**
* Returns the value for Y.
* @return y value.
*/
- float y() const { return data_.y_; }
+ int y() const { return data_.y_; }
/**
* Returns the value for Z.
* @return z value.
*/
- float z() const { return data_.z_; }
+ int z() const { return data_.z_; }
/**
* Assignment operator.
@@ -99,6 +97,21 @@
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. */
@@ -116,7 +129,6 @@
*/
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();
@@ -132,13 +144,8 @@
*/
inline const QDBusArgument &operator>>(const QDBusArgument &argument, XYZ &xyz)
{
- // No floats on D-Bus: Explicit double to float conversion
argument.beginStructure();
- 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 >> xyz.data_.timestamp_ >> xyz.data_.x_ >> xyz.data_.y_ >> xyz.data_.z_;
argument.endStructure();
return argument;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/debian/changelog
^
|
| @@ -1,55 +1,3 @@
-sensorfw-qt5 (0.14.3) unstable; urgency=medium
-
- * [sensorfwd] Use ms values for getAvailableIntervals() reply. Fixes JB#60583
-
- -- Simo Piiroinen <simo.piiroinen@jolla.com> Tue, 18 Apr 2023 15:33:32 +0300
-
-sensorfw-qt5 (0.14.2) unstable; urgency=medium
-
- * [hybrisadaptor] Fix build errors from unresolvable id() calls. JB#60480
-
- -- Simo Piiroinen <simo.piiroinen@jolla.com> Thu, 06 Apr 2023 10:15:22 +0300
-
-sensorfw-qt5 (0.14.1) unstable; urgency=medium
-
- * [sensorfwd] Add node id to diagnostic logging messages
- * [hybrisadaptor] Define data and interval ranges earlier. JB#60480
- * [hybrisadaptor] Silence als/ps initial value warnings. Fixes JB#60480
-
- -- Simo Piiroinen <simo.piiroinen@jolla.com> Thu, 06 Apr 2023 09:11:11 +0300
-
-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
- * [sensorfw] Normalize setInterval() parameter order. Fixes JB#60301
- * [sensorfw] Explicitly indicate interval time units. JB#60313
- * [sensorfw] Add setDataRate() D-Bus method. JB#60417
- * [sensorfw] Handle intervals in microsecond granularity. Fixes JB#60313
- * [sensorfw] Drop evaluateIntervalRequests overloading. JB#60314
- * [nodebase] Use closest supported data rate. Fixes JB#60314
- * [declinationfilter] Add unit suffixes to time values
- * [nodebase] Remove dead code
- * [nodebase] Use m_variableName convention for all members
-
- -- Simo Piiroinen <simo.piiroinen@jolla.com> Tue, 28 Mar 2023 11:43:04 +0300
-
-sensorfw-qt5 (0.12.7) unstable; urgency=medium
-
- * [hybrisadaptor] Force cancellation of pending POLL transaction. JB#60298
- * [hybrisadaptor] Read and process capped number of events. JB#60298
- * [hybrisadaptor] Shuffle cleanup order. JB#60298
- * [sendorfwd] Skip deadlocking libgbinder cleanup. Fixes JB#60298
-
- -- Simo Piiroinen <simo.piiroinen@jolla.com> Mon, 20 Mar 2023 08:47:28 +0200
-
sensorfw-qt5 (0.12.6) unstable; urgency=medium
* [sensorfw] Add support for sensor binder API 2
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/filters/declinationfilter/declinationfilter.cpp
^
|
| @@ -31,35 +31,33 @@
#include "config.h"
#include "logging.h"
-const char *DeclinationFilter::s_declinationKey = "/system/osso/location/settings/magneticvariation";
+const char* DeclinationFilter::declinationKey = "/system/osso/location/settings/magneticvariation";
DeclinationFilter::DeclinationFilter() :
Filter<CompassData, DeclinationFilter, CompassData>(this, &DeclinationFilter::correct),
- m_declinationCorrection(0),
- m_lastUpdate_us(0)
+ declinationCorrection_(0),
+ lastUpdate_(0)
{
- // XXX: multiplication order is a bit fishy, but: config = milliseconds, default is 1 hour?
- quint64 updateInterval_ms = SensorFrameworkConfig::configuration()->value<quint64>("compass/declination_update_interval", 1000 * 60 * 60);
- m_updateInterval_us = updateInterval_ms * 1000;
+ updateInterval_ = SensorFrameworkConfig::configuration()->value<quint64>("compass/declination_update_interval", 1000 * 60 * 60) * 1000;
loadSettings();
}
void DeclinationFilter::correct(unsigned, const CompassData* data)
{
CompassData newOrientation(*data);
- if (newOrientation.timestamp_ - m_lastUpdate_us > m_updateInterval_us) {
+ if (newOrientation.timestamp_ - lastUpdate_ > updateInterval_) {
loadSettings();
- m_lastUpdate_us = newOrientation.timestamp_;
+ lastUpdate_ = newOrientation.timestamp_;
}
newOrientation.correctedDegrees_ = newOrientation.degrees_;
- if (m_declinationCorrection.loadAcquire() != 0) {
- newOrientation.correctedDegrees_ += m_declinationCorrection.loadAcquire();
+ if (declinationCorrection_.loadAcquire() != 0) {
+ newOrientation.correctedDegrees_ += declinationCorrection_.loadAcquire();
newOrientation.correctedDegrees_ %= 360;
// sensordLogT() << "DeclinationFilter corrected degree " << newOrientation.degrees_ << " => " << newOrientation.correctedDegrees_ << ". Level: " << newOrientation.level_;
}
- m_orientation = newOrientation;
- source_.propagate(1, &m_orientation);
+ orientation_ = newOrientation;
+ source_.propagate(1, &orientation_);
}
void DeclinationFilter::loadSettings()
@@ -68,13 +66,13 @@
confFile.beginGroup("location");
double declination = confFile.value("declination",0).toDouble();
if (declination != 0) {
- m_declinationCorrection = declination;
+ declinationCorrection_ = declination;
}
- sensordLogD() << "Fetched declination correction from GConf: " << m_declinationCorrection.loadAcquire();
+ sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_.loadAcquire();
}
int DeclinationFilter::declinationCorrection()
{
loadSettings();
- return m_declinationCorrection.loadAcquire();
+ return declinationCorrection_.loadAcquire();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/filters/declinationfilter/declinationfilter.h
^
|
| @@ -63,12 +63,12 @@
void loadSettings();
- CompassData m_orientation;
- QAtomicInt m_declinationCorrection;
- quint64 m_lastUpdate_us;
- quint64 m_updateInterval_us;
+ CompassData orientation_;
+ QAtomicInt declinationCorrection_;
+ quint64 lastUpdate_;
+ quint64 updateInterval_;
- static const char *s_declinationKey;
+ static const char* declinationKey;
};
#endif // DECLINATIONFILTER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/filters/downsamplefilter/downsamplefilter.cpp
^
|
| @@ -77,9 +77,9 @@
if(static_cast<unsigned int>(buffer_.size()) < bufferSize_)
return;
- float x = 0;
- float y = 0;
- float z = 0;
+ long x = 0;
+ long y = 0;
+ long z = 0;
foreach(const TimedXyzData& data, buffer_)
{
x += data.x_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/filters/orientationinterpreter/orientationinterpreter.cpp
^
|
| @@ -34,7 +34,7 @@
#include <stdlib.h>
#include <limits.h>
-const double OrientationInterpreter::RADIANS_TO_DEGREES = 180.0/M_PI;
+const float 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
- float x = 0;
- float y = 0;
- float z = 0;
+ long x = 0;
+ long y = 0;
+ long z = 0;
foreach (const AccelerationData& sample, dataBuffer)
{
x += sample.x_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.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 double RADIANS_TO_DEGREES;
+ static const float RADIANS_TO_DEGREES;
static const int SAME_AXIS_LIMIT;
static const int OVERFLOW_MIN;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/filters/rotationfilter/rotationfilter.cpp
^
|
| @@ -39,7 +39,7 @@
void RotationFilter::interpret(unsigned, const TimedXyzData* data)
{
- const double RADIANS_TO_DEGREES = 180/M_PI;
+ const int RADIANS_TO_DEGREES = 180/M_PI;
rotation_.timestamp_ = data->timestamp_;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/qt-api/abstractsensor_i.cpp
^
|
| @@ -40,37 +40,37 @@
AbstractSensorChannelInterfaceImpl(QObject* parent, int sessionId, const QString& path, const char* interfaceName);
void dbusConnectNotify(const QMetaMethod& signal) { QDBusAbstractInterface::connectNotify(signal); }
- SensorError m_errorCode;
- QString m_errorString;
- int m_sessionId;
- int m_interval_us;
- unsigned int m_bufferInterval_ms;
- unsigned int m_bufferSize;
- SocketReader m_socketReader;
- bool m_running;
- bool m_standbyOverride;
- bool m_downsampling;
+ SensorError errorCode_;
+ QString errorString_;
+ int sessionId_;
+ int interval_;
+ unsigned int bufferInterval_;
+ unsigned int bufferSize_;
+ SocketReader socketReader_;
+ bool running_;
+ bool standbyOverride_;
+ bool downsampling_;
};
AbstractSensorChannelInterface::AbstractSensorChannelInterfaceImpl::AbstractSensorChannelInterfaceImpl(QObject* parent, int sessionId, const QString& path, const char* interfaceName) :
QDBusAbstractInterface(SERVICE_NAME, path, interfaceName, QDBusConnection::systemBus(), 0),
- m_errorCode(SNoError),
- m_errorString(""),
- m_sessionId(sessionId),
- m_interval_us(0),
- m_bufferInterval_ms(0),
- m_bufferSize(1),
- m_socketReader(parent),
- m_running(false),
- m_standbyOverride(false),
- m_downsampling(true)
+ errorCode_(SNoError),
+ errorString_(""),
+ sessionId_(sessionId),
+ interval_(0),
+ bufferInterval_(0),
+ bufferSize_(1),
+ socketReader_(parent),
+ running_(false),
+ standbyOverride_(false),
+ downsampling_(true)
{
}
AbstractSensorChannelInterface::AbstractSensorChannelInterface(const QString& path, const char* interfaceName, int sessionId) :
pimpl_(new AbstractSensorChannelInterfaceImpl(this, sessionId, path, interfaceName))
{
- if (!pimpl_->m_socketReader.initiateConnection(sessionId)) {
+ if (!pimpl_->socketReader_.initiateConnection(sessionId)) {
setError(SClientSocketError, "Socket connection failed.");
}
#ifdef SENSORFW_MCE_WATCHER
@@ -90,15 +90,15 @@
AbstractSensorChannelInterface::~AbstractSensorChannelInterface()
{
if ( pimpl_->isValid() )
- SensorManagerInterface::instance().releaseInterface(id(), pimpl_->m_sessionId);
- if (!pimpl_->m_socketReader.dropConnection())
+ SensorManagerInterface::instance().releaseInterface(id(), pimpl_->sessionId_);
+ if (!pimpl_->socketReader_.dropConnection())
setError(SClientSocketError, "Socket disconnect failed.");
delete pimpl_;
}
SocketReader& AbstractSensorChannelInterface::getSocketReader() const
{
- return pimpl_->m_socketReader;
+ return pimpl_->socketReader_;
}
bool AbstractSensorChannelInterface::release()
@@ -108,35 +108,35 @@
void AbstractSensorChannelInterface::setError(SensorError errorCode, const QString& errorString)
{
- pimpl_->m_errorCode = errorCode;
- pimpl_->m_errorString = errorString;
+ pimpl_->errorCode_ = errorCode;
+ pimpl_->errorString_ = errorString;
}
QDBusReply<void> AbstractSensorChannelInterface::start()
{
- return start(pimpl_->m_sessionId);
+ return start(pimpl_->sessionId_);
}
QDBusReply<void> AbstractSensorChannelInterface::stop()
{
- return stop(pimpl_->m_sessionId);
+ return stop(pimpl_->sessionId_);
}
QDBusReply<void> AbstractSensorChannelInterface::start(int sessionId)
{
clearError();
- if (pimpl_->m_running) {
+ if (pimpl_->running_) {
return QDBusReply<void>();
}
- pimpl_->m_running = true;
+ pimpl_->running_ = true;
// Discard any old data already in the socket
- if (pimpl_->m_socketReader.socket()->bytesAvailable() > 0) {
- pimpl_->m_socketReader.socket()->readAll();
+ if (pimpl_->socketReader_.socket()->bytesAvailable() > 0) {
+ pimpl_->socketReader_.socket()->readAll();
}
- connect(pimpl_->m_socketReader.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
+ connect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId);
@@ -146,11 +146,11 @@
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
SLOT(startFinished(QDBusPendingCallWatcher*)));
- setStandbyOverride(sessionId, pimpl_->m_standbyOverride);
- setDataRate(sessionId, dataRate());
- setBufferInterval(sessionId, pimpl_->m_bufferInterval_ms);
- setBufferSize(sessionId, pimpl_->m_bufferSize);
- setDownsampling(pimpl_->m_sessionId, pimpl_->m_downsampling);
+ setStandbyOverride(sessionId, pimpl_->standbyOverride_);
+ setInterval(sessionId, pimpl_->interval_);
+ setBufferInterval(sessionId, pimpl_->bufferInterval_);
+ setBufferSize(sessionId, pimpl_->bufferSize_);
+ setDownsampling(pimpl_->sessionId_, pimpl_->downsampling_);
return returnValue;
}
@@ -169,12 +169,12 @@
QDBusReply<void> AbstractSensorChannelInterface::stop(int sessionId)
{
clearError();
- if (!pimpl_->m_running) {
+ if (!pimpl_->running_) {
return QDBusReply<void>();
}
- pimpl_->m_running = false ;
+ pimpl_->running_ = false ;
- disconnect(pimpl_->m_socketReader.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
+ disconnect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId);
@@ -197,12 +197,12 @@
}
}
-QDBusReply<void> AbstractSensorChannelInterface::setInterval(int sessionId, int interval_ms)
+QDBusReply<void> AbstractSensorChannelInterface::setInterval(int sessionId, int value)
{
clearError();
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(sessionId) << qVariantFromValue(interval_ms);
+ argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setInterval"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -221,36 +221,12 @@
}
}
-QDBusReply<void> AbstractSensorChannelInterface::setDataRate(int sessionId, double dataRate_Hz)
+QDBusReply<void> AbstractSensorChannelInterface::setBufferInterval(int sessionId, unsigned int value)
{
clearError();
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(sessionId) << qVariantFromValue(dataRate_Hz);
- QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setDataRate"), argumentList);
- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
- connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
- SLOT(setDataRateFinished(QDBusPendingCallWatcher*)));
- return returnValue;
-}
-
-void AbstractSensorChannelInterface::setDataRateFinished(QDBusPendingCallWatcher *watch)
-{
- watch->deleteLater();
- QDBusPendingReply<void> reply = *watch;
-
- if(reply.isError()) {
- qDebug() << reply.error().message();
- setError(SaCannotAccessSensor, reply.error().message());
- }
-}
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/qt-api/abstractsensor_i.h
^
|
| @@ -51,7 +51,6 @@
Q_PROPERTY(QString errorString READ errorString)
Q_PROPERTY(QString description READ description)
Q_PROPERTY(QString id READ id)
- Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate)
Q_PROPERTY(int interval READ interval WRITE setInterval)
Q_PROPERTY(bool standbyOverride READ standbyOverride WRITE setStandbyOverride)
Q_PROPERTY(QString type READ type)
@@ -118,25 +117,15 @@
* @return used sampling interval (in millisecs)
*/
int interval();
- double dataRate();
/**
* Set sensor sampling interval (in millisecs).
* Value "0" will clear previously set interval.
* Supported intervals are listed by #getAvailableIntervals().
*
- * @param interval_ms sampling interval (in millisecs).
+ * @param value sampling interval (in millisecs).
*/
- void setInterval(int interval_ms);
-
- /**
- * Set sensor sampling frequency (in Hertz).
- * Value "0" will clear previously set interval.
- * Supported intervals are listed by #getAvailableIntervals().
- *
- * @param dataRate_Hz sampling frequency (in Hertz).
- */
- void setDataRate(double dataRate_Hz);
+ void setInterval(int value);
/**
* Is standby-override enabled or not.
@@ -170,9 +159,9 @@
* buffered data to be flushed unless the buffer is filled before it.
* Supported intervals are listed by #getAvailableBufferIntervals().
*
- * @param interval_ms interval in millisecs.
+ * @param value interval in millisecs.
*/
- void setBufferInterval(unsigned int interval_ms);
+ void setBufferInterval(unsigned int value);
/**
* Is downsampling enabled or not.
@@ -332,19 +321,10 @@
* Set interval to session.
*
* @param sessionId session ID.
- * @param interval_ms interval.
- * @return DBus reply.
- */
- QDBusReply<void> setInterval(int sessionId, int interval_ms);
-
- /**
- * Set frequency to session.
- *
- * @param sessionId session ID.
- * @param dataRate_Hz frequency
+ * @param value interval.
* @return DBus reply.
*/
- QDBusReply<void> setDataRate(int sessionId, double dataRate_Hz);
+ QDBusReply<void> setInterval(int sessionId, int value);
/**
* Set standby-override to session.
@@ -362,7 +342,7 @@
* @param value buffer interval.
* @return DBus reply.
*/
- QDBusReply<void> setBufferInterval(int sessionId, unsigned int interval_ms);
+ QDBusReply<void> setBufferInterval(int sessionId, unsigned int value);
/**
* Set buffer size to session.
@@ -492,7 +472,6 @@
void stopFinished(QDBusPendingCallWatcher *watch);
void setIntervalFinished(QDBusPendingCallWatcher *watch);
- void setDataRateFinished(QDBusPendingCallWatcher *watch);
void setBufferIntervalFinished(QDBusPendingCallWatcher *watch);
void setBufferSizeFinished(QDBusPendingCallWatcher *watch);
void setStandbyOverrideFinished(QDBusPendingCallWatcher *watch);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.14.3
+Version: 0.12.6
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
Cflags: -I${includedir} -I${includedir}/datatypes
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensord/main.cpp
^
|
| @@ -287,26 +287,7 @@
sensordLogD() << "Exiting...";
SensorFrameworkConfig::close();
-
- /* Backends that use binder ipc can end up deadlocked at
- *
- * void gbinder_ipc_exit(void)
- * __attribute__((visibility("hidden")))
- * __attribute__((destructor));
- *
- * due to a transaction of yet unknown origin that is never going
- * to get finalized. Which them makes stopping of sensorfwd systemd
- * service go via TERM-wait-timeout-KILL cycle.
- *
- * As a workaround to this we can skip all after-exit cleanup code
- * by terminating via _exit() rather than exit() or return from
- * main().
- *
- * And as sensorfwd itself does not and is not supposed to know
- * whether backend uses binder ipc or not, we need to do this by
- * default.
- */
- _exit(ret);
+ return ret;
}
void printUsage()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/accelerometersensor/accelerometersensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool AccelerometerSensorChannel::start()
{
- sensordLogD() << id() << "Starting AccelerometerSensorChannel";
+ sensordLogD() << "Starting AccelerometerSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool AccelerometerSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping AccelerometerSensorChannel";
+ sensordLogD() << "Stopping AccelerometerSensorChannel";
if (AbstractSensorChannel::stop()) {
accelerometerChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/alssensor/alssensor.cpp
^
|
| @@ -112,7 +112,7 @@
bool ALSSensorChannel::start()
{
- sensordLogD() << id() << "Starting ALSSensorChannel";
+ sensordLogD() << "Starting ALSSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -124,7 +124,7 @@
bool ALSSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping ALSSensorChannel";
+ sensordLogD() << "Stopping ALSSensorChannel";
if (AbstractSensorChannel::stop()) {
alsAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/compasssensor/compasssensor.cpp
^
|
| @@ -92,7 +92,7 @@
bool CompassSensorChannel::start()
{
- sensordLogD() << id() << "Starting CompassSensorChannel";
+ sensordLogD() << "Starting CompassSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -105,7 +105,7 @@
bool CompassSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping CompassSensorChannel";
+ sensordLogD() << "Stopping CompassSensorChannel";
if (AbstractSensorChannel::stop()) {
compassChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/compassbin.cpp
^
|
| @@ -58,20 +58,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << id() << "Failed to get unique sessionId for compass info via context.";
+ sensordLogC() << "Failed to get unique id for compass info via context.";
}
compassChain = SensorManager::instance().requestChain("compasschain");
if (!compassChain)
{
- sensordLogC() << id() << "Unable to access Compass for heading property.";
+ sensordLogC() << "Unable to access Compass for heading property.";
return;
}
RingBufferBase* rb = compassChain->findBuffer("truenorth");
if (!rb)
{
- sensordLogC() << id() << "Unable to connect to compass direction buffer.";
+ sensordLogC() << "Unable to connect to compass direction buffer.";
}
else
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/contextplugin.cpp
^
|
| @@ -32,7 +32,7 @@
void ContextPlugin::Register(class Loader&)
{
- sensordLogD() << id() << "registering contextsensor";
+ sensordLogD() << "registering contextsensor";
SensorManager& sm = SensorManager::instance();
sm.registerSensor<ContextSensorChannel>("contextsensor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/contextsensor.cpp
^
|
| @@ -36,7 +36,7 @@
{
compassBin = new CompassBin(service);
} else {
- sensordLogD() << id() << "Loading of 'compasschain' failed, no Location.Heading available";
+ sensordLogD() << "Loading of 'compasschain' failed, no Location.Heading available";
// Creating as dummy to provide the service with value 'unknown'
// rather than miss the service.
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/normalizerfilter.cpp
^
|
| @@ -41,6 +41,6 @@
source_.propagate(1, &n);
prevTime = data->timestamp_;
} else {
- sensordLogT() << id() << "Discarded sample from normalizer due to too short time delta.";
+ sensordLogT() << "Discarded sample from normalizer due to too short time delta.";
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/orientationbin.cpp
^
|
| @@ -72,20 +72,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << id() << "Failed to get unique sessionId for orientation detection.";
+ sensordLogC() << "Failed to get unique id for orientation detection.";
}
orientationChain = SensorManager::instance().requestChain("orientationchain");
if (!orientationChain)
{
- sensordLogC() << id() << "Unable to access OrientationChain for orientation properties.";
+ sensordLogC() << "Unable to access OrientationChain for orientation properties.";
return;
}
RingBufferBase* rb = orientationChain->findBuffer("topedge");
if (!rb)
{
- sensordLogC() << id() << "Unable to connect to TopEdge orientation buffer.";
+ sensordLogC() << "Unable to connect to TopEdge orientation buffer.";
} else {
rb->join(&topEdgeReader);
}
@@ -93,7 +93,7 @@
rb = orientationChain->findBuffer("face");
if (!rb)
{
- sensordLogC() << id() << "Unable to connect to face orientation buffer.";
+ sensordLogC() << "Unable to connect to face orientation buffer.";
} else {
rb->join(&faceReader);
}
@@ -101,9 +101,8 @@
start();
orientationChain->start();
- unsigned int pollInterval_ms = SensorFrameworkConfig::configuration()->value("context/orientation_poll_interval", QVariant(POLL_INTERVAL)).toUInt();
- unsigned int pollInterval_us = pollInterval_ms * 1000;
- orientationChain->setIntervalRequest(sessionId, pollInterval_us);
+ unsigned int pollInterval = SensorFrameworkConfig::configuration()->value("context/orientation_poll_interval", QVariant(POLL_INTERVAL)).toUInt();
+ orientationChain->setIntervalRequest(sessionId, pollInterval);
}
void OrientationBin::stopRun()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/screeninterpreterfilter.cpp
^
|
| @@ -52,7 +52,7 @@
void ScreenInterpreterFilter::interpret(unsigned, const PoseData* data)
{
- sensordLogT() << id() << "Data received on ScreenInterpreter... " << data->timestamp_;
+ sensordLogT() << "Data received on ScreenInterpreter... " << data->timestamp_;
provideScreenData(data->orientation_);
source_.propagate(1, data);
}
@@ -60,7 +60,7 @@
void ScreenInterpreterFilter::provideScreenData(PoseData::Orientation orientation)
{
- sensordLogT() << id() << "Screen orientation from contextprovider:" << orientation;
+ sensordLogT() << "Screen orientation from contextprovider:" << orientation;
// Any TopEdge value should set flat to false.
if (isFlat && orientation != PoseData::Undefined && orientation != PoseData::FaceDown && orientation != PoseData::FaceUp)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/stabilitybin.cpp
^
|
| @@ -72,20 +72,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << id() << "Failed to get unique sessionId for stability detection.";
+ sensordLogC() << "Failed to get unique id for stability detection.";
}
accelerometerAdaptor = SensorManager::instance().requestDeviceAdaptor("accelerometeradaptor");
if (!accelerometerAdaptor)
{
- sensordLogC() << id() << "Unable to access Accelerometer for stability properties.";
+ sensordLogC() << "Unable to access Accelerometer for stability properties.";
return;
}
RingBufferBase* rb = accelerometerAdaptor->findBuffer("accelerometer");
if (!rb)
{
- sensordLogC() << id() << "Unable to connect to accelerometer.";
+ sensordLogC() << "Unable to connect to accelerometer.";
} else {
rb->join(&accelerometerReader);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/contextplugin/stabilityfilter.cpp
^
|
| @@ -70,7 +70,7 @@
void StabilityFilter::timeoutTriggered()
{
- sensordLogT() << id() << "Stationary timeout triggered.";
+ sensordLogT() << "Stationary timeout triggered.";
stableProperty->setValue(true);
timer.stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/gyroscopesensor/gyroscopesensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool GyroscopeSensorChannel::start()
{
- sensordLogD() << id() << "Starting GyroscopeSensorChannel";
+ sensordLogD() << "Starting GyroscopeSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool GyroscopeSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping GyroscopeSensorChannel";
+ sensordLogD() << "Stopping GyroscopeSensorChannel";
if (AbstractSensorChannel::stop()) {
gyroscopeAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/humiditysensor/humiditysensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool HumiditySensorChannel::start()
{
- sensordLogD() << id() << "Starting HumiditySensorChannel";
+ sensordLogD() << "Starting HumiditySensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool HumiditySensorChannel::stop()
{
- sensordLogD() << id() << "Stopping HumiditySensorChannel";
+ sensordLogD() << "Stopping HumiditySensorChannel";
if (AbstractSensorChannel::stop()) {
humidityAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/lidsensor/lidsensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool LidSensorChannel::start()
{
- sensordLogD() << id() << "Starting LidSensorChannel";
+ sensordLogD() << "Starting LidSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool LidSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping LidSensorChannel";
+ sensordLogD() << "Stopping LidSensorChannel";
if (AbstractSensorChannel::stop()) {
lidAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/magnetometersensor/magnetometersensor.cpp
^
|
| @@ -56,7 +56,7 @@
scaleFilter_ = sm.instantiateFilter("magnetometerscalefilter");
if (scaleFilter_ == NULL)
{
- sensordLogW() << NodeBase::id() << "Failed to initialise scaling filter for magnetometer.";
+ sensordLogW() << "Failed to initialise scaling filter for magnetometer.";
}
}
@@ -73,15 +73,15 @@
filterBin_->add(scaleFilter_, "scaleFilter");
if (!filterBin_->join("magnetometer", "source", "scaleFilter", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer/scaleFilter join failed";
+ qDebug() << Q_FUNC_INFO << "magnetometer/scaleFilter join failed";
if (!filterBin_->join("filter", "source", "buffer", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "source/buffer join failed";
+ qDebug() << Q_FUNC_INFO << "source/buffer join failed";
} else
{
if (!filterBin_->join("magnetometer", "source", "buffer", "sink"))
- qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer/buffer join failed";
+ qDebug() << Q_FUNC_INFO << "magnetometer/buffer join failed";
}
// Join datasources to the chain
@@ -130,7 +130,7 @@
bool MagnetometerSensorChannel::start()
{
- sensordLogD() << id() << "Starting MagnetometerSensorChannel";
+ sensordLogD() << "Starting MagnetometerSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -142,7 +142,7 @@
bool MagnetometerSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping MagnetometerSensorChannel";
+ sensordLogD() << "Stopping MagnetometerSensorChannel";
if (AbstractSensorChannel::stop()) {
magChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/orientationsensor/orientationsensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool OrientationSensorChannel::start()
{
- sensordLogD() << id() << "Starting OrientationSensorChannel";
+ sensordLogD() << "Starting OrientationSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool OrientationSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping OrientationSensorChannel";
+ sensordLogD() << "Stopping OrientationSensorChannel";
if (AbstractSensorChannel::stop()) {
orientationChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/pressuresensor/pressuresensor.cpp
^
|
| @@ -88,7 +88,7 @@
bool PressureSensorChannel::start()
{
- sensordLogD() << id() << "Starting PressureSensorChannel";
+ sensordLogD() << "Starting PressureSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -100,7 +100,7 @@
bool PressureSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping PressureSensorChannel";
+ sensordLogD() << "Stopping PressureSensorChannel";
if (AbstractSensorChannel::stop()) {
pressureAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/proximitysensor/proximitysensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool ProximitySensorChannel::start()
{
- sensordLogD() << id() << "Starting ProximitySensorChannel";
+ sensordLogD() << "Starting ProximitySensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool ProximitySensorChannel::stop()
{
- sensordLogD() << id() << "Stopping ProximitySensorChannel";
+ sensordLogD() << "Stopping ProximitySensorChannel";
if (AbstractSensorChannel::stop()) {
proximityAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/rotationsensor/rotationsensor.cpp
^
|
| @@ -51,7 +51,7 @@
if (compassChain_ && compassChain_->isValid()) {
compassReader_ = new BufferReader<CompassData>(1);
} else {
- sensordLogW() << NodeBase::id() << "Unable to use compass for z-axis rotation.";
+ sensordLogW() << "Unable to use compass for z-axis rotation.";
}
rotationFilter_ = sm.instantiateFilter("rotationfilter");
@@ -100,19 +100,16 @@
if (hasZ())
{
// No less than 5hz allowed for compass
- int ranges_ms[] = {10, 20, 25, 40, 50, 100, 200};
- for(size_t i = 0; i < sizeof(ranges_ms) / sizeof(int); ++i)
+ int ranges[] = {10, 20, 25, 40, 50, 100, 200};
+ for(size_t i = 0; i < sizeof(ranges) / sizeof(int); ++i)
{
- int range_us = ranges_ms[i] * 1000;
- introduceAvailableInterval(DataRange(range_us, range_us, 0));
+ introduceAvailableInterval(DataRange(ranges[i], ranges[i], 0));
}
} else {
setIntervalSource(accelerometerChain_);
}
- // Tricky. Might need to make this conditional.
- unsigned int interval_us = 100 * 1000;
- setDefaultInterval(interval_us);
+ setDefaultInterval(100); // Tricky. Might need to make this conditional.
}
RotationSensorChannel::~RotationSensorChannel()
@@ -140,7 +137,7 @@
bool RotationSensorChannel::start()
{
- sensordLogD() << id() << "Starting RotationSensorChannel";
+ sensordLogD() << "Starting RotationSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -157,7 +154,7 @@
bool RotationSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping RotationSensorChannel";
+ sensordLogD() << "Stopping RotationSensorChannel";
if (AbstractSensorChannel::stop()) {
accelerometerChain_->stop();
@@ -186,12 +183,12 @@
return accelerometerChain_->getInterval();
}
-bool RotationSensorChannel::setInterval(int sessionId, unsigned int interval_us)
+bool RotationSensorChannel::setInterval(unsigned int value, int sessionId)
{
- bool success = accelerometerChain_->setIntervalRequest(sessionId, interval_us);
+ bool success = accelerometerChain_->setIntervalRequest(sessionId, value);
if (hasZ())
{
- success = compassChain_->setIntervalRequest(sessionId, interval_us) && success;
+ success = compassChain_->setIntervalRequest(sessionId, value) && success;
}
return success;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/rotationsensor/rotationsensor.h
^
|
| @@ -73,7 +73,7 @@
}
virtual unsigned int interval() const;
- virtual bool setInterval(int sessionId, unsigned int interval_us);
+ virtual bool setInterval(unsigned int value, int sessionId);
virtual void removeSession(int sessionId);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/stepcountersensor/stepcountersensor.cpp
^
|
| @@ -91,7 +91,7 @@
bool StepCounterSensorChannel::start()
{
- sensordLogD() << id() << "Starting StepCounterSensorChannel";
+ sensordLogD() << "Starting StepCounterSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -103,7 +103,7 @@
bool StepCounterSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping StepCounterSensorChannel";
+ sensordLogD() << "Stopping StepCounterSensorChannel";
if (AbstractSensorChannel::stop()) {
stepcounterAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/tapsensor/tapsensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool TapSensorChannel::start()
{
- sensordLogD() << id() << "Starting TapSensorChannel";
+ sensordLogD() << "Starting TapSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool TapSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping TapSensorChannel";
+ sensordLogD() << "Stopping TapSensorChannel";
if (AbstractSensorChannel::stop()) {
tapAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/sensors/temperaturesensor/temperaturesensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool TemperatureSensorChannel::start()
{
- sensordLogD() << id() << "Starting TemperatureSensorChannel";
+ sensordLogD() << "Starting TemperatureSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool TemperatureSensorChannel::stop()
{
- sensordLogD() << id() << "Stopping TemperatureSensorChannel";
+ sensordLogD() << "Stopping TemperatureSensorChannel";
if (AbstractSensorChannel::stop()) {
temperatureAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptor.cpp
^
|
| @@ -29,12 +29,12 @@
#include <errno.h>
#include "datatypes/utils.h"
-FakeAdaptor::FakeAdaptor(const QString &id) : DeviceAdaptor(id), m_interval_us(1000)
+FakeAdaptor::FakeAdaptor(const QString& id) : DeviceAdaptor(id), interval_(1)
{
- m_thread = new FakeAdaptorThread(this);
+ t = new FakeAdaptorThread(this);
- m_buffer = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
- setAdaptedSensor("als", "Internal ambient light sensor lux values", m_buffer);
+ buffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
+ setAdaptedSensor("als", "Internal ambient light sensor lux values", buffer_);
}
bool FakeAdaptor::startAdaptor()
@@ -46,10 +46,9 @@
return true;
}
- m_interval_us = atoi(file.readLine().data()) * 1000;
- if (m_interval_us <= 0) {
+ interval_ = atoi(file.readLine().data());
+ if (interval_ <= 0) {
qDebug() << "Failed to get rate from" << file.fileName() << "- using 1000Hz (readline)";
- m_interval_us = 1000;
return true;
}
@@ -63,38 +62,38 @@
bool FakeAdaptor::startSensor()
{
- qDebug() << "Pushing fake ALS data with" << m_interval_us << " us interval";
+ qDebug() << "Pushing fake ALS data with" << interval_ << " msec interval";
// Start pushing data
- m_thread->running = true;
- m_thread->start();
+ t->running = true;
+ t->start();
return true;
}
void FakeAdaptor::stopSensor()
{
// Stop pushing data
- m_thread->running = false;
- m_thread->wait();
+ t->running = false;
+ t->wait();
qDebug() << "sensor stopped";
}
void FakeAdaptor::pushNewData(int& data)
{
- TimedUnsigned *lux = m_buffer->nextSlot();
+ TimedUnsigned* lux = buffer_->nextSlot();
lux->timestamp_ = Utils::getTimeStamp();
lux->value_ = data;
- m_buffer->commit();
- m_buffer->wakeUpReaders();
+ buffer_->commit();
+ buffer_->wakeUpReaders();
}
void FakeAdaptor::init()
{
}
-FakeAdaptorThread::FakeAdaptorThread(FakeAdaptor *parent) : running(false), m_parent(parent)
+FakeAdaptorThread::FakeAdaptorThread(FakeAdaptor *parent) : running(false), parent_(parent)
{
qDebug() << "Data pusher for ALS";
}
@@ -103,9 +102,8 @@
{
int i = 0;
while(running) {
- int interval_ms = (m_parent->m_interval_us + 999) / 1000;
- QThread::msleep(interval_ms);
- m_parent->pushNewData(i);
+ QThread::msleep(parent_->interval_);
+ parent_->pushNewData(i);
i++;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptor.h
^
|
| @@ -43,7 +43,7 @@
bool running;
private:
- FakeAdaptor *m_parent;
+ FakeAdaptor *parent_;
};
/**
@@ -68,14 +68,14 @@
void init();
- unsigned int m_interval_us;
+ unsigned int interval_;
protected:
FakeAdaptor(const QString& id);
private:
- FakeAdaptorThread *m_thread;
- DeviceAdaptorRingBuffer<TimedUnsigned> *m_buffer;
+ FakeAdaptorThread* t;
+ DeviceAdaptorRingBuffer<TimedUnsigned>* buffer_;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/client/clientapitest.cpp
^
|
| @@ -38,16 +38,6 @@
#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");
@@ -205,7 +195,7 @@
XYZ sample1 = sensorIfc->get();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("value"));
- QVERIFY(areTheSameSample(sample1, sample2));
+ QVERIFY(sample1 == sample2);
}
@@ -237,7 +227,7 @@
XYZ sample1 = sensorIfc->get();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("value"));
- QVERIFY(areTheSameSample(sample1, sample2));
+ QVERIFY(sample1 == sample2);
delete sensorIfc;
}
@@ -269,7 +259,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(areTheSameSample(sample1, sample2));
+ // QVERIFY(sample1 == sample2);
// test start
QDBusReply<void> reply = sensorIfc->start();
@@ -462,7 +452,7 @@
// Need simulated data to make sensible test ouf of this.
XYZ sample1 = sensorIfc->rotation();
XYZ sample2 = qvariant_cast<XYZ>(sensorIfc->property("rotation"));
- QVERIFY(areTheSameSample(sample1, sample2));
+ QVERIFY(sample1 == sample2);
// test start
QDBusReply<void> reply = sensorIfc->start();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/abstractsensorhandler.cpp
^
|
| @@ -29,22 +29,22 @@
AbstractSensorHandler::AbstractSensorHandler(const QString& sensorName, QObject *parent) :
QThread(parent),
- m_sensorName(sensorName),
- m_interval_ms(100),
- m_bufferinterval_ms(0),
- m_standbyoverride(false),
- m_buffersize(0),
- m_dataCount(0),
- m_frameCount(0),
- m_downsample(false)
+ sensorName_(sensorName),
+ interval_(100),
+ bufferinterval_(0),
+ standbyoverride_(false),
+ buffersize_(0),
+ dataCount_(0),
+ frameCount_(0),
+ downsample_(false)
{
if (SensorFrameworkConfig::configuration() != NULL)
{
- m_interval_ms = SensorFrameworkConfig::configuration()->value(m_sensorName + "/interval", 100);
- m_bufferinterval_ms = SensorFrameworkConfig::configuration()->value(m_sensorName + "/bufferinterval", 0);
- m_standbyoverride = SensorFrameworkConfig::configuration()->value(m_sensorName + "/standbyoverride", false);
- m_buffersize = SensorFrameworkConfig::configuration()->value(m_sensorName + "/buffersize", 0);
- m_downsample = SensorFrameworkConfig::configuration()->value(m_sensorName + "/downsample", false);
+ interval_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/interval", 100);
+ bufferinterval_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/bufferinterval", 0);
+ standbyoverride_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/standbyoverride", false);
+ buffersize_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/buffersize", 0);
+ downsample_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/downsample", false);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/abstractsensorhandler.h
^
|
| @@ -40,18 +40,18 @@
virtual bool startClient() = 0;
virtual bool stopClient() = 0;
- int dataCount() const { return m_dataCount; }
- QString sensorName() const { return m_sensorName; }
+ int dataCount() const { return dataCount_; }
+ QString sensorName() const { return sensorName_; }
protected:
- QString m_sensorName;
- int m_interval_ms;
- int m_bufferinterval_ms;
- bool m_standbyoverride;
- int m_buffersize;
- int m_dataCount;
- int m_frameCount;
- bool m_downsample;
+ QString sensorName_;
+ int interval_;
+ int bufferinterval_;
+ bool standbyoverride_;
+ int buffersize_;
+ int dataCount_;
+ int frameCount_;
+ bool downsample_;
};
#endif // ABSTRACTSENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/sensorhandler_qmsystem2.cpp
^
|
| @@ -27,75 +27,75 @@
SensorHandler::SensorHandler(const QString& sensorName, QObject *parent) :
AbstractSensorHandler(sensorName, parent),
- m_sensor(NULL)
+ sensor_(NULL)
{
- if (m_sensorName == "compasssensor")
+ if (sensorName_ == "compasssensor")
{
- m_sensor = new MeeGo::QmCompass();
- connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmCompassReading)), this, SLOT(receivedData(const MeeGo::QmCompassReading)));
+ sensor_ = new MeeGo::QmCompass();
+ connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmCompassReading)), this, SLOT(receivedData(const MeeGo::QmCompassReading)));
}
- else if (m_sensorName == "magnetometersensor")
+ else if (sensorName_ == "magnetometersensor")
{
- m_sensor = new MeeGo::QmMagnetometer();
- connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmMagnetometerReading&)), this, SLOT(receivedData(const MeeGo::QmMagnetometerReading&)));
+ sensor_ = new MeeGo::QmMagnetometer();
+ connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmMagnetometerReading&)), this, SLOT(receivedData(const MeeGo::QmMagnetometerReading&)));
}
- else if (m_sensorName == "orientationsensor")
+ else if (sensorName_ == "orientationsensor")
{
- m_sensor = new MeeGo::QmOrientation();
- connect(m_sensor, SIGNAL(orientationChanged(const MeeGo::QmOrientationReading)), this, SLOT(receivedData(const MeeGo::QmOrientationReading)));
+ sensor_ = new MeeGo::QmOrientation();
+ connect(sensor_, SIGNAL(orientationChanged(const MeeGo::QmOrientationReading)), this, SLOT(receivedData(const MeeGo::QmOrientationReading)));
}
- else if (m_sensorName == "accelerometersensor")
+ else if (sensorName_ == "accelerometersensor")
{
- m_sensor = new MeeGo::QmAccelerometer();
- connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmAccelerometerReading&)), this, SLOT(receivedData(const MeeGo::QmAccelerometerReading&)));
+ sensor_ = new MeeGo::QmAccelerometer();
+ connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmAccelerometerReading&)), this, SLOT(receivedData(const MeeGo::QmAccelerometerReading&)));
}
- else if (m_sensorName == "alssensor")
+ else if (sensorName_ == "alssensor")
{
- m_sensor = new MeeGo::QmALS();
- connect(m_sensor, SIGNAL(ALSChanged(const MeeGo::QmAlsReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
+ sensor_ = new MeeGo::QmALS();
+ connect(sensor_, SIGNAL(ALSChanged(const MeeGo::QmAlsReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
}
- else if (m_sensorName == "rotationsensor")
+ else if (sensorName_ == "rotationsensor")
{
- m_sensor = new MeeGo::QmRotation();
- connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmRotationReading&)), this, SLOT(receivedData(const MeeGo::QmRotationReading&)));
+ sensor_ = new MeeGo::QmRotation();
+ connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmRotationReading&)), this, SLOT(receivedData(const MeeGo::QmRotationReading&)));
}
- else if (m_sensorName == "tapsensor")
+ else if (sensorName_ == "tapsensor")
{
- m_sensor = new MeeGo::QmTap();
- connect(m_sensor, SIGNAL(tapped(const MeeGo::QmTapReading)), this, SLOT(receivedData(const MeeGo::QmTapReading)));
+ sensor_ = new MeeGo::QmTap();
+ connect(sensor_, SIGNAL(tapped(const MeeGo::QmTapReading)), this, SLOT(receivedData(const MeeGo::QmTapReading)));
}
- else if (m_sensorName == "proximitysensor")
+ else if (sensorName_ == "proximitysensor")
{
- m_sensor = new MeeGo::QmProximity();
- connect(m_sensor, SIGNAL(ProximityChanged(const MeeGo::QmProximityReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
+ sensor_ = new MeeGo::QmProximity();
+ connect(sensor_, SIGNAL(ProximityChanged(const MeeGo::QmProximityReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
}
}
void SensorHandler::receivedData(const MeeGo::QmAccelerometerReading& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x << " " << data.y << " " << data.z;
}
void SensorHandler::receivedData(const MeeGo::QmIntReading data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.value;
}
void SensorHandler::receivedData(const MeeGo::QmCompassReading data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.level << " " << data.degrees;
}
void SensorHandler::receivedData(const MeeGo::QmMagnetometerReading& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x << " " << data.y << " " << data.z << " "
<< data.rx << " " << data.ry << " " << data.rz << " "
<< data.level;
@@ -103,30 +103,30 @@
void SensorHandler::receivedData(const MeeGo::QmOrientationReading data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.value;
}
void SensorHandler::receivedData(const MeeGo::QmRotationReading& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x << " " << data.y << " " << data.z;
}
void SensorHandler::receivedData(const MeeGo::QmTapReading data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.type << " " << data.direction;
}
bool SensorHandler::startClient()
{
- m_sensor->requestSession(MeeGo::QmSensor::SessionTypeListen);
- m_sensor->setInterval(m_interval_ms);
- m_sensor->setStandbyOverride(m_standbyoverride);
+ sensor_->requestSession(MeeGo::QmSensor::SessionTypeListen);
+ sensor_->setInterval(interval_);
+ sensor_->setStandbyOverride(standbyoverride_);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/sensorhandler_qmsystem2.h
^
|
| @@ -62,7 +62,7 @@
void receivedData(const MeeGo::QmTapReading data);
private:
- MeeGo::QmSensor *m_sensor;
+ MeeGo::QmSensor* sensor_;
};
#endif // SENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/sensorhandler_qtapi.cpp
^
|
| @@ -29,102 +29,102 @@
SensorHandler::SensorHandler(const QString& sensorName, QObject *parent) :
AbstractSensorHandler(sensorName, parent),
- m_sensorChannelInterface(NULL)
+ sensorChannelInterface_(NULL)
{
}
void SensorHandler::receivedData(const MagneticField& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x() << " " << data.y() << " " << data.z();
}
void SensorHandler::receivedData(const XYZ& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x() << " " << data.y() << " " << data.z();
}
void SensorHandler::receivedData(const Compass& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.degrees() << " " << data.level();
}
void SensorHandler::receivedData(const Unsigned& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.x();
}
void SensorHandler::receivedData(const Tap& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.direction() << " " << data.type();
}
void SensorHandler::receivedData(const Proximity& data)
{
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< data.UnsignedData().value_ << " " << data.proximityData().value_;
}
void SensorHandler::receivedFrame(const QVector<MagneticField>& frame)
{
- ++m_frameCount;
- sensordLogT() << m_sensorName << " frame " << m_frameCount << " size " << frame.size();
+ ++frameCount_;
+ sensordLogT() << sensorName_ << " frame " << frameCount_ << " size " << frame.size();
foreach (const MagneticField& data, frame)
{
sensordLogT() << data.x() << " " << data.y() << " " << data.z();
- ++m_dataCount;
+ ++dataCount_;
}
}
void SensorHandler::receivedFrame(const QVector<XYZ>& frame)
{
- ++m_frameCount;
- sensordLogT() << m_sensorName << " frame " << m_frameCount << " size " << frame.size();
+ ++frameCount_;
+ sensordLogT() << sensorName_ << " frame " << frameCount_ << " size " << frame.size();
foreach (const XYZ& data, frame)
{
sensordLogT() << data.x() << " " << data.y() << " " << data.z();
- ++m_dataCount;
+ ++dataCount_;
}
}
bool SensorHandler::startClient()
{
createSensorInterface();
- if (m_sensorChannelInterface == 0)
+ if (sensorChannelInterface_ == 0)
{
sensordLogD() << "Creating sensor client interface fails.";
return false;
}
- sensordLogD() << "Created sensor: " << m_sensorChannelInterface->description();
- sensordLogD() << "Support intervals: " << toString(m_sensorChannelInterface->getAvailableIntervals());
- sensordLogD() << "Support dataranges: " << toString(m_sensorChannelInterface->getAvailableDataRanges());
- m_sensorChannelInterface->setInterval(m_interval_ms);
- m_sensorChannelInterface->setBufferInterval(m_bufferinterval_ms);
- m_sensorChannelInterface->setBufferSize(m_buffersize);
- m_sensorChannelInterface->setStandbyOverride(m_standbyoverride);
- m_sensorChannelInterface->setDownsampling(m_downsample);
- m_sensorChannelInterface->start();
+ sensordLogD() << "Created sensor: " << sensorChannelInterface_->description();
+ sensordLogD() << "Support intervals: " << toString(sensorChannelInterface_->getAvailableIntervals());
+ sensordLogD() << "Support dataranges: " << toString(sensorChannelInterface_->getAvailableDataRanges());
+ sensorChannelInterface_->setInterval(interval_);
+ sensorChannelInterface_->setBufferInterval(bufferinterval_);
+ sensorChannelInterface_->setBufferSize(buffersize_);
+ sensorChannelInterface_->setStandbyOverride(standbyoverride_);
+ sensorChannelInterface_->setDownsampling(downsample_);
+ sensorChannelInterface_->start();
return true;
}
bool SensorHandler::stopClient()
{
- if (m_sensorChannelInterface)
+ if (sensorChannelInterface_)
{
- m_sensorChannelInterface->stop();
- delete m_sensorChannelInterface;
- m_sensorChannelInterface = 0;
+ sensorChannelInterface_->stop();
+ delete sensorChannelInterface_;
+ sensorChannelInterface_ = 0;
}
return true;
}
@@ -169,48 +169,48 @@
void SensorHandler::createSensorInterface()
{
- if (m_sensorName == "compasssensor")
+ if (sensorName_ == "compasssensor")
{
- m_sensorChannelInterface = CompassSensorChannelInterface::interface("compasssensor");
- connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const Compass&)), this, SLOT(receivedData(const Compass&)));
+ sensorChannelInterface_ = CompassSensorChannelInterface::interface("compasssensor");
+ connect(sensorChannelInterface_, SIGNAL(dataAvailable(const Compass&)), this, SLOT(receivedData(const Compass&)));
}
- else if (m_sensorName == "magnetometersensor")
+ else if (sensorName_ == "magnetometersensor")
{
- m_sensorChannelInterface = MagnetometerSensorChannelInterface::interface("magnetometersensor");
- connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(receivedData(const MagneticField&)));
- connect(m_sensorChannelInterface, SIGNAL(frameAvailable(const QVector<MagneticField>&)), this, SLOT(receivedFrame(const QVector<MagneticField>&)));
+ sensorChannelInterface_ = MagnetometerSensorChannelInterface::interface("magnetometersensor");
+ connect(sensorChannelInterface_, SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(receivedData(const MagneticField&)));
+ connect(sensorChannelInterface_, SIGNAL(frameAvailable(const QVector<MagneticField>&)), this, SLOT(receivedFrame(const QVector<MagneticField>&)));
}
- else if (m_sensorName == "orientationsensor")
+ else if (sensorName_ == "orientationsensor")
{
- m_sensorChannelInterface = OrientationSensorChannelInterface::interface("orientationsensor");
- connect(m_sensorChannelInterface, SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
+ sensorChannelInterface_ = OrientationSensorChannelInterface::interface("orientationsensor");
+ connect(sensorChannelInterface_, SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
}
- else if (m_sensorName == "accelerometersensor")
+ else if (sensorName_ == "accelerometersensor")
{
- m_sensorChannelInterface = AccelerometerSensorChannelInterface::interface("accelerometersensor");
- connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(receivedData(const XYZ&)));
- connect(m_sensorChannelInterface, SIGNAL(frameAvailable(const QVector<XYZ>&)), this, SLOT(receivedFrame(const QVector<XYZ>&)));
+ sensorChannelInterface_ = AccelerometerSensorChannelInterface::interface("accelerometersensor");
+ connect(sensorChannelInterface_, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(receivedData(const XYZ&)));
+ connect(sensorChannelInterface_, SIGNAL(frameAvailable(const QVector<XYZ>&)), this, SLOT(receivedFrame(const QVector<XYZ>&)));
}
- else if (m_sensorName == "alssensor")
+ else if (sensorName_ == "alssensor")
{
- m_sensorChannelInterface = ALSSensorChannelInterface::interface("alssensor");
- connect(m_sensorChannelInterface, SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
+ sensorChannelInterface_ = ALSSensorChannelInterface::interface("alssensor");
+ connect(sensorChannelInterface_, SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
}
- else if (m_sensorName == "rotationsensor")
+ else if (sensorName_ == "rotationsensor")
{
- m_sensorChannelInterface = RotationSensorChannelInterface::interface("rotationsensor");
- connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(receivedData(const XYZ&)));
- connect(m_sensorChannelInterface, SIGNAL(frameAvailable(const QVector<XYZ>&)), this, SLOT(receivedFrame(const QVector<XYZ>&)));
+ sensorChannelInterface_ = RotationSensorChannelInterface::interface("rotationsensor");
+ connect(sensorChannelInterface_, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(receivedData(const XYZ&)));
+ connect(sensorChannelInterface_, SIGNAL(frameAvailable(const QVector<XYZ>&)), this, SLOT(receivedFrame(const QVector<XYZ>&)));
}
- else if (m_sensorName == "tapsensor")
+ else if (sensorName_ == "tapsensor")
{
- m_sensorChannelInterface = TapSensorChannelInterface::interface("tapsensor");
- connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const Tap&)), this, SLOT(receivedData(const Tap&)));
+ sensorChannelInterface_ = TapSensorChannelInterface::interface("tapsensor");
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/sensorhandler_qtapi.h
^
|
| @@ -70,7 +70,7 @@
static QString toString(const DataRangeList& ranges);
- AbstractSensorChannelInterface *m_sensorChannelInterface;
+ AbstractSensorChannelInterface* sensorChannelInterface_;
};
#endif // SENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testapp/sensorhandler_qtmob.cpp
^
|
| @@ -30,58 +30,58 @@
AbstractSensorHandler(sensorName, parent),
m_sensor(NULL)
{
- if (m_sensorName == "compasssensor")
+ if (sensorName_ == "compasssensor")
{
m_sensor = new QCompass();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedCompassData()));
}
- else if (m_sensorName == "magnetometersensor")
+ else if (sensorName_ == "magnetometersensor")
{
m_sensor = new QMagnetometer();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedMagnetometerData()));
}
- else if (m_sensorName == "orientationsensor")
+ else if (sensorName_ == "orientationsensor")
{
m_sensor = new QOrientationSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedOrientationData()));
}
- else if (m_sensorName == "accelerometersensor")
+ else if (sensorName_ == "accelerometersensor")
{
m_sensor = new QAccelerometer();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedAccelerometerData()));
}
- else if (m_sensorName == "alssensor")
+ else if (sensorName_ == "alssensor")
{
m_sensor = new QAmbientLightSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedAlsData()));
}
- else if (m_sensorName == "rotationsensor")
+ else if (sensorName_ == "rotationsensor")
{
m_sensor = new QRotationSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedRotationData()));
}
- else if (m_sensorName == "tapsensor")
+ else if (sensorName_ == "tapsensor")
{
m_sensor = new QTapSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedTapData()));
}
- else if (m_sensorName == "proximitysensor")
+ else if (sensorName_ == "proximitysensor")
{
m_sensor = new QProximitySensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedProximityData()));
}
- m_sensor->setProperty("alwaysOn", m_standbyoverride);
- m_sensor->setProperty("bufferSize", m_buffersize);
- m_sensor->setDataRate(m_interval_ms ? 1000 / m_interval_ms : 0);
+ m_sensor->setProperty("alwaysOn", standbyoverride_);
+ m_sensor->setProperty("bufferSize", buffersize_);
+ m_sensor->setDataRate(interval_ ? 1000 / interval_ : 0);
}
SensorHandler::~SensorHandler()
@@ -92,16 +92,16 @@
void SensorHandler::receivedAccelerometerData()
{
QAccelerometerReading* data = (QAccelerometerReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "x " << data->x() << "y " << data->y() << "z " << data->z();
}
void SensorHandler::receivedCompassData()
{
QCompassReading* data = (QCompassReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< " azimuth: " << data->azimuth() << "calibrationLevel: " << data-> calibrationLevel();
}
@@ -109,16 +109,16 @@
void SensorHandler::receivedAlsData()
{
QAmbientLightReading* data = (QAmbientLightReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "lightLevel " << data->lightLevel();
}
void SensorHandler::receivedMagnetometerData()
{
QMagnetometerReading* data = (QMagnetometerReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "x " << data->x() << "y " << data->y() << "z " << data->z()
<< " calibrationLevel" << data->calibrationLevel();
}
@@ -126,32 +126,32 @@
void SensorHandler::receivedOrientationData()
{
QOrientationReading* data = (QOrientationReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "orientation " << data->orientation();
}
void SensorHandler::receivedRotationData()
{
QRotationReading* data = (QRotationReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "x " << data->x() << "y " << data->y() << "z " << data->z();
}
void SensorHandler::receivedTapData()
{
QTapReading* data = (QTapReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "DoubleTap " << data->isDoubleTap();
}
void SensorHandler::receivedProximityData()
{
QProximityReading* data = (QProximityReading*) m_sensor->reading();
- ++m_dataCount;
- sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
+ ++dataCount_;
+ sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
<< "Close " << data->close();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.6.tar.bz2/tests/testutils/sensorfakeopen/sensorfakeopen.pro
^
|
| @@ -4,7 +4,6 @@
DEPENDPATH += .
INCLUDEPATH += .
QT -= gui
-LIBS += -ldl
# Input
HEADERS += sensorfakeopen.h
|
