|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-binder.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">8e75c2316b4ab8913fb4ad6775f3007a4107235a</param>
+ <param name="revision">815821b395fc4f5a0c7fbd0bb99ea48a232352f7</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
^
|
| @@ -107,7 +107,7 @@
d->y_ = orientationValue_.y_;
d->z_ = orientationValue_.z_;
-// sensordLogT() << "Accelerometer reading: " << d->x_ << ", " << d->y_ << ", " << d->z_;
+// sensordLogT() << id() << "Accelerometer reading: " << d->x_ << ", " << d->y_ << ", " << d->z_;
accelerometerBuffer_->commit();
accelerometerBuffer_->wakeUpReaders();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
^
|
| @@ -57,13 +57,13 @@
QFile sysFile(rangeFilePath_);
if (!(sysFile.open(QIODevice::ReadOnly))) {
- sensordLogW() << "Unable to config ALS range from sysfs";
+ sensordLogW() << NodeBase::id() << "Unable to config ALS range from sysfs";
} else {
sysFile.readLine(buf, sizeof(buf));
int range = QString(buf).toInt();
introduceAvailableDataRange(DataRange(0, range, 1));
- sensordLogT() << "Ambient light range: " << range;
+ sensordLogT() << NodeBase::id() << "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() << "read():" << strerror(errno);
+ sensordLogW() << id() << "read():" << strerror(errno);
return;
}
buf[sizeof(buf)-1] = '\0';
- sensordLogT() << "Ambient light value: " << buf;
+ sensordLogT() << id() << "Ambient light value: " << buf;
__u16 idata = atoi(buf);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.cpp
^
|
| @@ -62,11 +62,11 @@
idata = atoi(asciidata);
if (bytesRead <= 0) {
- sensordLogW() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << "Ambient light value: " << idata;
+ sensordLogT() << id() << "Ambient light value: " << idata;
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = idata;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/alsadaptor/alsadaptor.cpp
^
|
| @@ -84,7 +84,7 @@
{
if(!alsEnabled)
{
- sensordLogT() << "Requesting MCE to enable ALS";
+ sensordLogT() << id() << "Requesting MCE to enable ALS";
dbusIfc->call(QDBus::NoBlock, "req_als_enable");
alsEnabled = true;
}
@@ -94,7 +94,7 @@
{
if(alsEnabled)
{
- sensordLogT() << "Requesting MCE to disable ALS";
+ sensordLogT() << id() << "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() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << "Ambient light value: " << als_data.lux;
+ sensordLogT() << id() << "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() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << "Ambient light value: " << als_data.lux;
+ sensordLogT() << id() << "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() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
QVariant value(buffer);
bool ok;
double fValue(value.toDouble(&ok));
if(!ok) {
- sensordLogT() << "read(): failed to parse float from: " << buffer;
+ sensordLogT() << id() << "read(): failed to parse float from: " << buffer;
return;
}
TimedUnsigned* lux = alsBuffer_->nextSlot();
lux->value_ = fValue * 10;
lux->timestamp_ = Utils::getTimeStamp();
- sensordLogT() << "Ambient light value: " << lux->value_;
+ sensordLogT() << id() << "Ambient light value: " << lux->value_;
}
else
{
- sensordLogW() << "Not known device type: " << deviceType_;
+ sensordLogW() << id() << "Not known device type: " << deviceType_;
return;
}
alsBuffer_->commit();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
^
|
| @@ -56,10 +56,10 @@
char buf[32];
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << "read():" << strerror(errno);
+ sensordLogW() << id() << "read():" << strerror(errno);
return;
}
- sensordLogT() << "gyroscope output value: " << buf;
+ sensordLogT() << id() << "gyroscope output value: " << buf;
sscanf(buf, "%hd %hd %hd\n", &x, &y, &z);
@@ -80,7 +80,7 @@
rate_Hz = 1000000 / interval_us;
if (rate_Hz <= 0)
rate_Hz = 100;
- sensordLogD() << "Setting poll interval for " << dataRatePath_ << " to " << rate_Hz;
+ sensordLogD() << id() << "Setting poll interval for " << dataRatePath_ << " to " << rate_Hz;
QByteArray dataRateString(QString("%1\n").arg(rate_Hz).toLocal8Bit());
return writeToFile(dataRatePath_, dataRateString);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
^
|
| @@ -45,7 +45,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "Hybris AccelAdaptor start\n";
+ sensordLogD() << id() << "Hybris AccelAdaptor start";
return true;
}
@@ -54,7 +54,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "Hybris AccelAdaptor stop\n";
+ sensordLogD() << id() << "Hybris AccelAdaptor stop";
}
void HybrisAccelerometerAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -54,7 +54,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "Hybris HybrisAlsAdaptor start\n";
+ sensordLogD() << id() << "Hybris HybrisAlsAdaptor start";
return true;
}
@@ -80,7 +80,7 @@
}
if (inputDev.isEmpty()) {
- sensordLogW() << "No sysfs als device found";
+ sensordLogD() << id() << "No sysfs als device found";
return;
}
@@ -101,11 +101,11 @@
buffer->commit();
buffer->wakeUpReaders();
} else {
- qDebug() << "ioctl not opened" ;
+ qDebug() << id() << "ioctl not opened" ;
}
close(fd);
} else {
- qDebug() << "could not open als evdev";
+ qDebug() << id() << "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() << "Hybris HybrisAlsAdaptor stop\n";
+ sensordLogD() << id() << "Hybris HybrisAlsAdaptor stop";
}
void HybrisAlsAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << m_powerStatePath;
+ sensordLogW() << NodeBase::id() << "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() << "Hybris GeoRotationAdaptor start";
+ sensordLogD() << id() << "Hybris GeoRotationAdaptor start";
return true;
}
@@ -68,7 +68,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "0");
- sensordLogD() << "Hybris GeoRotationAdaptor stop";
+ sensordLogD() << id() << "Hybris GeoRotationAdaptor stop";
}
void HybrisGeoRotationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
^
|
| @@ -33,7 +33,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
unsigned int interval_us = 50 * 1000;
@@ -51,7 +51,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "HybrisGyroscopeAdaptor start\n";
+ sensordLogD() << id() << "HybrisGyroscopeAdaptor start";
return true;
}
@@ -60,7 +60,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() &&!powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "HybrisGyroscopeAdaptor stop\n";
+ sensordLogD() << id() << "HybrisGyroscopeAdaptor stop";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
^
|
| @@ -32,7 +32,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
//setStandbyOverride(false);
@@ -51,7 +51,7 @@
return false;
if (isRunning() &&!powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "HybrisMagnetometerAdaptor start\n";
+ sensordLogD() << id() << "HybrisMagnetometerAdaptor start";
return true;
}
@@ -60,7 +60,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "HybrisMagnetometerAdaptor stop\n";
+ sensordLogD() << id() << "HybrisMagnetometerAdaptor stop";
}
void HybrisMagnetometerAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
^
|
| @@ -49,7 +49,7 @@
powerStatePath = SensorFrameworkConfig::configuration()->value("orientation/powerstate_path").toByteArray();
if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
{
- sensordLogW() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
// unsigned int interval_us = 50 * 1000;
@@ -67,7 +67,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "Hybris OrientationAdaptor start\n";
+ sensordLogD() << id() << "Hybris OrientationAdaptor start";
return true;
}
@@ -76,7 +76,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "Hybris OrientationAdaptor stop\n";
+ sensordLogD() << id() << "Hybris OrientationAdaptor stop";
}
void HybrisOrientationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -51,7 +51,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "Hybris HybrisPressureAdaptor start\n";
+ sensordLogD() << id() << "Hybris HybrisPressureAdaptor start";
return true;
}
@@ -60,7 +60,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "Hybris HybrisPressureAdaptor stop\n";
+ sensordLogD() << id() << "Hybris HybrisPressureAdaptor stop";
}
void HybrisPressureAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -59,7 +59,7 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "HybrisProximityAdaptor start\n";
+ sensordLogD() << id() << "HybrisProximityAdaptor start";
return true;
}
@@ -85,7 +85,7 @@
}
if (inputDev.isEmpty()) {
- sensordLogW() << "No sysfs proximity device found";
+ sensordLogD() << id() << "No sysfs proximity device found";
return;
}
@@ -106,11 +106,11 @@
buffer->commit();
buffer->wakeUpReaders();
} else {
- qDebug() << "ioctl not opened" ;
+ qDebug() << id() << "ioctl not opened" ;
}
close(fd);
} else {
- qDebug() << "could not open proximity evdev";
+ qDebug() << id() << "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() << "HybrisProximityAdaptor stop\n";
+ sensordLogD() << id() << "HybrisProximityAdaptor stop";
}
void HybrisProximityAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << m_powerStatePath;
+ sensordLogW() << NodeBase::id() << "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() << "Hybris RotationAdaptor start";
+ sensordLogD() << id() << "Hybris RotationAdaptor start";
return true;
}
@@ -70,7 +70,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !m_powerStatePath.isEmpty())
writeToFile(m_powerStatePath, "0");
- sensordLogD() << "Hybris RotationAdaptor stop";
+ sensordLogD() << id() << "Hybris RotationAdaptor stop";
}
void HybrisRotationAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Path does not exists: " << powerStatePath;
+ sensordLogW() << NodeBase::id() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
}
@@ -53,13 +53,13 @@
return false;
if (isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "1");
- sensordLogD() << "Hybris HybrisStepCounterAdaptor start\n";
+ sensordLogD() << id() << "Hybris HybrisStepCounterAdaptor start";
return true;
}
void HybrisStepCounterAdaptor::sendInitialData()
{
- sensordLogW() << "No initial data for step counter";
+ sensordLogW() << id() << "No initial data for step counter";
}
void HybrisStepCounterAdaptor::stopSensor()
@@ -67,7 +67,7 @@
HybrisAdaptor::stopSensor();
if (!isRunning() && !powerStatePath.isEmpty())
writeToFile(powerStatePath, "0");
- sensordLogD() << "Hybris HybrisStepCounterAdaptor stop\n";
+ sensordLogD() << id() << "Hybris HybrisStepCounterAdaptor stop";
}
void HybrisStepCounterAdaptor::processSample(const sensors_event_t& data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
| @@ -67,7 +67,7 @@
SysfsAdaptor(id, SysfsAdaptor::IntervalMode, true),
deviceId(id)
{
- sensordLogD() << "Creating IioAdaptor with id: " << id;
+ sensordLogD() << "Creating IioAdaptor with id:" << NodeBase::id();
setup();
}
@@ -85,18 +85,18 @@
void IioAdaptor::setup()
{
- qDebug() << Q_FUNC_INFO << deviceId;
+ qDebug() << id() << Q_FUNC_INFO << deviceId;
if (deviceId.startsWith("accel")) {
const QString name = "accelerometer";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
- qDebug() << "input_match" << inputMatch;
+ qDebug() << id() << "input_match" << inputMatch;
iioDevice.channelTypeName = "accel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O accelerometer (" + iioDevice.name +")";
- qDebug() << Q_FUNC_INFO << "Accelerometer found";
+ qDebug() << id() << 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() << "input_match" << inputMatch;
+ qDebug() << id() << "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() << "input_match" << inputMatch;
+ qDebug() << id() << "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() << desc;
+ qDebug() << id() << 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() << name + ":" << "input_match" << inputMatch;
+ qDebug() << id() << 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() << desc;
+ qDebug() << id() << desc;
proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
setAdaptedSensor(name, desc, proximityBuffer_);
iioDevice.sensorType = IioAdaptor::IIO_PROXIMITY;
@@ -161,7 +161,7 @@
}
if (devNodeNumber == -1) {
- qDebug() << Q_FUNC_INFO << "sensor is invalid";
+ qDebug() << id() << Q_FUNC_INFO << "sensor is invalid";
// setValid(false);
return;
}
@@ -175,7 +175,7 @@
bool ok;
double scale_override = SensorFrameworkConfig::configuration()->value(iioDevice.name + "/scale").toDouble(&ok);
if (ok) {
- sensordLogD() << "Overriding scale to" << scale_override;
+ sensordLogD() << id() << "Overriding scale to" << scale_override;
iioDevice.scale = scale_override;
}
@@ -225,7 +225,7 @@
iioDevice.offset = 0.0;
iioDevice.scale = 1.0;
iioDevice.frequency = 1.0;
- qDebug() << Q_FUNC_INFO << "Syspath for sensor (" + sensorName + "):" << iioDevice.devicePath;
+ qDebug() << id() << 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 +235,26 @@
value = udev_device_get_sysattr_value(dev, name);
if (value == NULL)
continue;
- qDebug() << "attr" << name << value;
+ qDebug() << id() << "attr" << name << value;
QString attributeName(name);
if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*scale$"))) {
iioDevice.scale = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << sensorName + ":" << "Scale is" << iioDevice.scale;
+ qDebug() << id() << sensorName + ":" << "Scale is" << iioDevice.scale;
}
} else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*offset$"))) {
iioDevice.offset = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << sensorName + ":" << "Offset is" << value;
+ qDebug() << id() << sensorName + ":" << "Offset is" << value;
}
} else if (attributeName.endsWith("frequency")) {
iioDevice.frequency = QString(value).toDouble(&ok);
if (ok) {
- qDebug() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
+ qDebug() << id() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
}
} else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*raw$"))) {
- qDebug() << "adding to paths:" << iioDevice.devicePath
+ qDebug() << id() << "adding to paths:" << iioDevice.devicePath
<< attributeName << iioDevice.index;
addPath(iioDevice.devicePath + attributeName, j);
j++;
@@ -290,10 +290,10 @@
bool IioAdaptor::deviceEnable(int device, int enable)
{
- qDebug() << Q_FUNC_INFO <<"device"<< device <<"enable" << enable;
- qDebug() << "devicePath" << iioDevice.devicePath << iioDevice.name;
- qDebug() << "dev_accl_" << devNodeNumber;
- qDebug() << "scale" << (double)iioDevice.scale
+ 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
<< "offset" << iioDevice.offset
<< "frequency" << iioDevice.frequency;
@@ -303,7 +303,7 @@
QString pathEnable = iioDevice.devicePath + "buffer/enable";
QString pathLength = iioDevice.devicePath + "buffer/length";
- qDebug() << pathEnable << pathLength;
+ qDebug() << id() << pathEnable << pathLength;
if (enable == 1) {
// FIXME: should enable sensors for this device? Assuming enabled already
@@ -323,7 +323,7 @@
{
QFile file(filename);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- sensordLogW() << "Failed to open " << filename;
+ sensordLogW() << id() << "Failed to open " << filename;
return false;
}
@@ -339,7 +339,7 @@
{
QFile file(filename);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- sensordLogW() << "Failed to open " << filename;
+ sensordLogW() << id() << "Failed to open " << filename;
return QString();
}
@@ -362,7 +362,7 @@
int value = string.toInt(&ok);
if (!ok) {
- sensordLogW() << "Failed to parse '" << string << "' to int from file " << filename;
+ sensordLogW() << id() << "Failed to parse '" << string << "' to int from file " << filename;
}
return value;
@@ -377,7 +377,7 @@
QDir dir(elementsPath);
if (!dir.exists()) {
- sensordLogW() << "Directory " << elementsPath << " doesn't exist";
+ sensordLogW() << id() << "Directory " << elementsPath << " doesn't exist";
return 0;
}
@@ -418,7 +418,7 @@
} else if (type.compare("le:s64/64>>0") == 0) {
return 8;
} else {
- sensordLogW() << "ERROR: invalid type from file " << filename << ": " << type;
+ sensordLogW() << id() << "ERROR: invalid type from file " << filename << ": " << type;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/kbslideradaptor/kbslideradaptor.cpp
^
|
| @@ -88,7 +88,7 @@
void KeyboardSliderAdaptor::commitOutput()
{
- sensordLogD() << "KB Slider state change detected: " << currentState_;
+ sensordLogD() << id() << "KB Slider state change detected: " << currentState_;
KeyboardSliderState *state = kbstateBuffer_->nextSlot();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << Q_FUNC_INFO << name();
+ qDebug() << id() << Q_FUNC_INFO << name();
QStringList strList = SensorFrameworkConfig::configuration()->value<QStringList>(name() + "/input_match");
- qDebug() << strList;
+ qDebug() << id() << strList;
foreach (const QString str, strList) {
if (!getInputDevices(str)) {
- sensordLogW() << "Input device not found.";
+ sensordLogW() << id() << "Input device not found.";
SysfsAdaptor::init();
}
}
@@ -128,7 +128,7 @@
lidData->timestamp_ = Utils::getTimeStamp(ev);
lidData->value_ = currentValue_;
lidData->type_ = currentType_;
- sensordLogD() << "Lid state change detected: "
+ sensordLogD() << id() << "Lid state change detected: "
<< (currentType_ == 0 ? "front" : "back")
<< (currentValue_ == 0 ? "OPEN": "CLOSED");
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << "Magnetometer output value: " << buf;
+ sensordLogT() << id() << "Magnetometer output value: " << buf;
sscanf(buf, "%hx:%hx:%hx\n", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
^
|
| @@ -75,11 +75,11 @@
z = adjustPos(strList.at(2).toInt(), m_z_adj);
}
} else {
- sensordLogW() << "Reading magnetometer error: " << strerror(errno);
+ sensordLogW() << id() << "Reading magnetometer error: " << strerror(errno);
return;
}
- sensordLogT() << "Magnetometer Reading: " << x << ", " << y << ", " << z;
+ sensordLogT() << id() << "Magnetometer Reading: " << x << ", " << y << ", " << z;
CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
@@ -94,13 +94,13 @@
bool MagnetometerAdaptorNCDK::setPowerState(bool value) const
{
- sensordLogD() << "Setting power state for compass driver" << " to " << value;
+ sensordLogD() << id() << "Setting power state for compass driver" << " to " << value;
QByteArray powerStateStr = QByteArray::number(value);
if (!writeToFile(m_powerStateFilePath, powerStateStr))
{
- sensordLogW() << "Unable to set power state for compass driver";
+ sensordLogW() << id() << "Unable to set power state for compass driver";
return false;
}
return true;
@@ -128,7 +128,7 @@
{
if (!setPowerState(true))
{
- sensordLogW() << "Unable to set power on for compass driver";
+ sensordLogW() << id() << "Unable to set power on for compass driver";
}
else
{
@@ -142,7 +142,7 @@
{
if (!setPowerState(false))
{
- sensordLogW() << "Unable to set power off for compass driver";
+ sensordLogW() << id() << "Unable to set power off for compass driver";
}
else
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
^
|
| @@ -29,7 +29,7 @@
void MagnetometerAdaptorPluginNCDK::Register(class Loader&)
{
- sensordLogD() << "registering magnetometeradaptor";
+ sensordLogD() << id() << "registering magnetometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
^
|
| @@ -68,16 +68,16 @@
unsigned int bytesRead = read(fd, &mag_data, sizeof(mag_data));
if (bytesRead < sizeof(mag_data)) {
- sensordLogW() << "read " << bytesRead << " bytes out of expected " << sizeof(mag_data) << " bytes. Previous error: " << strerror(errno);
+ sensordLogW() << id() << "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() << "Invalid sample received from magnetometer";
+ sensordLogD() << id() << "Invalid sample received from magnetometer";
}
- sensordLogT() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
+ sensordLogT() << id() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
^
|
| @@ -81,13 +81,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << "MPU6050 AccelAdaptor start\n";
+ sensordLogD() << id() << "MPU6050 AccelAdaptor start";
return true;
}
void Mpu6050AccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << "MPU6050 AccelAdaptor stop\n";
+ sensordLogD() << id() << "MPU6050 AccelAdaptor stop";
}
void Mpu6050AccelAdaptor::processSample (int pathId, int fd) {
@@ -95,18 +95,18 @@
int val;
if ( pathId < X_AXIS || pathId > Z_AXIS ) {
- sensordLogW() << "Wrong pathId: " << pathId;
+ sensordLogW() << id() << "Wrong pathId: " << pathId;
return;
}
lseek (fd, 0, SEEK_SET);
if (read (fd, buf, sizeof(buf)) < 0) {
- sensordLogW() << "Read failed";
+ sensordLogW() << id() << "Read failed";
return;
}
if (sscanf (buf, "%d", &val) == 0 ) {
- sensordLogW() << "Wrong data format: " << buf;
+ sensordLogW() << id() << "Wrong data format: " << buf;
return;
}
@@ -125,7 +125,7 @@
buffer->wakeUpReaders();
break;
default:
- sensordLogW() << "Invalid pathId: " << pathId;
+ sensordLogW() << id() << "Invalid pathId: " << pathId;
break;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
^
|
| @@ -25,7 +25,7 @@
void Mpu6050AccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering mpu6050accelerometeradaptor";
+ sensordLogD() << id() << "registering mpu6050accelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
^
|
| @@ -29,7 +29,7 @@
void MRSTAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering mrstaccelerometeradaptor";
+ sensordLogD() << id() << "registering mrstaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
^
|
| @@ -43,13 +43,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << "Oaktrail AccelAdaptor start\n";
+ sensordLogD() << id() << "Oaktrail AccelAdaptor start";
return true;
}
void OaktrailAccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << "Oaktrail AccelAdaptor stop\n";
+ sensordLogD() << id() << "Oaktrail AccelAdaptor stop";
}
void OaktrailAccelAdaptor::processSample (int pathId, int fd) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void OaktrailAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering oaktrailaccelerometeradaptor";
+ sensordLogD() << id() << "registering oaktrailaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
^
|
| @@ -43,13 +43,13 @@
if ( !(SysfsAdaptor::startSensor ()) )
return false;
- sensordLogD() << "OEM tablet AccelAdaptor start\n";
+ sensordLogD() << id() << "OEM tablet AccelAdaptor start";
return true;
}
void OemtabletAccelAdaptor::stopSensor () {
SysfsAdaptor::stopSensor();
- sensordLogD() << "OEM tablet AccelAdaptor stop\n";
+ sensordLogD() << id() << "OEM tablet AccelAdaptor stop";
}
void OemtabletAccelAdaptor::processSample (int pathId, int fd) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void OemtabletAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering oemtabletaccelerometeradaptor";
+ sensordLogD() << id() << "registering oemtabletaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Unable to config ALS range from sysfs, using default value: " << DEFAULT_RANGE;
+ sensordLogW() << id() << "Unable to config ALS range from sysfs, using default value: " << DEFAULT_RANGE;
} else {
sysFile.readLine(buf, sizeof(buf));
range = QString(buf).toInt();
}
- sensordLogT() << "Ambient light range: " << range;
+ sensordLogT() << id() << "Ambient light range: " << range;
// Locate the actual handle
QString devPath = SensorFrameworkConfig::configuration()->value("als-ascii_sysfs_path").toString();
if (devPath.isEmpty())
{
- sensordLogW() << "No driver handle found for ALS. Data not available.";
+ sensordLogW() << id() << "No driver handle found for ALS. Data not available.";
return;
}
@@ -60,12 +60,12 @@
Q_UNUSED(pathId);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << "read():" << strerror(errno);
+ sensordLogW() << id() << "read():" << strerror(errno);
return;
}
buf[sizeof(buf)-1] = '\0';
- sensordLogT() << "Ambient light value: " << buf;
+ sensordLogT() << id() << "Ambient light value: " << buf;
__u16 idata = atoi(buf);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OEMTabletALSAdaptorAsciiPlugin::Register(class Loader&)
{
- sensordLogW() << "registering oemtabletalsadaptor-ascii";
+ sensordLogW() << id() << "registering oemtabletalsadaptor-ascii";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptor.cpp
^
|
| @@ -35,10 +35,10 @@
char buf[32];
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << "read():" << strerror(errno);
+ sensordLogW() << id() << "read():" << strerror(errno);
return;
}
- sensordLogT() << "gyroscope output value: " << buf;
+ sensordLogT() << id() << "gyroscope output value: " << buf;
sscanf(buf, "%hd %hd %hd\n", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OEMTabletGyroscopeAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering oemtabletgyroscopeadaptor";
+ sensordLogD() << id() << "registering oemtabletgyroscopeadaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptor.cpp
^
|
| @@ -11,7 +11,7 @@
devId(0)
{
if (access(SYSFS_MAGNET_PATH, R_OK) < 0) {
- sensordLogW() << SYSFS_MAGNET_PATH << ": "<< strerror(errno);
+ sensordLogW() << id() << SYSFS_MAGNET_PATH << ": "<< strerror(errno);
return;
}
addPath(SYSFS_MAGNET_PATH, devId);
@@ -39,15 +39,15 @@
int x, y, z;
if (pathId != devId) {
- sensordLogW() << "pathId != devId";
+ sensordLogW() << id() << "pathId != devId";
return;
}
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) <= 0) {
- sensordLogW() << "read():" << strerror(errno);
+ sensordLogW() << id() << "read():" << strerror(errno);
return;
}
- sensordLogT() << "Magnetometer output value: " << buf;
+ sensordLogT() << id() << "Magnetometer output value: " << buf;
sscanf(buf, "(%d,%d,%d)", &x, &y, &z);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
^
|
| @@ -4,7 +4,7 @@
void OemtabletMagnetometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering OemtabletMagnetometerAdaptor";
+ sensordLogD() << id() << "registering OemtabletMagnetometerAdaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptor.cpp
^
|
| @@ -23,7 +23,7 @@
sleep(5);
if (!getInputDevices(DEVICE_MATCH_STRING)) {
- sensordLogW() << "Input device not found.";
+ sensordLogW() << id() << "Input device not found.";
}
accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(128);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void PegatronAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering pegatronaccelerometeradaptor";
+ sensordLogD() << id() << "registering pegatronaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
- sensordLogT() << "Proximity output value: " << buf;
+ sensordLogT() << id() << "Proximity output value: " << buf;
ProximityData* proximity = proximityBuffer_->nextSlot();
sscanf(buf, "%d", &proximity->value_);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
^
|
| @@ -80,7 +80,7 @@
static ProximityState oldState = ProximityStateUnknown;
if (currentState_ != oldState) {
- sensordLogD() << "Proximity state change detected: " << currentState_;
+ sensordLogD() << id() << "Proximity state change detected: " << currentState_;
ProximityData *proximityData = proximityBuffer_->nextSlot();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/proximityadaptor/proximityadaptor.cpp
^
|
| @@ -98,9 +98,9 @@
int bytesRead = read(fd, &ps_data, sizeof(ps_data));
if (bytesRead > 0) {
- sensordLogT() << "Proximity Values: " << ps_data.led1 << ", " << ps_data.led2 << ", " << ps_data.led3;
+ sensordLogT() << id() << "Proximity Values: " << ps_data.led1 << ", " << ps_data.led2 << ", " << ps_data.led3;
} else {
- sensordLogW() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
@@ -115,9 +115,9 @@
int bytesRead = read(fd, &ps_data, sizeof(ps_data));
if (bytesRead > 0) {
- sensordLogT() << "Proximity Values: " << ps_data.ps << ", " << ps_data.ps_raw << ", " << ps_data.status;
+ sensordLogT() << id() << "Proximity Values: " << ps_data.ps << ", " << ps_data.ps_raw << ", " << ps_data.status;
} else {
- sensordLogW() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
@@ -132,18 +132,18 @@
memset(buffer, 0, sizeof(buffer));
int bytesRead = read(fd, &buffer, sizeof(buffer));
if (bytesRead <= 0) {
- sensordLogW() << "read(): " << strerror(errno);
+ sensordLogW() << id() << "read(): " << strerror(errno);
return;
}
sscanf(buffer, "%d", &rawdata);
if ( (signed)rawdata > threshold_ ) {
ret = 1;
}
- sensordLogT() << "Proximity value: " << rawdata;
+ sensordLogT() << id() << "Proximity value: " << rawdata;
}
else
{
- sensordLogW() << "Not known device type: " << deviceType_;
+ sensordLogW() << id() << "Not known device type: " << deviceType_;
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
^
|
| @@ -90,7 +90,7 @@
lseek(fd, 0, SEEK_SET);
if (read(fd, buf, sizeof(buf)) < 0 ) {
- sensordLogW() << "Read failed";
+ sensordLogW() << id() << "Read failed";
stopSensor();
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
^
|
| @@ -5,7 +5,7 @@
void SteAccelerometerAdaptorPlugin::Register(class Loader&)
{
- sensordLogD() << "registering steaccelerometeradaptor";
+ sensordLogD() << id() << "registering steaccelerometeradaptor";
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/adaptors/tapadaptor/tapadaptor.cpp
^
|
| @@ -64,7 +64,7 @@
break;
default:
dir = TapData::X;
- sensordLogW() << "TapAdaptor: Unknown event-code received: " << ev->code;
+ sensordLogW() << id() << "TapAdaptor: Unknown event-code received: " << ev->code;
break;
}
TapData tapValue;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << __PRETTY_FUNCTION__ << deviceName << "EVIOCGBIT error";
+ sensordLogW() << id() << __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() << __PRETTY_FUNCTION__ << deviceName << "EVIOGBIT EV_ABS error.";
+ sensordLogW() << id() << __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() << __PRETTY_FUNCTION__ << deviceName << "Testbit ABS_X or ABS_Y failed.";
+ sensordLogW() << id() << __PRETTY_FUNCTION__ << deviceName << "Testbit ABS_X or ABS_Y failed.";
close(fd);
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/chains/accelerometerchain/accelerometerchain.cpp
^
|
| @@ -57,7 +57,7 @@
{
if (!setMatrixFromString(aconvString))
{
- sensordLogW() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
+ sensordLogW() << NodeBase::id() << "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() << Q_FUNC_INFO << "accelerometer/acccoordinatealigner join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer/acccoordinatealigner join failed";
if (!filterBin_->join("acccoordinatealigner", "source", "buffer", "sink"))
- qDebug() << Q_FUNC_INFO << "acccoordinatealigner/buffer join failed";
+ qDebug() << NodeBase::id() << 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() << "No accelerometer adaptor to start.";
+ sensordLogD() << id() << "No accelerometer adaptor to start.";
return false;
}
if (AbstractSensorChannel::start()) {
- sensordLogD() << "Starting AccelerometerChain";
+ sensordLogD() << id() << "Starting AccelerometerChain";
filterBin_->start();
accelerometerAdaptor_->startSensor();
}
@@ -123,12 +123,12 @@
bool AccelerometerChain::stop()
{
if (!accelerometerAdaptor_) {
- sensordLogD() << "No accelerometer adaptor to stop.";
+ sensordLogD() << id() << "No accelerometer adaptor to stop.";
return false;
}
if (AbstractSensorChannel::stop()) {
- sensordLogD() << "Stopping AccelerometerChain";
+ sensordLogD() << id() << "Stopping AccelerometerChain";
accelerometerAdaptor_->stopSensor();
filterBin_->stop();
}
@@ -139,7 +139,7 @@
{
QStringList strList = str.split(',');
if (strList.size() != 9) {
- sensordLogW() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
+ sensordLogW() << id() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/chains/compasschain/compasschain.cpp
^
|
| @@ -115,48 +115,48 @@
// accelchain > avg filter > downsamplefilter > compassfilter
if (!filterBin->join("magnetometer", "source", "compassfilter", "magsink"))
- qDebug() << Q_FUNC_INFO << "magnetometer join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer join failed";
if (!filterBin->join("accelerometer", "source", "avgaccelerometer", "sink"))
- qDebug() << Q_FUNC_INFO << "accelerometer join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer join failed";
if (!filterBin->join("avgaccelerometer", "source", "downsamplefilter", "sink"))
- qDebug() << Q_FUNC_INFO << "avgaccelerometer join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "avgaccelerometer join failed";
if (!filterBin->join("downsamplefilter", "source", "compassfilter", "accsink"))
- qDebug() << Q_FUNC_INFO << "downsamplefilter join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "downsamplefilter join failed";
if (!filterBin->join("compassfilter", "magnorthangle", "magneticnorth", "sink"))
- qDebug() << Q_FUNC_INFO << "compassfilter/magnorth join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "compassfilter/magnorth join failed";
if (!filterBin->join("compassfilter", "magnorthangle", "declinationcorrection", "sink"))
- qDebug() << Q_FUNC_INFO << "compassfilter/declination join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "compassfilter/declination join failed";
} else {
////////////////////
if (!filterBin->join("orientation", "source", "orientationfilter", "orientsink"))
- qDebug() << Q_FUNC_INFO << "orientation join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation join failed";
if (!filterBin->join("orientationfilter", "magnorthangle", "magneticnorth", "sink"))
- qDebug() << Q_FUNC_INFO << "orientation2 join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation2 join failed";
if (!filterBin->join("orientationfilter", "magnorthangle", "declinationcorrection", "sink"))
- qDebug() << Q_FUNC_INFO << "orientation3 join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation3 join failed";
}
if (!filterBin->join("declinationcorrection", "source", "truenorth", "sink"))
- qDebug() << Q_FUNC_INFO << "declinationfilter join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "declinationfilter join failed";
if (!hasOrientationAdaptor) {
if (!connectToSource(accelerometerChain, "accelerometer", accelerometerReader))
- qDebug() << Q_FUNC_INFO << "accelerometer connect failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "accelerometer connect failed";
if (!connectToSource(magChain, "calibratedmagnetometerdata", magReader))
- qDebug() << Q_FUNC_INFO << "magnetometer connect failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer connect failed";
} else {
////////////////////
if (!connectToSource(orientAdaptor, "orientation", orientationdataReader))
- qDebug() << Q_FUNC_INFO << "orientation connect failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "orientation connect failed";
}
setDescription("Compass direction"); //compass north in degrees
@@ -211,7 +211,7 @@
bool CompassChain::start()
{
if (AbstractSensorChannel::start()) {
- sensordLogD() << "Starting compassChain" << hasOrientationAdaptor;
+ sensordLogD() << id() << "Starting compassChain" << hasOrientationAdaptor;
filterBin->start();
if (hasOrientationAdaptor) {
orientAdaptor->startSensor();
@@ -220,7 +220,7 @@
magChain->start();
}
} else {
- qDebug() << Q_FUNC_INFO <<"Failed: not started";
+ qDebug() << id() << Q_FUNC_INFO <<"Failed: not started";
}
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.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() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
+ sensordLogW()<< NodeBase::id() << "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() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
if (!filterBin->join("magcoordinatealigner", "source", "calibration", "magsink"))
- qDebug() << Q_FUNC_INFO << "magcoordinatealigner/calibration join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "magcoordinatealigner/calibration join failed";
if (!filterBin->join("calibration", "source", "calibratedmagnetometerdata", "sink"))
- qDebug() << Q_FUNC_INFO << "calibration/calibratedmagnetometerdata join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibration/calibratedmagnetometerdata join failed";
} else {
if (!filterBin->join("calibratedmagneticfield", "source", "magcoordinatealigner", "sink"))
- qDebug() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "calibratedmagneticfield/magcoordinatealigner join failed";
if (!filterBin->join("magcoordinatealigner", "source", "calibratedmagnetometerdata", "sink"))
- qDebug() << Q_FUNC_INFO << "magcoordinatealigner/calibratedmagnetometerdata join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "magcoordinatealigner/calibratedmagnetometerdata join failed";
}
// Join datasources to the chain
@@ -137,12 +137,12 @@
bool MagCalibrationChain::start()
{
if (!magAdaptor) {
- sensordLogD() << "No magnetometer adaptor to start.";
+ sensordLogD() << id() << "No magnetometer adaptor to start.";
return false;
}
if (AbstractSensorChannel::start()) {
- sensordLogD() << "Starting MagCalibrationChain";
+ sensordLogD() << id() << "Starting MagCalibrationChain";
filterBin->start();
magAdaptor->startSensor();
}
@@ -152,12 +152,12 @@
bool MagCalibrationChain::stop()
{
if (!magAdaptor) {
- sensordLogD() << "No magnetometer adaptor to stop.";
+ sensordLogD() << id() << "No magnetometer adaptor to stop.";
return false;
}
if (AbstractSensorChannel::stop()) {
- sensordLogD() << "Stopping MagCalibrationChain";
+ sensordLogD() << id() << "Stopping MagCalibrationChain";
magAdaptor->stopSensor();
filterBin->stop();
}
@@ -169,7 +169,7 @@
if (needsCalibration) {
CalibrationFilter *filter = static_cast<CalibrationFilter *>(magCalFilter);
if (!filter) {
- sensordLogD() << "Can not reset calibration without filter.";
+ sensordLogD() << id() << "Can not reset calibration without filter.";
return;
}
filter->dropCalibration();
@@ -180,7 +180,7 @@
{
QStringList strList = str.split(',');
if (strList.size() != 9) {
- sensordLogW() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
+ sensordLogW() << id() << "Invalid cell count from matrix. Expected 9, got" << strList.size();
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/chains/orientationchain/orientationchain.cpp
^
|
| @@ -61,13 +61,13 @@
// Join filterchain buffers
if (!filterBin_->join("accelerometer", "source", "orientationinterpreter", "accsink"))
- qDebug() << Q_FUNC_INFO << "accelerometer/orientationinterpreter join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "accelerometer/orientationinterpreter join failed";
if (!filterBin_->join("orientationinterpreter", "topedge", "topedgebuffer", "sink"))
- qDebug() << Q_FUNC_INFO << "orientationinterpreter/topedgebuffer join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "orientationinterpreter/topedgebuffer join failed";
if (!filterBin_->join("orientationinterpreter", "face", "facebuffer", "sink"))
- qDebug() << Q_FUNC_INFO << "orientationinterpreter/facebuffer join failed";
+ qDebug()<< NodeBase::id() << Q_FUNC_INFO << "orientationinterpreter/facebuffer join failed";
if (!filterBin_->join("orientationinterpreter", "orientation", "orientationbuffer", "sink"))
- qDebug() << Q_FUNC_INFO << "orientationinterpreter/orientationbuffer join failed";
+ qDebug()<< NodeBase::id() << 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() << "Starting AccelerometerChain";
+ sensordLogD() << id() << "Starting AccelerometerChain";
filterBin_->start();
accelerometerChain_->start();
}
@@ -103,7 +103,7 @@
bool OrientationChain::stop()
{
if (AbstractSensorChannel::stop()) {
- sensordLogD() << "Stopping AccelerometerChain";
+ sensordLogD() << id() << "Stopping AccelerometerChain";
accelerometerChain_->stop();
filterBin_->stop();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/abstractsensor.cpp
^
|
| @@ -43,7 +43,7 @@
void AbstractSensorChannel::setError(SensorError errorCode, const QString& errorString)
{
- sensordLogC() << "SensorError: " << errorString;
+ sensordLogC() << id() << "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() << "AbstractSensor failed to write to session " << sessionId;
+ sensordLogD() << id() << "AbstractSensor failed to write to session " << sessionId;
return false;
}
return true;
@@ -239,7 +239,7 @@
{
if(downsamplingSupported())
{
- sensordLogT() << "Downsampling state for session " << sessionId << ": " << value;
+ sensordLogT() << id() << "Downsampling state for session " << sessionId << ": " << value;
downsampling_[sessionId] = value;
}
}
@@ -296,6 +296,6 @@
RingBufferBase* AbstractSensorChannel::findBuffer(const QString&) const
{
- sensordLogW() << "Tried to locate buffer from SensorChannel!";
+ sensordLogW() << id() << "Tried to locate buffer from SensorChannel!";
return NULL;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/hybrisadaptor.cpp
^
|
| @@ -194,7 +194,7 @@
(hw_module_t const**)&m_halModule);
if (err != 0) {
m_halModule = 0;
- sensordLogW() << "hw_get_module() failed" << strerror(-err);
+ sensordLogW() << id() << "hw_get_module() failed" << strerror(-err);
return ;
}
@@ -202,7 +202,7 @@
err = sensors_open(&m_halModule->common, &m_halDevice);
if (err != 0) {
m_halDevice = 0;
- sensordLogW() << "sensors_open() failed:" << strerror(-err);
+ sensordLogW() << id() << "sensors_open() failed:" << strerror(-err);
return;
}
@@ -262,13 +262,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;
+ sensordLogD() << "Ignoring non-wake-up sensor of type " << m_sensorArray[i].type << sensorTypeName(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;
+ sensordLogD() << "Ignoring wake-up sensor of type " << m_sensorArray[i].type << sensorTypeName(m_sensorArray[i].type);
use = false;
}
}
@@ -276,7 +276,7 @@
sensordLogD() << Q_FUNC_INFO
<< (use ? "SELECT" : "IGNORE")
- << "type:" << m_sensorArray[i].type
+ << "type:" << m_sensorArray[i].type << sensorTypeName(m_sensorArray[i].type)
#ifdef USE_BINDER
<< "name:" << (m_sensorArray[i].name.data.str ?: "n/a");
#else
@@ -1037,7 +1037,7 @@
HybrisSensorState *state = &m_sensorState[index];
if (state->m_active == active) {
- sensordLogT("HYBRIS CTL setActive%d=%s, %s) -> no-change",
+ sensordLogT("HYBRIS CTL setActive(%d=%s, %s) -> no-change",
sensor->handle, sensorTypeName(sensor->type), active ? "true" : "false");
success = true;
} else {
@@ -1302,6 +1302,9 @@
return;
}
+ introduceAvailableDataRange(DataRange(minRange(), maxRange(), resolution()));
+ introduceAvailableInterval(DataRange(minInterval(), maxInterval(), 0));
+
hybrisManager()->registerAdaptor(this);
}
@@ -1311,8 +1314,6 @@
void HybrisAdaptor::init()
{
- introduceAvailableDataRange(DataRange(minRange(), maxRange(), resolution()));
- introduceAvailableInterval(DataRange(minInterval(), maxInterval(), 0));
}
void HybrisAdaptor::sendInitialData()
@@ -1386,7 +1387,7 @@
bool ok = hybrisManager()->setDelay(m_sensorHandle, interval_us, false);
if (!ok) {
- sensordLogW() << Q_FUNC_INFO << "setInterval not ok";
+ sensordLogW() << id() << Q_FUNC_INFO << "setInterval not ok";
} else {
/* If we have not yet received sensor data, apply fallback value */
sensors_event_t *fallback = hybrisManager()->eventForHandle(m_sensorHandle);
@@ -1433,7 +1434,7 @@
// Get listener object
AdaptedSensorEntry *entry = getAdaptedSensor();
if (entry == NULL) {
- sensordLogW() << Q_FUNC_INFO << "Sensor not found: " << name();
+ sensordLogW() << id() << Q_FUNC_INFO << "Sensor not found: " << name();
return;
}
@@ -1465,7 +1466,7 @@
}
hybrisManager()->stopReader(this);
}
- sensordLogT() << Q_FUNC_INFO << "entry" << entry->name()
+ sensordLogT() << id() << Q_FUNC_INFO << "entry" << entry->name()
<< "refs:" << entry->referenceCount() << "running:" << entry->isRunning();
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/inputdevadaptor.cpp
^
|
| @@ -58,7 +58,7 @@
int InputDevAdaptor::getInputDevices(const QString& typeName)
{
- qDebug() << Q_FUNC_INFO << typeName;
+ qDebug() << id() << 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();
@@ -74,12 +74,12 @@
++m_deviceCount;
} else if(deviceSysPathString.contains("%1")) {
const int MAX_EVENT_DEV = 16;
-qDebug() << deviceNumber << m_deviceCount << m_maxDeviceCount;
+qDebug() << id() << deviceNumber << m_deviceCount << m_maxDeviceCount;
// No configuration for this device, try find the device from the device system path
while (deviceNumber < MAX_EVENT_DEV && m_deviceCount < m_maxDeviceCount) {
deviceName = deviceSysPathString.arg(deviceNumber);
- qDebug() << Q_FUNC_INFO << deviceName;
+ qDebug() << id() << Q_FUNC_INFO << deviceName;
if (checkInputDevice(deviceName, typeName)) {
addPath(deviceName, m_deviceCount);
++m_deviceCount;
@@ -95,10 +95,10 @@
} else {
m_usedDevicePollFilePath = devicePollFilePath.arg(deviceNumber);
}
-qDebug() << Q_FUNC_INFO << m_usedDevicePollFilePath;
+qDebug() << id() << Q_FUNC_INFO << m_usedDevicePollFilePath;
if (m_deviceCount == 0) {
- sensordLogW() << "Cannot find any device for: " << typeName;
+ sensordLogW() << id() << "Cannot find any device for: " << typeName;
setValid(false);
} else {
QByteArray byteArray = readFromFile(m_usedDevicePollFilePath.toLatin1());
@@ -113,11 +113,11 @@
{
int bytes = read(fd, m_evlist, sizeof(struct input_event)*64);
if (bytes == -1) {
- sensordLogW() << "Error occured: " << strerror(errno);
+ sensordLogW() << id() << "Error occured: " << strerror(errno);
return 0;
}
if (bytes % sizeof(struct input_event)) {
- sensordLogW() << "Short read or stray bytes.";
+ sensordLogW() << id() << "Short read or stray bytes.";
return 0;
}
return bytes/sizeof(struct input_event);
@@ -143,7 +143,7 @@
{
char deviceName[256] = {0,};
bool check = true;
-qDebug() << Q_FUNC_INFO << path << matchString << strictChecks;
+qDebug() << id() << Q_FUNC_INFO << path << matchString << strictChecks;
int fd = open(path.toLocal8Bit().constData(), O_RDONLY);
if (fd == -1) {
return false;
@@ -151,13 +151,13 @@
if (strictChecks) {
int result = ioctl(fd, EVIOCGNAME(sizeof(deviceName)), deviceName);
- qDebug() << Q_FUNC_INFO << "open result:" << result << deviceName;
+ qDebug() << id() << Q_FUNC_INFO << "open result:" << result << deviceName;
if (result == -1) {
- sensordLogW() << "Could not read devicename for " << path;
+ sensordLogW() << id() << "Could not read devicename for " << path;
check = false;
} else {
if (QString(deviceName).contains(matchString, Qt::CaseInsensitive)) {
- sensordLogT() << "\"" << matchString << "\"" << " matched in device name: " << deviceName;
+ sensordLogT() << id() << "\"" << matchString << "\"" << " matched in device name: " << deviceName;
check = true;
} else {
check = false;
@@ -181,7 +181,7 @@
// XXX: is this supposed to be sampling frequency or sample time?
int interval_ms = (interval_us + 999) / 1000;
- sensordLogD() << "Setting poll interval for " << m_deviceString << " to " << interval_ms << "ms";
+ 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))
{
@@ -193,9 +193,9 @@
void InputDevAdaptor::init()
{
- qDebug() << Q_FUNC_INFO << name();
+ qDebug() << id() << Q_FUNC_INFO << name();
if (!getInputDevices(SensorFrameworkConfig::configuration()->value<QString>(name() + "/input_match", name()))) {
- sensordLogW() << "Input device not found.";
+ sensordLogW() << id() << "Input device not found.";
SysfsAdaptor::init();
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/logging.h
^
|
| @@ -27,7 +27,8 @@
#ifndef LOGGING_H
#define LOGGING_H
-#include <QDebug>
+// QUARANTINE #include <QDebug>
+#include <QtDebug>
#define sensordLogT(ARGS_...) (qDebug(ARGS_))
#define sensordLogD(ARGS_...) (qInfo(ARGS_))
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/lsclient.cpp
^
|
| @@ -73,7 +73,7 @@
LSErrorFree(&lserror);
}
- qDebug() << "Unable to start service.";
+ qDebug() << id() << "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-binder-0.14.1.tar.bz2/core/nodebase.cpp
^
|
| @@ -162,7 +162,7 @@
DataRangeRequest currentRequest = getCurrentDataRange();
if (!setDataRange(currentRequest.range, currentRequest.id))
{
- sensordLogW() << "Failed to set DataRange.";
+ sensordLogW() << id() << "Failed to set DataRange.";
}
emit propertyChanged("datarange");
}
@@ -183,7 +183,7 @@
}
if (index < 0) {
- sensordLogD() << "No data range request for id " << sessionId;
+ sensordLogD() << id() << "No data range request for sessionId " << sessionId;
return;
}
@@ -205,7 +205,7 @@
DataRangeRequest currentRequest = getCurrentDataRange();
if (!setDataRange(currentRequest.range, currentRequest.id))
{
- sensordLogW() << "Failed to set DataRange.";
+ sensordLogW() << id() << "Failed to set DataRange.";
}
emit propertyChanged("datarange");
}
@@ -452,7 +452,13 @@
unsigned int validatedInterval_us = validateIntervalRequest(interval_us);
if (validatedInterval_us == 0)
{
- sensordLogW() << "Attempting to define invalid default data rate:" << interval_us;
+ // 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";
return false;
}
m_defaultInterval_us = validatedInterval_us;
@@ -745,20 +751,20 @@
{
Q_UNUSED(range);
Q_UNUSED(sessionId);
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return false;
}
bool NodeBase::setStandbyOverride(bool override)
{
Q_UNUSED(override);
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return false;
}
unsigned int NodeBase::interval() const
{
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return 0;
}
@@ -766,20 +772,20 @@
{
Q_UNUSED(interval_us);
Q_UNUSED(sessionId);
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return false;
}
bool NodeBase::setBufferSize(unsigned int value)
{
Q_UNUSED(value);
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return false;
}
bool NodeBase::setBufferInterval(unsigned int interval_us)
{
Q_UNUSED(interval_us);
- sensordLogD() << __func__ << "not implemented in some node using it.";
+ sensordLogD() << id() << __func__ << "not implemented in some node using it.";
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/core/sysfsadaptor.cpp
^
|
| @@ -67,7 +67,7 @@
bool SysfsAdaptor::addPath(const QString& path, const int id)
{
- qDebug() << Q_FUNC_INFO << path;
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << path;
if (!QFile::exists(path)) {
return false;
@@ -102,7 +102,7 @@
AdaptedSensorEntry *entry = getAdaptedSensor();
if (entry == NULL) {
- sensordLogW() << "Sensor not found: " << name();
+ sensordLogW() << id() << "Sensor not found: " << name();
return false;
}
@@ -125,7 +125,7 @@
m_inStandbyMode = false;
if (!startReaderThread()) {
- sensordLogW() << "Failed to start adaptor " << name();
+ sensordLogW() << id() << "Failed to start adaptor " << name();
entry->removeReference();
entry->setIsRunning(false);
m_running = false;
@@ -144,7 +144,7 @@
AdaptedSensorEntry *entry = getAdaptedSensor();
if (entry == NULL) {
- sensordLogW() << "Sensor not found " << name();
+ sensordLogW() << id() << "Sensor not found " << name();
return;
}
@@ -222,7 +222,7 @@
int fd;
for (int i = 0; i < m_paths.size(); i++) {
if ((fd = open(m_paths.at(i).toLatin1().constData(), O_RDONLY)) == -1) {
- sensordLogW() << "open(): " << strerror(errno);
+ sensordLogW() << id() << "open(): " << strerror(errno);
return false;
}
m_sysfsDescriptors.append(fd);
@@ -232,18 +232,18 @@
if (m_mode == SelectMode) {
if (pipe(m_pipeDescriptors) == -1 ) {
- sensordLogW() << "pipe(): " << strerror(errno);
+ sensordLogW() << id() << "pipe(): " << strerror(errno);
return false;
}
if (fcntl(m_pipeDescriptors[0], F_SETFD, FD_CLOEXEC) == -1) {
- sensordLogW() << "fcntl(): " << strerror(errno);
+ sensordLogW() << id() << "fcntl(): " << strerror(errno);
return false;
}
// Set up epoll fd
if ((m_epollDescriptor = epoll_create(m_sysfsDescriptors.size() + 1)) == -1) {
- sensordLogW() << "epoll_create(): " << strerror(errno);
+ sensordLogW() << id() << "epoll_create(): " << strerror(errno);
return false;
}
@@ -255,7 +255,7 @@
for (int i = 0; i < m_sysfsDescriptors.size(); ++i) {
ev.data.fd = m_sysfsDescriptors.at(i);
if (epoll_ctl(m_epollDescriptor, EPOLL_CTL_ADD, m_sysfsDescriptors.at(i), &ev) == -1) {
- sensordLogW() << "epoll_ctl(): " << strerror(errno);
+ sensordLogW() << id() << "epoll_ctl(): " << strerror(errno);
return false;
}
}
@@ -263,7 +263,7 @@
// Add control pipe to poll list
ev.data.fd = m_pipeDescriptors[0];
if (epoll_ctl(m_epollDescriptor, EPOLL_CTL_ADD, m_pipeDescriptors[0], &ev) == -1) {
- sensordLogW() << "epoll_ctl(): " << strerror(errno);
+ sensordLogW() << id() << "epoll_ctl(): " << strerror(errno);
return false;
}
}
@@ -304,7 +304,7 @@
quint64 dummy = 1;
ssize_t bytesWritten = write(m_pipeDescriptors[1], &dummy, 8);
if (!bytesWritten)
- qWarning() << "Could not write pipe descriptors";
+ qWarning() << id() << "Could not write pipe descriptors";
}
else
m_reader.stopReader();
@@ -370,7 +370,7 @@
const QList<DataRange>& list = getAvailableIntervals();
if (list.size() > 1 || (list.size() == 1 && list.first().min != list.first().max))
{
- sensordLogW() << "Attempting to use IntervalMode interval() function for adaptor in SelectMode. Must reimplement!";
+ sensordLogW() << id() << "Attempting to use IntervalMode interval() function for adaptor in SelectMode. Must reimplement!";
return false;
}
}
@@ -425,14 +425,14 @@
int descriptors = epoll_wait(m_parent->m_epollDescriptor, events, m_parent->m_sysfsDescriptors.size() + 1, -1);
if (descriptors == -1) {
- sensordLogD() << "epoll_wait(): " << strerror(errno);
+ sensordLogD() << m_parent->id() << "epoll_wait(): " << strerror(errno);
QThread::msleep(1000);
} else {
bool errorInInput = false;
for (int i = 0; i < descriptors; ++i) {
if (events[i].events & (EPOLLHUP | EPOLLERR)) {
//Note: we ignore error so the sensordiverter.sh works. This should be handled better when testcases are improved.
- sensordLogD() << "epoll_wait(): error in input fd";
+ sensordLogD() << m_parent->id() << "epoll_wait(): error in input fd";
errorInInput = true;
}
int index = m_parent->m_sysfsDescriptors.lastIndexOf(events[i].data.fd);
@@ -443,7 +443,7 @@
{
if (lseek(events[i].data.fd, 0, SEEK_SET) == -1)
{
- sensordLogW() << "Failed to lseek fd: " << strerror(errno);
+ sensordLogW() << m_parent->id() << "Failed to lseek fd: " << strerror(errno);
QThread::msleep(1000);
}
}
@@ -464,7 +464,7 @@
{
if (lseek(m_parent->m_sysfsDescriptors.at(i), 0, SEEK_SET) == -1)
{
- sensordLogW() << "Failed to lseek fd: " << strerror(errno);
+ sensordLogW() << m_parent->id() << "Failed to lseek fd: " << strerror(errno);
QThread::msleep(1000);
}
}
@@ -485,7 +485,7 @@
}
else
{
- sensordLogW() << "No sysfs path defined for: " << name();
+ sensordLogW() << id() << "No sysfs path defined for: " << name();
}
m_mode = (PollMode)SensorFrameworkConfig::configuration()->value<int>(name() + "/mode", m_mode);
m_doSeek = SensorFrameworkConfig::configuration()->value<bool>(name() + "/seek", m_doSeek);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,11 @@
+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
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.14.0
+Version: 0.14.1
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
Cflags: -I${includedir} -I${includedir}/datatypes
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/accelerometersensor/accelerometersensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool AccelerometerSensorChannel::start()
{
- sensordLogD() << "Starting AccelerometerSensorChannel";
+ sensordLogD() << id() << "Starting AccelerometerSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool AccelerometerSensorChannel::stop()
{
- sensordLogD() << "Stopping AccelerometerSensorChannel";
+ sensordLogD() << id() << "Stopping AccelerometerSensorChannel";
if (AbstractSensorChannel::stop()) {
accelerometerChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/alssensor/alssensor.cpp
^
|
| @@ -112,7 +112,7 @@
bool ALSSensorChannel::start()
{
- sensordLogD() << "Starting ALSSensorChannel";
+ sensordLogD() << id() << "Starting ALSSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -124,7 +124,7 @@
bool ALSSensorChannel::stop()
{
- sensordLogD() << "Stopping ALSSensorChannel";
+ sensordLogD() << id() << "Stopping ALSSensorChannel";
if (AbstractSensorChannel::stop()) {
alsAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/compasssensor/compasssensor.cpp
^
|
| @@ -92,7 +92,7 @@
bool CompassSensorChannel::start()
{
- sensordLogD() << "Starting CompassSensorChannel";
+ sensordLogD() << id() << "Starting CompassSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -105,7 +105,7 @@
bool CompassSensorChannel::stop()
{
- sensordLogD() << "Stopping CompassSensorChannel";
+ sensordLogD() << id() << "Stopping CompassSensorChannel";
if (AbstractSensorChannel::stop()) {
compassChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/compassbin.cpp
^
|
| @@ -58,20 +58,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << "Failed to get unique id for compass info via context.";
+ sensordLogC() << id() << "Failed to get unique sessionId for compass info via context.";
}
compassChain = SensorManager::instance().requestChain("compasschain");
if (!compassChain)
{
- sensordLogC() << "Unable to access Compass for heading property.";
+ sensordLogC() << id() << "Unable to access Compass for heading property.";
return;
}
RingBufferBase* rb = compassChain->findBuffer("truenorth");
if (!rb)
{
- sensordLogC() << "Unable to connect to compass direction buffer.";
+ sensordLogC() << id() << "Unable to connect to compass direction buffer.";
}
else
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/contextplugin.cpp
^
|
| @@ -32,7 +32,7 @@
void ContextPlugin::Register(class Loader&)
{
- sensordLogD() << "registering contextsensor";
+ sensordLogD() << id() << "registering contextsensor";
SensorManager& sm = SensorManager::instance();
sm.registerSensor<ContextSensorChannel>("contextsensor");
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/contextsensor.cpp
^
|
| @@ -36,7 +36,7 @@
{
compassBin = new CompassBin(service);
} else {
- sensordLogD() << "Loading of 'compasschain' failed, no Location.Heading available";
+ sensordLogD() << id() << "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-binder-0.14.1.tar.bz2/sensors/contextplugin/normalizerfilter.cpp
^
|
| @@ -41,6 +41,6 @@
source_.propagate(1, &n);
prevTime = data->timestamp_;
} else {
- sensordLogT() << "Discarded sample from normalizer due to too short time delta.";
+ sensordLogT() << id() << "Discarded sample from normalizer due to too short time delta.";
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/orientationbin.cpp
^
|
| @@ -72,20 +72,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << "Failed to get unique id for orientation detection.";
+ sensordLogC() << id() << "Failed to get unique sessionId for orientation detection.";
}
orientationChain = SensorManager::instance().requestChain("orientationchain");
if (!orientationChain)
{
- sensordLogC() << "Unable to access OrientationChain for orientation properties.";
+ sensordLogC() << id() << "Unable to access OrientationChain for orientation properties.";
return;
}
RingBufferBase* rb = orientationChain->findBuffer("topedge");
if (!rb)
{
- sensordLogC() << "Unable to connect to TopEdge orientation buffer.";
+ sensordLogC() << id() << "Unable to connect to TopEdge orientation buffer.";
} else {
rb->join(&topEdgeReader);
}
@@ -93,7 +93,7 @@
rb = orientationChain->findBuffer("face");
if (!rb)
{
- sensordLogC() << "Unable to connect to face orientation buffer.";
+ sensordLogC() << id() << "Unable to connect to face orientation buffer.";
} else {
rb->join(&faceReader);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/screeninterpreterfilter.cpp
^
|
| @@ -52,7 +52,7 @@
void ScreenInterpreterFilter::interpret(unsigned, const PoseData* data)
{
- sensordLogT() << "Data received on ScreenInterpreter... " << data->timestamp_;
+ sensordLogT() << id() << "Data received on ScreenInterpreter... " << data->timestamp_;
provideScreenData(data->orientation_);
source_.propagate(1, data);
}
@@ -60,7 +60,7 @@
void ScreenInterpreterFilter::provideScreenData(PoseData::Orientation orientation)
{
- sensordLogT() << "Screen orientation from contextprovider:" << orientation;
+ sensordLogT() << id() << "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-binder-0.14.1.tar.bz2/sensors/contextplugin/stabilitybin.cpp
^
|
| @@ -72,20 +72,20 @@
sessionId = SensorManager::instance().requestSensor("contextsensor");
if (sessionId == INVALID_SESSION)
{
- sensordLogC() << "Failed to get unique id for stability detection.";
+ sensordLogC() << id() << "Failed to get unique sessionId for stability detection.";
}
accelerometerAdaptor = SensorManager::instance().requestDeviceAdaptor("accelerometeradaptor");
if (!accelerometerAdaptor)
{
- sensordLogC() << "Unable to access Accelerometer for stability properties.";
+ sensordLogC() << id() << "Unable to access Accelerometer for stability properties.";
return;
}
RingBufferBase* rb = accelerometerAdaptor->findBuffer("accelerometer");
if (!rb)
{
- sensordLogC() << "Unable to connect to accelerometer.";
+ sensordLogC() << id() << "Unable to connect to accelerometer.";
} else {
rb->join(&accelerometerReader);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/contextplugin/stabilityfilter.cpp
^
|
| @@ -70,7 +70,7 @@
void StabilityFilter::timeoutTriggered()
{
- sensordLogT() << "Stationary timeout triggered.";
+ sensordLogT() << id() << "Stationary timeout triggered.";
stableProperty->setValue(true);
timer.stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/gyroscopesensor/gyroscopesensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool GyroscopeSensorChannel::start()
{
- sensordLogD() << "Starting GyroscopeSensorChannel";
+ sensordLogD() << id() << "Starting GyroscopeSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool GyroscopeSensorChannel::stop()
{
- sensordLogD() << "Stopping GyroscopeSensorChannel";
+ sensordLogD() << id() << "Stopping GyroscopeSensorChannel";
if (AbstractSensorChannel::stop()) {
gyroscopeAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/humiditysensor/humiditysensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool HumiditySensorChannel::start()
{
- sensordLogD() << "Starting HumiditySensorChannel";
+ sensordLogD() << id() << "Starting HumiditySensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool HumiditySensorChannel::stop()
{
- sensordLogD() << "Stopping HumiditySensorChannel";
+ sensordLogD() << id() << "Stopping HumiditySensorChannel";
if (AbstractSensorChannel::stop()) {
humidityAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/lidsensor/lidsensor.cpp
^
|
| @@ -90,7 +90,7 @@
bool LidSensorChannel::start()
{
- sensordLogD() << "Starting LidSensorChannel";
+ sensordLogD() << id() << "Starting LidSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -102,7 +102,7 @@
bool LidSensorChannel::stop()
{
- sensordLogD() << "Stopping LidSensorChannel";
+ sensordLogD() << id() << "Stopping LidSensorChannel";
if (AbstractSensorChannel::stop()) {
lidAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/magnetometersensor/magnetometersensor.cpp
^
|
| @@ -56,7 +56,7 @@
scaleFilter_ = sm.instantiateFilter("magnetometerscalefilter");
if (scaleFilter_ == NULL)
{
- sensordLogW() << "Failed to initialise scaling filter for magnetometer.";
+ sensordLogW() << NodeBase::id() << "Failed to initialise scaling filter for magnetometer.";
}
}
@@ -73,15 +73,15 @@
filterBin_->add(scaleFilter_, "scaleFilter");
if (!filterBin_->join("magnetometer", "source", "scaleFilter", "sink"))
- qDebug() << Q_FUNC_INFO << "magnetometer/scaleFilter join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer/scaleFilter join failed";
if (!filterBin_->join("filter", "source", "buffer", "sink"))
- qDebug() << Q_FUNC_INFO << "source/buffer join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "source/buffer join failed";
} else
{
if (!filterBin_->join("magnetometer", "source", "buffer", "sink"))
- qDebug() << Q_FUNC_INFO << "magnetometer/buffer join failed";
+ qDebug() << NodeBase::id() << Q_FUNC_INFO << "magnetometer/buffer join failed";
}
// Join datasources to the chain
@@ -130,7 +130,7 @@
bool MagnetometerSensorChannel::start()
{
- sensordLogD() << "Starting MagnetometerSensorChannel";
+ sensordLogD() << id() << "Starting MagnetometerSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -142,7 +142,7 @@
bool MagnetometerSensorChannel::stop()
{
- sensordLogD() << "Stopping MagnetometerSensorChannel";
+ sensordLogD() << id() << "Stopping MagnetometerSensorChannel";
if (AbstractSensorChannel::stop()) {
magChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/orientationsensor/orientationsensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool OrientationSensorChannel::start()
{
- sensordLogD() << "Starting OrientationSensorChannel";
+ sensordLogD() << id() << "Starting OrientationSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool OrientationSensorChannel::stop()
{
- sensordLogD() << "Stopping OrientationSensorChannel";
+ sensordLogD() << id() << "Stopping OrientationSensorChannel";
if (AbstractSensorChannel::stop()) {
orientationChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/pressuresensor/pressuresensor.cpp
^
|
| @@ -88,7 +88,7 @@
bool PressureSensorChannel::start()
{
- sensordLogD() << "Starting PressureSensorChannel";
+ sensordLogD() << id() << "Starting PressureSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -100,7 +100,7 @@
bool PressureSensorChannel::stop()
{
- sensordLogD() << "Stopping PressureSensorChannel";
+ sensordLogD() << id() << "Stopping PressureSensorChannel";
if (AbstractSensorChannel::stop()) {
pressureAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/proximitysensor/proximitysensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool ProximitySensorChannel::start()
{
- sensordLogD() << "Starting ProximitySensorChannel";
+ sensordLogD() << id() << "Starting ProximitySensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool ProximitySensorChannel::stop()
{
- sensordLogD() << "Stopping ProximitySensorChannel";
+ sensordLogD() << id() << "Stopping ProximitySensorChannel";
if (AbstractSensorChannel::stop()) {
proximityAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/rotationsensor/rotationsensor.cpp
^
|
| @@ -51,7 +51,7 @@
if (compassChain_ && compassChain_->isValid()) {
compassReader_ = new BufferReader<CompassData>(1);
} else {
- sensordLogW() << "Unable to use compass for z-axis rotation.";
+ sensordLogW() << NodeBase::id() << "Unable to use compass for z-axis rotation.";
}
rotationFilter_ = sm.instantiateFilter("rotationfilter");
@@ -140,7 +140,7 @@
bool RotationSensorChannel::start()
{
- sensordLogD() << "Starting RotationSensorChannel";
+ sensordLogD() << id() << "Starting RotationSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -157,7 +157,7 @@
bool RotationSensorChannel::stop()
{
- sensordLogD() << "Stopping RotationSensorChannel";
+ sensordLogD() << id() << "Stopping RotationSensorChannel";
if (AbstractSensorChannel::stop()) {
accelerometerChain_->stop();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/stepcountersensor/stepcountersensor.cpp
^
|
| @@ -91,7 +91,7 @@
bool StepCounterSensorChannel::start()
{
- sensordLogD() << "Starting StepCounterSensorChannel";
+ sensordLogD() << id() << "Starting StepCounterSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -103,7 +103,7 @@
bool StepCounterSensorChannel::stop()
{
- sensordLogD() << "Stopping StepCounterSensorChannel";
+ sensordLogD() << id() << "Stopping StepCounterSensorChannel";
if (AbstractSensorChannel::stop()) {
stepcounterAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/tapsensor/tapsensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool TapSensorChannel::start()
{
- sensordLogD() << "Starting TapSensorChannel";
+ sensordLogD() << id() << "Starting TapSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool TapSensorChannel::stop()
{
- sensordLogD() << "Stopping TapSensorChannel";
+ sensordLogD() << id() << "Stopping TapSensorChannel";
if (AbstractSensorChannel::stop()) {
tapAdaptor_->stopSensor();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.14.1.tar.bz2/sensors/temperaturesensor/temperaturesensor.cpp
^
|
| @@ -89,7 +89,7 @@
bool TemperatureSensorChannel::start()
{
- sensordLogD() << "Starting TemperatureSensorChannel";
+ sensordLogD() << id() << "Starting TemperatureSensorChannel";
if (AbstractSensorChannel::start()) {
marshallingBin_->start();
@@ -101,7 +101,7 @@
bool TemperatureSensorChannel::stop()
{
- sensordLogD() << "Stopping TemperatureSensorChannel";
+ sensordLogD() << id() << "Stopping TemperatureSensorChannel";
if (AbstractSensorChannel::stop()) {
temperatureAdaptor_->stopSensor();
|
