|
[-]
[+]
|
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">b3224ffd16cf82f3f41d661d728b0afb45ce8af2</param>
+ <param name="revision">e356bceee13b55ac3b15336282d193e4578dd11a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
^
|
| @@ -113,29 +113,6 @@
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-binder-0.13.0.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.h
^
|
| @@ -70,11 +70,6 @@
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-binder-0.13.0.tar.bz2/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
^
|
| @@ -45,7 +45,8 @@
setDescription("Input device als adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
ALSAdaptorEvdev::~ALSAdaptorEvdev()
@@ -85,33 +86,6 @@
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-binder-0.13.0.tar.bz2/adaptors/alsadaptor-evdev/alsevdevadaptor.h
^
|
| @@ -59,11 +59,6 @@
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-binder-0.13.0.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
^
|
| @@ -45,7 +45,8 @@
setDescription("Input device gyroscope adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
// introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
GyroAdaptorEvdev::~GyroAdaptorEvdev()
@@ -94,33 +95,6 @@
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-binder-0.13.0.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.h
^
|
| @@ -59,11 +59,6 @@
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-binder-0.13.0.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
^
|
| @@ -70,14 +70,18 @@
gyroscopeBuffer_->wakeUpReaders();
}
-bool GyroscopeAdaptor::setInterval(const unsigned int value, const int sessionId)
+bool GyroscopeAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
if (mode() == SysfsAdaptor::IntervalMode)
- return SysfsAdaptor::setInterval(value, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, interval_us);
- int rate = value==0?100:1000/value;
- sensordLogD() << "Setting poll interval for " << dataRatePath_ << " to " << rate;
- QByteArray dataRateString(QString("%1\n").arg(rate).toLocal8Bit());
+ int rate_Hz = 0;
+ if (interval_us > 0)
+ rate_Hz = 1000000 / interval_us;
+ if (rate_Hz <= 0)
+ rate_Hz = 100;
+ sensordLogD() << "Setting poll interval for " << dataRatePath_ << " to " << rate_Hz;
+ QByteArray dataRateString(QString("%1\n").arg(rate_Hz).toLocal8Bit());
return writeToFile(dataRatePath_, dataRateString);
}
@@ -86,5 +90,7 @@
if (mode() == SysfsAdaptor::IntervalMode)
return SysfsAdaptor::interval();
QByteArray byteArray = readFromFile(dataRatePath_);
- return byteArray.size() > 0 ? byteArray.toInt() : 0;
+ int rate_Hz = byteArray.size() > 0 ? byteArray.toInt() : 0;
+ int interval_us = rate_Hz > 0 ? 1000000 / rate_Hz : 0;
+ return interval_us;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptor.h
^
|
| @@ -69,7 +69,7 @@
*/
~GyroscopeAdaptor();
- bool setInterval(const unsigned int value, const int sessionId);
+ bool setInterval(const int sessionId, const unsigned int interval_us);
unsigned int interval() const;
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/humidityadaptor/humidityadaptor.cpp
^
|
| @@ -42,7 +42,8 @@
setDescription("Input device humidity adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("humidity/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
HumidityAdaptor::~HumidityAdaptor()
@@ -82,33 +83,6 @@
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-binder-0.13.0.tar.bz2/adaptors/humidityadaptor/humidityadaptor.h
^
|
| @@ -59,11 +59,6 @@
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-binder-0.13.0.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
^
|
| @@ -30,7 +30,8 @@
setDescription("Hybris accelerometer");
powerStatePath = SensorFrameworkConfig::configuration()->value("accelerometer/powerstate_path").toByteArray();
-// setDefaultInterval(50);
+// unsigned int interval_us = 50 * 1000;
+// setDefaultInterval(interval_us);
}
HybrisAccelerometerAdaptor::~HybrisAccelerometerAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
^
|
| @@ -36,7 +36,8 @@
sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
- setDefaultInterval(50);
+ unsigned int interval_us = 50 * 1000;
+ setDefaultInterval(interval_us);
}
HybrisGyroscopeAdaptor::~HybrisGyroscopeAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
^
|
| @@ -36,7 +36,8 @@
powerStatePath.clear();
}
//setStandbyOverride(false);
- setDefaultInterval(50);
+ unsigned int interval_us = 50 * 1000;
+ setDefaultInterval(interval_us);
}
HybrisMagnetometerAdaptor::~HybrisMagnetometerAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
^
|
| @@ -52,7 +52,8 @@
sensordLogW() << "Path does not exists: " << powerStatePath;
powerStatePath.clear();
}
-// setDefaultInterval(50);
+// unsigned int interval_us = 50 * 1000;
+// setDefaultInterval(interval_us);
}
HybrisOrientationAdaptor::~HybrisOrientationAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
| @@ -180,8 +180,13 @@
}
introduceAvailableDataRange(DataRange(0, 65535, 1));
- introduceAvailableInterval(DataRange(0, 586, 0));
- setDefaultInterval(10);
+
+ 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);
}
int IioAdaptor::findSensor(const QString &sensorName)
@@ -548,21 +553,21 @@
}
}
-bool IioAdaptor::setInterval(const unsigned int value, const int sessionId)
+bool IioAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
if (mode() == SysfsAdaptor::IntervalMode)
- return SysfsAdaptor::setInterval(value, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, interval_us);
- sensordLogD() << "Ignoring setInterval for " << value;
+ sensordLogD() << "Ignoring setInterval for " << interval_us;
return true;
}
//unsigned int IioAdaptor::interval() const
//{
-// int value = 100;
-// sensordLogD() << "Returning dummy value in interval(): " << value;
-// return value;
+// int interval_us = 100 * 1000;
+// sensordLogD() << "Returning dummy value in interval(): " << interval_us;
+// return interval_us;
//}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/iioadaptor/iioadaptor.h
^
|
| @@ -104,7 +104,7 @@
~IioAdaptor();
- bool setInterval(const unsigned int value, const int sessionId);
+ bool setInterval(const int sessionId, const unsigned int interval_us);
// unsigned int interval() const;
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/kbslideradaptor/kbslideradaptor.cpp
^
|
| @@ -103,9 +103,9 @@
return 0;
}
-bool KeyboardSliderAdaptor::setInterval(unsigned int value, int sessionId)
+bool KeyboardSliderAdaptor::setInterval(int sessionId, unsigned int interval_us)
{
- Q_UNUSED(value);
+ Q_UNUSED(interval_us);
Q_UNUSED(sessionId);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/kbslideradaptor/kbslideradaptor.h
^
|
| @@ -66,7 +66,7 @@
~KeyboardSliderAdaptor();
virtual unsigned int interval() const;
- virtual bool setInterval(unsigned int value, int sessionId);
+ virtual bool setInterval(int sessionId, unsigned int interval_us);
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
^
|
| @@ -44,7 +44,8 @@
setDescription("Input device magnetometer adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
// introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
MagAdaptorEvdev::~MagAdaptorEvdev()
@@ -93,33 +94,6 @@
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-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.h
^
|
| @@ -62,11 +62,6 @@
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-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
^
|
| @@ -32,31 +32,32 @@
MagnetometerAdaptorNCDK::MagnetometerAdaptorNCDK(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::IntervalMode),
- powerState_(false)
+ m_powerState(false)
{
- 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_);
+ 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);
setDescription("Magnetometer adaptor (ak8975) for NCDK");
//get sensitivity adjustment
- getSensitivityAdjustment(x_adj, y_adj, z_adj);
+ getSensitivityAdjustment(m_x_adj, m_y_adj, m_z_adj);
- overflowLimit_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
+ m_overflowLimit = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
}
MagnetometerAdaptorNCDK::~MagnetometerAdaptorNCDK()
{
- delete magnetometerBuffer_;
+ delete m_magnetometerBuffer;
}
void MagnetometerAdaptorNCDK::processSample(int pathId, int fd)
{
Q_UNUSED(pathId);
- if (!powerState_)
+ if (!m_powerState)
return;
char buf[32];
@@ -69,9 +70,9 @@
if (isOK) {
strList = QByteArray(buf, bytesRead).split(':');
if (strList.size() == 3) {
- x = adjustPos(strList.at(0).toInt(), x_adj);
- y = adjustPos(strList.at(1).toInt(), y_adj);
- z = adjustPos(strList.at(2).toInt(), z_adj);
+ 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);
}
} else {
sensordLogW() << "Reading magnetometer error: " << strerror(errno);
@@ -80,15 +81,15 @@
sensordLogT() << "Magnetometer Reading: " << x << ", " << y << ", " << z;
- CalibratedMagneticFieldData* sample = magnetometerBuffer_->nextSlot();
+ CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
sample->timestamp_ = Utils::getTimeStamp();
sample->x_ = x;
sample->y_ = y;
sample->z_ = z;
- magnetometerBuffer_->commit();
- magnetometerBuffer_->wakeUpReaders();
+ m_magnetometerBuffer->commit();
+ m_magnetometerBuffer->wakeUpReaders();
}
bool MagnetometerAdaptorNCDK::setPowerState(bool value) const
@@ -97,7 +98,7 @@
QByteArray powerStateStr = QByteArray::number(value);
- if (!writeToFile(powerStateFilePath_, powerStateStr))
+ if (!writeToFile(m_powerStateFilePath, powerStateStr))
{
sensordLogW() << "Unable to set power state for compass driver";
return false;
@@ -107,7 +108,7 @@
void MagnetometerAdaptorNCDK::getSensitivityAdjustment(int &x, int &y, int &z) const
{
- QByteArray byteArray = readFromFile(sensAdjFilePath_);
+ QByteArray byteArray = readFromFile(m_sensAdjFilePath);
QList<QByteArray> strList = byteArray.split(':');
if (strList.size() == 3)
@@ -131,7 +132,7 @@
}
else
{
- powerState_ = true;
+ m_powerState = true;
}
return SysfsAdaptor::startSensor();
@@ -145,27 +146,27 @@
}
else
{
- powerState_ = false;
+ m_powerState = false;
}
SysfsAdaptor::stopSensor();
}
-bool MagnetometerAdaptorNCDK::setInterval(const unsigned int value, const int sessionId)
+bool MagnetometerAdaptorNCDK::setInterval(const int sessionId, const unsigned int interval_us)
{
- if(intervalCompensation_)
+ if(m_intervalCompensation_us)
{
- return SysfsAdaptor::setInterval((int)value > intervalCompensation_ ? value - intervalCompensation_ : 0, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, (int)interval_us > m_intervalCompensation_us ? interval_us - m_intervalCompensation_us : 0);
}
- return SysfsAdaptor::setInterval(value, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, interval_us);
}
void MagnetometerAdaptorNCDK::setOverflowLimit(int limit)
{
- overflowLimit_ = limit;
+ m_overflowLimit = limit;
}
int MagnetometerAdaptorNCDK::overflowLimit() const
{
- return overflowLimit_;
+ return m_overflowLimit;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.h
^
|
| @@ -58,7 +58,7 @@
MagnetometerAdaptorNCDK(const QString& id);
~MagnetometerAdaptorNCDK();
- bool setInterval(const unsigned int value, const int sessionId);
+ bool setInterval(const int sessionId, const unsigned int interval_us);
private:
@@ -71,18 +71,22 @@
*/
void processSample(int pathId, int fd);
- QByteArray powerStateFilePath_;
- QByteArray sensAdjFilePath_;
+ QByteArray m_powerStateFilePath;
+ QByteArray m_sensAdjFilePath;
- int x_adj, y_adj, z_adj;
- bool powerState_;
- DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
+ int m_x_adj;
+ int m_y_adj;
+ int m_z_adj;
+ bool m_powerState;
+
+ DeviceAdaptorRingBuffer<CalibratedMagneticFieldData> *m_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 intervalCompensation_;
- int overflowLimit_;
+ int m_intervalCompensation_us;
+ int m_overflowLimit;
/**
* Sets the overflow limit of the sensor, checked when calibrated
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
^
|
| @@ -46,16 +46,17 @@
MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::IntervalMode, false)
{
- 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);
+ 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);
setDescription("Input device Magnetometer adaptor (ak897x)");
}
MagnetometerAdaptor::~MagnetometerAdaptor()
{
- delete magnetometerBuffer_;
+ delete m_magnetometerBuffer;
}
void MagnetometerAdaptor::processSample(int pathId, int fd)
@@ -78,32 +79,32 @@
sensordLogT() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
- CalibratedMagneticFieldData* sample = magnetometerBuffer_->nextSlot();
+ CalibratedMagneticFieldData *sample = m_magnetometerBuffer->nextSlot();
sample->timestamp_ = Utils::getTimeStamp();
sample->x_ = mag_data.x;
sample->y_ = mag_data.y;
sample->z_ = mag_data.z;
- magnetometerBuffer_->commit();
- magnetometerBuffer_->wakeUpReaders();
+ m_magnetometerBuffer->commit();
+ m_magnetometerBuffer->wakeUpReaders();
}
-bool MagnetometerAdaptor::setInterval(const unsigned int value, const int sessionId)
+bool MagnetometerAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
- if(intervalCompensation_)
+ if(m_intervalCompensation_us)
{
- return SysfsAdaptor::setInterval((signed)value >intervalCompensation_ ? value - intervalCompensation_ : 0, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, (signed)interval_us >m_intervalCompensation_us ? interval_us - m_intervalCompensation_us : 0);
}
- return SysfsAdaptor::setInterval(value, sessionId);
+ return SysfsAdaptor::setInterval(sessionId, interval_us);
}
void MagnetometerAdaptor::setOverflowLimit(int limit)
{
- overflowLimit_ = limit;
+ m_overflowLimit = limit;
}
int MagnetometerAdaptor::overflowLimit() const
{
- return overflowLimit_;
+ return m_overflowLimit;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptor.h
^
|
| @@ -64,7 +64,7 @@
MagnetometerAdaptor(const QString& id);
~MagnetometerAdaptor();
- bool setInterval(const unsigned int value, const int sessionId);
+ bool setInterval(const int sessionId, const unsigned int interval_us);
private:
@@ -91,9 +91,9 @@
*/
int overflowLimit() const;
- DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
- int intervalCompensation_;
- int overflowLimit_;
+ DeviceAdaptorRingBuffer<CalibratedMagneticFieldData> *m_magnetometerBuffer;
+ int m_intervalCompensation_us;
+ int m_overflowLimit;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
^
|
| @@ -66,8 +66,11 @@
setDescription("MPU 6050 accelerometer");
// introduceAvailableDataRange(DataRange(-16384, 16384, 1));
-// introduceAvailableInterval(DataRange(10, 586, 0));
-// setDefaultInterval(100);
+// 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);
}
Mpu6050AccelAdaptor::~Mpu6050AccelAdaptor () {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
^
|
| @@ -26,8 +26,13 @@
setDescription("Oaktrail accelerometer");
introduceAvailableDataRange(DataRange(-256, 256, 1));
- introduceAvailableInterval(DataRange(10, 586, 0));
- setDefaultInterval(100);
+
+ 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);
}
OaktrailAccelAdaptor::~OaktrailAccelAdaptor () {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
^
|
| @@ -26,8 +26,13 @@
setDescription("OEM tablet accelerometer");
introduceAvailableDataRange(DataRange(-256, 256, 1));
- introduceAvailableInterval(DataRange(10, 586, 0));
- setDefaultInterval(0);
+
+ 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);
}
OemtabletAccelAdaptor::~OemtabletAccelAdaptor () {
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp
^
|
| @@ -42,8 +42,13 @@
setDescription("Ambient light");
introduceAvailableDataRange(DataRange(0, range, 1));
- introduceAvailableInterval(DataRange(10, 98, 0));
- setDefaultInterval(90);
+
+ 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);
}
OEMTabletALSAdaptorAscii::~OEMTabletALSAdaptorAscii()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptor.cpp
^
|
| @@ -14,8 +14,13 @@
setAdaptedSensor("gyroscope", "mpu3050", gyroscopeBuffer_);
introduceAvailableDataRange(DataRange(-32768, 32767, 1));
- introduceAvailableInterval(DataRange(10, 113, 0));
- setDefaultInterval(100);
+
+ 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);
}
OEMTabletGyroscopeAdaptor::~OEMTabletGyroscopeAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptor.cpp
^
|
| @@ -20,8 +20,13 @@
setDescription("OEM tablet magnetometer");
introduceAvailableDataRange(DataRange(-2048, 2048, 1));
- introduceAvailableInterval(DataRange(10, 556, 0));
- setDefaultInterval(500);
+
+ 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);
}
OemtabletMagnetometerAdaptor::~OemtabletMagnetometerAdaptor()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptor.cpp
^
|
| @@ -32,9 +32,15 @@
// Set Metadata
setDescription("Input device accelerometer adaptor (Pegtron Lucid Tablet)");
introduceAvailableDataRange(DataRange(-512, 512, 1));
+
introduceAvailableInterval(DataRange(0, 0, 0));
- introduceAvailableInterval(DataRange(50, 2000, 0)); // -> [1,100] Hz
- setDefaultInterval(300);
+
+ 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);
}
PegatronAccelerometerAdaptor::~PegatronAccelerometerAdaptor()
@@ -82,32 +88,3 @@
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-binder-0.13.0.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptor.h
^
|
| @@ -27,11 +27,6 @@
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-binder-0.13.0.tar.bz2/adaptors/pressureadaptor/pressureadaptor.cpp
^
|
| @@ -42,7 +42,8 @@
setDescription("Input device pressure adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("pressure/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
PressureAdaptor::~PressureAdaptor()
@@ -82,33 +83,6 @@
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-binder-0.13.0.tar.bz2/adaptors/pressureadaptor/pressureadaptor.h
^
|
| @@ -59,11 +59,6 @@
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-binder-0.13.0.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
^
|
| @@ -18,8 +18,10 @@
{
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)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/tapadaptor/tapadaptor.cpp
^
|
| @@ -94,7 +94,7 @@
tapBuffer_->wakeUpReaders();
}
-bool TapAdaptor::setInterval(const unsigned int, const int)
+bool TapAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/tapadaptor/tapadaptor.h
^
|
| @@ -59,7 +59,7 @@
TapAdaptor(const QString& id);
~TapAdaptor();
- virtual bool setInterval(const unsigned int value, const int sessionId);
+ virtual bool setInterval(const int sessionId, const unsigned int interval_us);
private:
DeviceAdaptorRingBuffer<TapData>* tapBuffer_; /**< Output buffer */
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/adaptors/temperatureadaptor/temperatureadaptor.cpp
^
|
| @@ -42,7 +42,8 @@
setDescription("Input device temperature adaptor");
powerStatePath_ = SensorFrameworkConfig::configuration()->value("temperature/powerstate_path").toByteArray();
introduceAvailableDataRange(DataRange(0, 4095, 1));
- setDefaultInterval(10);
+ unsigned int interval_us = 10 * 1000;
+ setDefaultInterval(interval_us);
}
TemperatureAdaptor::~TemperatureAdaptor()
@@ -82,33 +83,6 @@
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-binder-0.13.0.tar.bz2/adaptors/temperatureadaptor/temperatureadaptor.h
^
|
| @@ -58,11 +58,6 @@
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-binder-0.13.0.tar.bz2/chains/compasschain/compasschain.cpp
^
|
| @@ -161,7 +161,10 @@
setDescription("Compass direction"); //compass north in degrees
introduceAvailableDataRange(DataRange(0, 359, 1));
- introduceAvailableInterval(DataRange(50,200,0));
+
+ unsigned int min_interval_us = 50 * 1000;
+ unsigned int max_interval_us = 200 * 1000;
+ introduceAvailableInterval(DataRange(min_interval_us, max_interval_us, 0));
if (!hasOrientationAdaptor) {
DownsampleFilter *filter = static_cast<DownsampleFilter *>(downsampleFilter);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/abstractsensor_a.cpp
^
|
| @@ -64,12 +64,22 @@
unsigned int AbstractSensorChannelAdaptor::interval() const
{
- return node()->getInterval();
+ // 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;
}
unsigned int AbstractSensorChannelAdaptor::bufferInterval() const
{
- return node()->bufferInterval();
+ // 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;
}
unsigned int AbstractSensorChannelAdaptor::bufferSize() const
@@ -99,10 +109,24 @@
node()->stop(sessionId);
}
-void AbstractSensorChannelAdaptor::setInterval(int sessionId, int value)
+void AbstractSensorChannelAdaptor::setInterval(int sessionId, int interval_ms)
{
- node()->setIntervalRequest(sessionId, value);
- SensorManager::instance().socketHandler().setInterval(sessionId, 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);
}
bool AbstractSensorChannelAdaptor::standbyOverride() const
@@ -147,22 +171,26 @@
return ok;
}
-void AbstractSensorChannelAdaptor::setBufferInterval(int sessionId, unsigned int value)
+void AbstractSensorChannelAdaptor::setBufferInterval(int sessionId, unsigned int interval_ms)
{
+ // 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(value == 0)
+ if(interval_us == 0)
node()->clearBufferInterval(sessionId);
else
- node()->setBufferInterval(sessionId, value);
- value = 0;
+ node()->setBufferInterval(sessionId, interval_us);
+ interval_us = 0;
}
- if(value == 0)
+ if(interval_us == 0)
SensorManager::instance().socketHandler().clearBufferInterval(sessionId);
else
- SensorManager::instance().socketHandler().setBufferInterval(sessionId, value);
+ SensorManager::instance().socketHandler().setBufferInterval(sessionId, interval_us);
}
void AbstractSensorChannelAdaptor::setBufferSize(int sessionId, unsigned int value)
@@ -184,8 +212,14 @@
IntegerRangeList AbstractSensorChannelAdaptor::getAvailableBufferIntervals() const
{
+ // D-Bus interface -> interval is milliseconds
bool dummy;
- return node()->getAvailableBufferIntervals(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;
}
IntegerRangeList AbstractSensorChannelAdaptor::getAvailableBufferSizes() const
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/abstractsensor_a.h
^
|
| @@ -124,7 +124,13 @@
*
* Will also configure interval for the data connection.
*/
- void setInterval(int sessionId, int value);
+ 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);
/** AbstractSensorChannel::getAvailableIntervals() */
DataRangeList getAvailableIntervals();
@@ -138,13 +144,13 @@
/** AbstractSensorChannel::setDownsampling(int, bool) */
void setDownsampling(int sessionId, bool value);
- /** AbstractSensorChannel::isValid(int, unsigned int)
+ /** AbstractSensorChannel::setBufferInterval(int, unsigned int)
*
* Will also configure buffer interval for the data connection.
*/
- void setBufferInterval(int sessionId, unsigned int value);
+ void setBufferInterval(int sessionId, unsigned int interval_ms);
- /** AbstractSensorChannel::isValid(int, unsigned int)
+ /** AbstractSensorChannel::setBufferSize(int, unsigned int)
*
* Will also configure buffer size for the data connection.
*/
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/hybrisadaptor.cpp
^
|
| @@ -132,9 +132,9 @@
* ========================================================================= */
HybrisSensorState::HybrisSensorState()
- : m_minDelay(0)
- , m_maxDelay(0)
- , m_delay(-1)
+ : m_minDelay_us(0)
+ , m_maxDelay_us(0)
+ , m_delay_us(-1)
, m_active(-1)
{
memset(&m_fallbackEvent, 0, sizeof m_fallbackEvent);
@@ -284,16 +284,16 @@
#endif
if (use) {
- // 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
+ // 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
#ifdef USE_BINDER
- maxDelay = (m_sensorArray[i].maxDelay + 999) / 1000;
+ maxDelay_us = m_sensorArray[i].maxDelay;
#else
#ifdef SENSORS_DEVICE_API_VERSION_1_3
if (m_halDevice->common.version >= SENSORS_DEVICE_API_VERSION_1_3)
- maxDelay = (m_sensorArray[i].maxDelay + 999) / 1000;
+ maxDelay_us = m_sensorArray[i].maxDelay;
#endif
#endif
@@ -305,10 +305,10 @@
* For now use: minDelay * 2, but at least 1000 ms.
*/
- if (maxDelay < 0 && minDelay > 0) {
- maxDelay = (minDelay < 500) ? 1000 : (minDelay * 2);
- sensordLogD("hal does not specify maxDelay, fallback: %d ms",
- maxDelay);
+ 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);
}
// Positive minDelay means delay /can/ be set - but depending
@@ -318,25 +318,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 >= 0) {
- if (maxDelay < minDelay)
- maxDelay = minDelay;
-
- int delay = minDelay ? 200 : 0;
- if (delay < minDelay)
- delay = minDelay;
- else if (delay > maxDelay )
- delay = maxDelay;
+ 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;
- m_sensorState[i].m_minDelay = minDelay;
- m_sensorState[i].m_maxDelay = maxDelay;
+ m_sensorState[i].m_minDelay_us = minDelay_us;
+ m_sensorState[i].m_maxDelay_us = maxDelay_us;
- setDelay(m_sensorArray[i].handle, delay, true);
+ setDelay(m_sensorArray[i].handle, delay_us, true);
sensordLogD("delay = %d [%d, %d]",
- m_sensorState[i].m_delay,
- m_sensorState[i].m_minDelay,
- m_sensorState[i].m_maxDelay);
+ m_sensorState[i].m_delay_us,
+ m_sensorState[i].m_minDelay_us,
+ m_sensorState[i].m_maxDelay_us);
}
m_indexOfType.insert(m_sensorArray[i].type, i);
@@ -901,56 +901,56 @@
int HybrisManager::getMinDelay(int handle) const
{
- int delay = 0;
+ int delay_us = 0;
int index = indexForHandle(handle);
if (index != -1) {
const struct sensor_t *sensor = &m_sensorArray[index];
HybrisSensorState *state = &m_sensorState[index];
- delay = state->m_minDelay;
+ delay_us = state->m_minDelay_us;
sensordLogT("HYBRIS CTL getMinDelay(%d=%s) -> %d",
- sensor->handle, sensorTypeName(sensor->type), delay);
+ sensor->handle, sensorTypeName(sensor->type), delay_us);
}
- return delay;
+ return delay_us;
}
int HybrisManager::getMaxDelay(int handle) const
{
- int delay = 0;
+ int delay_us = 0;
int index = indexForHandle(handle);
if (index != -1) {
const struct sensor_t *sensor = &m_sensorArray[index];
HybrisSensorState *state = &m_sensorState[index];
- delay = state->m_maxDelay;
+ delay_us = state->m_maxDelay_us;
sensordLogT("HYBRIS CTL getMaxDelay(%d=%s) -> %d",
- sensor->handle, sensorTypeName(sensor->type), delay);
+ sensor->handle, sensorTypeName(sensor->type), delay_us);
}
- return delay;
+ return delay_us;
}
int HybrisManager::getDelay(int handle) const
{
- int delay = 0;
+ int delay_us = 0;
int index = indexForHandle(handle);
if (index != -1) {
const struct sensor_t *sensor = &m_sensorArray[index];
HybrisSensorState *state = &m_sensorState[index];
- delay = state->m_delay;
+ delay_us = state->m_delay_us;
sensordLogT("HYBRIS CTL getDelay(%d=%s) -> %d",
- sensor->handle, sensorTypeName(sensor->type), delay);
+ sensor->handle, sensorTypeName(sensor->type), delay_us);
}
- return delay;
+ return delay_us;
}
-bool HybrisManager::setDelay(int handle, int delay_ms, bool force)
+bool HybrisManager::setDelay(int handle, int delay_us, bool force)
{
bool success = false;
int index = indexForHandle(handle);
@@ -959,11 +959,12 @@
const struct sensor_t *sensor = &m_sensorArray[index];
HybrisSensorState *state = &m_sensorState[index];
- if (!force && state->m_delay == delay_ms) {
+ if (!force && state->m_delay_us == delay_us) {
sensordLogT("HYBRIS CTL setDelay(%d=%s, %d) -> no-change",
- sensor->handle, sensorTypeName(sensor->type), delay_ms);
+ sensor->handle, sensorTypeName(sensor->type), delay_us);
+ success = true;
} else {
- int64_t delay_ns = delay_ms * 1000LL * 1000LL;
+ int64_t delay_ns = delay_us * 1000LL;
#ifdef USE_BINDER
int error;
GBinderLocalRequest *req = gbinder_client_new_request2(m_client, BATCH);
@@ -995,12 +996,12 @@
#endif
if (error) {
sensordLogW("HYBRIS CTL setDelay(%d=%s, %d) -> %d=%s",
- sensor->handle, sensorTypeName(sensor->type), delay_ms,
+ sensor->handle, sensorTypeName(sensor->type), delay_us,
error, strerror(error));
} else {
sensordLogD("HYBRIS CTL setDelay(%d=%s, %d) -> success",
- sensor->handle, sensorTypeName(sensor->type), delay_ms);
- state->m_delay = delay_ms;
+ sensor->handle, sensorTypeName(sensor->type), delay_us);
+ state->m_delay_us = delay_us;
success = true;
}
}
@@ -1041,11 +1042,11 @@
success = true;
} else {
#ifdef USE_BINDER
- if (active && state->m_delay != -1) {
+ if (active && state->m_delay_us != -1) {
sensordLogD("HYBRIS CTL FORCE PRE UPDATE %i, %s", sensor->handle, sensorTypeName(sensor->type));
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/hybrisadaptor.h
^
|
| @@ -139,9 +139,9 @@
HybrisSensorState();
~HybrisSensorState();
- int m_minDelay;
- int m_maxDelay;
- int m_delay;
+ int m_minDelay_us;
+ int m_maxDelay_us;
+ int m_delay_us;
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_ms, bool force);
+ bool setDelay (int handle, int delay_us, bool force);
bool getActive (int handle) const;
bool setActive (int handle, bool active);
@@ -274,8 +274,7 @@
unsigned int maxInterval() const;
virtual unsigned int interval() const;
- virtual bool setInterval(const unsigned int value, const int sessionId);
- virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
+ virtual bool setInterval(const int sessionId, const unsigned int interval_us);
static bool writeToFile(const QByteArray& path, const QByteArray& content);
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/inputdevadaptor.cpp
^
|
| @@ -45,11 +45,11 @@
InputDevAdaptor::InputDevAdaptor(const QString& id, int maxDeviceCount) :
SysfsAdaptor(id, SysfsAdaptor::SelectMode, false),
- deviceCount_(0),
- maxDeviceCount_(maxDeviceCount),
- cachedInterval_(0)
+ m_deviceCount(0),
+ m_maxDeviceCount(maxDeviceCount),
+ m_cachedInterval_us(0)
{
- memset(evlist_, 0x0, sizeof(input_event)*64);
+ memset(m_evlist, 0x0, sizeof(input_event)*64);
}
InputDevAdaptor::~InputDevAdaptor()
@@ -63,26 +63,26 @@
QString devicePollFilePath = SensorFrameworkConfig::configuration()->value("global/device_poll_file_path").toString();
int deviceNumber = 0;
- deviceString_ = typeName;
+ m_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, deviceCount_);
- ++deviceCount_;
+ addPath(deviceName, m_deviceCount);
+ ++m_deviceCount;
} else if(deviceSysPathString.contains("%1")) {
const int MAX_EVENT_DEV = 16;
-qDebug() << deviceNumber << deviceCount_ << maxDeviceCount_;
+qDebug() << deviceNumber << m_deviceCount << m_maxDeviceCount;
// No configuration for this device, try find the device from the device system path
- while (deviceNumber < MAX_EVENT_DEV && deviceCount_ < maxDeviceCount_) {
+ while (deviceNumber < MAX_EVENT_DEV && m_deviceCount < m_maxDeviceCount) {
deviceName = deviceSysPathString.arg(deviceNumber);
qDebug() << Q_FUNC_INFO << deviceName;
if (checkInputDevice(deviceName, typeName)) {
- addPath(deviceName, deviceCount_);
- ++deviceCount_;
+ addPath(deviceName, m_deviceCount);
+ ++m_deviceCount;
break;
}
++deviceNumber;
@@ -91,26 +91,27 @@
QString pollConfigKey = QString(typeName + "/poll_file");
if (SensorFrameworkConfig::configuration()->exists(pollConfigKey)) {
- usedDevicePollFilePath_ = SensorFrameworkConfig::configuration()->value<QString>(pollConfigKey, "");
+ m_usedDevicePollFilePath = SensorFrameworkConfig::configuration()->value<QString>(pollConfigKey, "");
} else {
- usedDevicePollFilePath_ = devicePollFilePath.arg(deviceNumber);
+ m_usedDevicePollFilePath = devicePollFilePath.arg(deviceNumber);
}
-qDebug() << Q_FUNC_INFO << usedDevicePollFilePath_;
+qDebug() << Q_FUNC_INFO << m_usedDevicePollFilePath;
- if (deviceCount_ == 0) {
+ if (m_deviceCount == 0) {
sensordLogW() << "Cannot find any device for: " << typeName;
setValid(false);
} else {
- QByteArray byteArray = readFromFile(usedDevicePollFilePath_.toLatin1());
- cachedInterval_ = byteArray.size() > 0 ? byteArray.toInt() : 0;
+ QByteArray byteArray = readFromFile(m_usedDevicePollFilePath.toLatin1());
+ int interval_ms = byteArray.size() > 0 ? byteArray.toInt() : 0;
+ m_cachedInterval_us = interval_ms * 1000;
}
- return deviceCount_;
+ return m_deviceCount;
}
int InputDevAdaptor::getEvents(int fd)
{
- int bytes = read(fd, evlist_, sizeof(struct input_event)*64);
+ int bytes = read(fd, m_evlist, sizeof(struct input_event)*64);
if (bytes == -1) {
sensordLogW() << "Error occured: " << strerror(errno);
return 0;
@@ -127,12 +128,12 @@
int numEvents = getEvents(fd);
for (int i = 0; i < numEvents; ++i) {
- switch (evlist_[i].type) {
+ switch (m_evlist[i].type) {
case EV_SYN:
- interpretSync(pathId, &(evlist_[i]));
+ interpretSync(pathId, &(m_evlist[i]));
break;
default:
- interpretEvent(pathId, &(evlist_[i]));
+ interpretEvent(pathId, &(m_evlist[i]));
break;
}
}
@@ -171,18 +172,20 @@
unsigned int InputDevAdaptor::interval() const
{
- return cachedInterval_;
+ return m_cachedInterval_us;
}
-bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
+bool InputDevAdaptor::setInterval(const int sessionId, const unsigned int interval_us)
{
Q_UNUSED(sessionId);
- sensordLogD() << "Setting poll interval for " << deviceString_ << " to " << value;
- QByteArray frequencyString(QString("%1\n").arg(value).toLocal8Bit());
- if(writeToFile(usedDevicePollFilePath_.toLocal8Bit(), frequencyString))
+ // 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";
+ QByteArray frequencyString(QString("%1\n").arg(interval_ms).toLocal8Bit());
+ if(writeToFile(m_usedDevicePollFilePath.toLocal8Bit(), frequencyString))
{
- cachedInterval_ = value;
+ m_cachedInterval_us = interval_ms * 1000;
return true;
}
return false;
@@ -199,5 +202,5 @@
int InputDevAdaptor::getDeviceCount() const
{
- return deviceCount_;
+ return m_deviceCount;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/inputdevadaptor.h
^
|
| @@ -108,24 +108,24 @@
virtual unsigned int interval() const;
- virtual bool setInterval(const unsigned int value, const int sessionId);
+ virtual bool setInterval(const int sessionId, const unsigned int interval_us);
private:
/**
* Read events from file descriptor. The read events are stored in
- * #evlist_ array.
+ * #m_evlist array.
*
* @param fd File descriptor to read from.
* @return Number of read events.
*/
int getEvents(int fd);
- 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 */
+ 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 */
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/nodebase.cpp
^
|
| @@ -31,15 +31,12 @@
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(0),
- DEFAULT_DATA_RANGE_REQUEST(-1),
- id_(id),
- isValid_(false)
+ m_defaultInterval_us(0),
+ m_id(id),
+ m_isValid(false)
{
}
@@ -49,12 +46,12 @@
const QString& NodeBase::id() const
{
- return id_;
+ return m_id;
}
bool NodeBase::isValid() const
{
- return isValid_;
+ return m_isValid;
}
bool NodeBase::isMetadataValid() const
@@ -80,7 +77,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);
}
}
@@ -273,7 +270,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);
}
}
@@ -284,9 +281,12 @@
if(ranges.isValid())
{
DataRangeList list(parseDataRangeList(ranges.toString(), 0));
- foreach(const DataRange& range, list)
+ foreach(const DataRange& range_ms, list)
{
- introduceAvailableInterval(range);
+ DataRange range_us(range_ms);
+ range_us.min *= 1000;
+ range_us.max *= 1000;
+ introduceAvailableInterval(range_us);
}
}
}
@@ -314,23 +314,19 @@
return it.value();
}
-bool NodeBase::setIntervalRequest(const int sessionId, const unsigned int value)
+bool NodeBase::setIntervalRequest(const int sessionId, const unsigned int interval_us)
{
// Has single defined source, pass the request that way
if (!hasLocalInterval())
{
- return m_intervalSource->setIntervalRequest(sessionId, value);
+ return m_intervalSource->setIntervalRequest(sessionId, interval_us);
}
// Validate interval request
- if (!isValidIntervalRequest(value))
- {
- sensordLogW() << "Invalid interval requested for node '" << id() << "' by session '" << sessionId << "': " << value;
- return false;
- }
+ unsigned int validatedInterval_us = validateIntervalRequest(interval_us);
// Store the request for the session
- m_intervalMap[sessionId] = value;
+ m_intervalMap[sessionId] = validatedInterval_us;
// Store the current interval
unsigned int previousInterval = interval();
@@ -341,7 +337,7 @@
if (winningSessionId >= 0) {
sensordLogD() << "Setting new interval for node: " << id() << ". Evaluation won by session '" << winningSessionId << "' with request: " << winningRequest;
- setInterval(winningRequest, winningSessionId);
+ setInterval(winningSessionId, winningRequest);
}
// Signal listeners about change
@@ -427,42 +423,39 @@
unsigned int NodeBase::evaluateIntervalRequests(int& sessionId) const
{
- 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();
+ int chosenSessionId = -1;
+ unsigned int chosenInterval_us = 0;
- for (++it; it != m_intervalMap.constEnd(); ++it)
- {
- if (it.value() < highestValue) {
- highestValue = it.value();
- 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;
}
}
+ if (chosenInterval_us == 0)
+ chosenInterval_us = defaultInterval();
- sessionId = winningSessionId;
- return highestValue;
+ sessionId = chosenSessionId;
+ return chosenInterval_us;
}
unsigned int NodeBase::defaultInterval() const
{
- return m_defaultInterval;
+ return m_defaultInterval_us;
}
-bool NodeBase::setDefaultInterval(const unsigned int value)
+bool NodeBase::setDefaultInterval(const unsigned int interval_us)
{
- if (!isValidIntervalRequest(value))
+ unsigned int validatedInterval_us = validateIntervalRequest(interval_us);
+ if (validatedInterval_us == 0)
{
- sensordLogW() << "Attempting to define invalid default data rate:" << value;
+ sensordLogW() << "Attempting to define invalid default data rate:" << interval_us;
return false;
}
- m_defaultInterval = value;
+ m_defaultInterval_us = validatedInterval_us;
m_hasDefault = true;
return true;
}
@@ -502,7 +495,7 @@
int winningSessionId;
unsigned int winningRequest = evaluateIntervalRequests(winningSessionId);
if (winningSessionId >= 0) {
- setInterval(winningRequest, winningSessionId);
+ setInterval(winningSessionId, winningRequest);
}
// Signal listeners if changed.
@@ -563,16 +556,39 @@
return success;
}
-bool NodeBase::isValidIntervalRequest(const unsigned int value) const
+unsigned int NodeBase::validateIntervalRequest(unsigned int interval_us) const
{
- for(QList<DataRange>::const_iterator it = m_intervalList.constBegin(); it != m_intervalList.constEnd(); ++it)
+ unsigned int validatedInterval_us = 0;
+ if (interval_us > 0)
{
- if (it->min <= value && it->max >= value)
+ unsigned int minError = 0x7fffffff;
+ for(QList<DataRange>::const_iterator it = m_intervalList.constBegin(); it != m_intervalList.constEnd(); ++it)
{
- return true;
+ if (interval_us < it->min)
+ {
+ unsigned int error = it->min - interval_us;
+ if (minError > error)
+ {
+ minError = error;
+ validatedInterval_us = it->min;
+ }
+ }
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.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 value);
+ bool setIntervalRequest(int sessionId, unsigned int interval_us);
/**
* Request default interval for the node.
@@ -248,7 +248,7 @@
/**
* Get current buffer interval of the node.
*
- * @return current buffer interval in milliseconds.
+ * @return current buffer interval in microseconds.
*/
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 value);
+ bool setBufferInterval(int sessionId, unsigned int interval_us);
/**
* Clear buffer interval requests of given session.
@@ -431,7 +431,7 @@
* @param sessionId Session ID.
* @return was interval set succesfully.
*/
- virtual bool setInterval(unsigned int value, int sessionId);
+ virtual bool setInterval(int sessionId, unsigned int interval_us);
/**
* 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 value);
+ bool setDefaultInterval(unsigned int interval_us);
/**
* Validate an interval request.
@@ -482,7 +482,7 @@
* @param value Value to validate.
* @return is valid request.
*/
- bool isValidIntervalRequest(unsigned int value) const;
+ unsigned int validateIntervalRequest(unsigned int interval_us) const;
/**
* Find buffer with given name.
@@ -508,13 +508,10 @@
* @param value buffer interval.
* @return was buffer interval set succesfully.
*/
- virtual bool setBufferInterval(unsigned int value);
+ virtual bool setBufferInterval(unsigned int interval_us);
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
@@ -558,7 +555,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; /**< locally set interval */
+ unsigned int m_defaultInterval_us; /**< locally set interval */
QList<NodeBase*> m_sourceList; /**< source nodes */
@@ -566,10 +563,8 @@
QMap<int, unsigned int> m_bufferSizeMap; /**< buffersize requests for sessions. */
QMap<int, unsigned int> m_bufferIntervalMap; /**< buffer interval requests for sessions. */
- const DataRangeRequest DEFAULT_DATA_RANGE_REQUEST; /**< default data range request */
-
- QString id_; /**< node ID */
- bool isValid_; /**< is node correctly initialized */
+ QString m_id; /**< node ID */
+ bool m_isValid; /**< is node correctly initialized */
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/sockethandler.cpp
^
|
| @@ -29,32 +29,33 @@
#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),
- 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()));
+ 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()));
}
SessionData::~SessionData()
{
- timer.stop();
- delete socket;
- delete[] buffer;
+ m_timer.stop();
+ delete m_socket;
+ delete[] m_buffer;
}
void SessionData::timerTimeout()
@@ -64,22 +65,25 @@
long SessionData::sinceLastWrite() const
{
- if(lastWrite.tv_sec == 0)
+ if(m_lastWrite.tv_sec == 0)
return LONG_MAX;
- struct timeval now;
+ struct timeval now = {0, 0};
gettimeofday(&now, 0);
- return (now.tv_sec - lastWrite.tv_sec) * 1000 + ((now.tv_usec - lastWrite.tv_usec) / 1000);
+ struct timeval diff;
+ timersub(&now, &m_lastWrite, &diff);
+ long interval_us = diff.tv_sec * 1000000L + diff.tv_usec;
+ return interval_us;
}
bool SessionData::write(void* source, int size, unsigned int count)
{
- if(socket && count)
+ if(m_socket && count)
{
memcpy(source, &count, sizeof(unsigned int));
- int written = socket->write((const char*)source, size * count + sizeof(unsigned int));
+ int written = m_socket->write((const char*)source, size * count + sizeof(unsigned int));
if(written < 0)
{
- sensordLogW() << "[SocketHandler]: failed to write payload to the socket: " << socket->errorString();
+ sensordLogW() << "[SocketHandler]: failed to write payload to the socket: " << m_socket->errorString();
return false;
}
return true;
@@ -89,44 +93,48 @@
bool SessionData::write(const void* source, int size)
{
- long since = sinceLastWrite();
- int allocSize = bufferSize * size + sizeof(unsigned int);
- if(!buffer)
- buffer = new char[allocSize];
- else if(size != this->size)
+ long since_us = sinceLastWrite();
+ int allocSize = m_bufferSize * size + sizeof(unsigned int);
+ if(!m_buffer)
{
- socket->waitForBytesWritten();
- delete[] buffer;
- buffer = new char[allocSize];
+ m_buffer = new char[allocSize];
+ }
+ else if(size != m_size)
+ {
+ m_socket->waitForBytesWritten();
+ delete[] m_buffer;
+ m_buffer = new char[allocSize];
}
- this->size = size;
- if(bufferSize <= 1)
+ m_size = size;
+ if(m_bufferSize <= 1)
{
- memcpy(buffer + sizeof(unsigned int), source, size);
- if(!downsampling || (downsampling && since >= interval))
+ memcpy(m_buffer + sizeof(unsigned int), source, size);
+ if(!m_downsampling || (m_downsampling && since_us >= m_interval_us))
{
- gettimeofday(&lastWrite, 0);
- return write(buffer, size, 1);
+ gettimeofday(&m_lastWrite, 0);
+ return write(m_buffer, size, 1);
}
}
else
{
- memcpy(buffer + sizeof(unsigned int) + size * count, source, size);
- ++count;
- if(bufferSize == count)
+ memcpy(m_buffer + sizeof(unsigned int) + size * m_count, source, size);
+ ++m_count;
+ if(m_bufferSize == m_count)
{
return delayedWrite();
}
}
- if(!timer.isActive())
+ if(!m_timer.isActive())
{
- if(bufferSize > 1 && bufferInterval)
+ if(m_bufferSize > 1 && m_bufferInterval_us)
{
- timer.start(bufferInterval);
+ int interval_ms = (m_bufferInterval_us + 999) / 1000;
+ m_timer.start(interval_ms);
}
- else if(!bufferSize && (interval - since) > 0)
+ else if(!m_bufferSize && m_interval_us > since_us)
{
- timer.start(interval - since);
+ int interval_ms = (m_interval_us - since_us + 999) / 1000;
+ m_timer.start(interval_ms);
}
}
return true;
@@ -134,81 +142,81 @@
bool SessionData::delayedWrite()
{
- if(timer.isActive())
- timer.stop();
- gettimeofday(&lastWrite, 0);
- bool ret = write(buffer, size, count);
- count = 0;
+ if(m_timer.isActive())
+ m_timer.stop();
+ gettimeofday(&m_lastWrite, 0);
+ bool ret = write(m_buffer, m_size, m_count);
+ m_count = 0;
return ret;
}
QLocalSocket* SessionData::stealSocket()
{
- QLocalSocket* tmpsocket = socket;
- socket = 0;
+ QLocalSocket *tmpsocket = m_socket;
+ m_socket = nullptr;
return tmpsocket;
}
QLocalSocket* SessionData::getSocket() const
{
- return socket;
+ return m_socket;
}
-void SessionData::setInterval(int interval)
+void SessionData::setInterval(int interval_us)
{
- this->interval = interval;
+ m_interval_us = interval_us;
}
int SessionData::getInterval() const
{
- return interval;
+ return m_interval_us;
}
-void SessionData::setBufferInterval(unsigned int interval)
+void SessionData::setBufferInterval(unsigned int interval_us)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/sockethandler.h
^
|
| @@ -92,7 +92,7 @@
*
* @param interval Interval in milliseconds.
*/
- void setInterval(int interval);
+ void setInterval(int interval_us);
/**
* Get used interval for the data stream.
@@ -122,7 +122,7 @@
*
* @param interval interval in milliseconds.
*/
- void setBufferInterval(unsigned int interval);
+ void setBufferInterval(unsigned int interval_us);
/**
* Get buffer inteval for the data stream.
@@ -171,16 +171,16 @@
*/
bool delayedWrite();
- 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 */
+ 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 */
private slots:
@@ -260,7 +260,7 @@
* @param sessionId Session ID.
* @param value Interval in milliseconds.
*/
- void setInterval(int sessionId, int value);
+ void setInterval(int sessionId, int interval_us);
/**
* 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 value);
+ void setBufferInterval(int sessionId, unsigned int interval_us);
/**
* Remove set buffer inteval for given session.
@@ -324,7 +324,7 @@
* #SessionData::bufferInterval().
*
* @param sessionId Session ID.
- * @return interval in milliseconds.
+ * @return interval in microseconds.
*/
unsigned int bufferInterval(int sessionId) const;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/sysfsadaptor.cpp
^
|
| @@ -43,21 +43,21 @@
const QString& path,
const int pathId) :
DeviceAdaptor(id),
- reader_(this),
- mode_(mode),
- epollDescriptor_(-1),
- interval_(0),
- inStandbyMode_(false),
- running_(false),
- shouldBeRunning_(false),
- doSeek_(seek)
+ 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)
{
if (!path.isEmpty()) {
addPath(path, pathId);
}
- pipeDescriptors_[0] = -1;
- pipeDescriptors_[1] = -1;
+ m_pipeDescriptors[0] = -1;
+ m_pipeDescriptors[1] = -1;
}
SysfsAdaptor::~SysfsAdaptor()
@@ -73,15 +73,15 @@
return false;
}
- paths_.append(path);
- pathIds_.append(id);
+ m_paths.append(path);
+ m_pathIds.append(id);
return true;
}
bool SysfsAdaptor::isRunning() const
{
- return running_;
+ return m_running;
}
bool SysfsAdaptor::startAdaptor()
@@ -114,27 +114,27 @@
return false;
}
- shouldBeRunning_ = true;
+ m_shouldBeRunning = true;
// Do not open if in standby mode.
- if (inStandbyMode_ && !deviceStandbyOverride()) {
+ if (m_inStandbyMode && !deviceStandbyOverride()) {
return false;
}
/// We are waking up from standby or starting fresh, no matter
- inStandbyMode_ = false;
+ m_inStandbyMode = false;
if (!startReaderThread()) {
sensordLogW() << "Failed to start adaptor " << name();
entry->removeReference();
entry->setIsRunning(false);
- running_ = false;
- shouldBeRunning_ = false;
+ m_running = false;
+ m_shouldBeRunning = false;
return false;
}
entry->setIsRunning(true);
- running_ = true;
+ m_running = true;
return true;
}
@@ -150,19 +150,19 @@
entry->removeReference();
if (entry->referenceCount() <= 0) {
- if (!inStandbyMode_) {
+ if (!m_inStandbyMode) {
stopReaderThread();
closeAllFds();
}
entry->setIsRunning(false);
- running_ = false;
+ m_running = false;
}
}
bool SysfsAdaptor::standby()
{
sensordLogD() << "Adaptor '" << id() << "' requested to go to standby";
- if (inStandbyMode_) {
+ if (m_inStandbyMode) {
sensordLogD() << "Adaptor '" << id() << "' not going to standby: already in standby";
return false;
}
@@ -175,13 +175,13 @@
return false;
}
- inStandbyMode_ = true;
- shouldBeRunning_ = true;
+ m_inStandbyMode = true;
+ m_shouldBeRunning = true;
sensordLogD() << "Adaptor '" << id() << "' going to standby";
stopReaderThread();
closeAllFds();
- running_ = false;
+ m_running = false;
stopAdaptor();
return true;
}
@@ -191,58 +191,58 @@
sensordLogD() << "Adaptor '" << id() << "' requested to resume from standby";
// Don't resume if not in standby
- if (!inStandbyMode_) {
+ if (!m_inStandbyMode) {
sensordLogD() << "Adaptor '" << id() << "' not resuming: not in standby";
return false;
}
- if (!shouldBeRunning_) {
+ if (!m_shouldBeRunning) {
sensordLogD() << "Adaptor '" << id() << "' not resuming from standby: not running";
return false;
}
sensordLogD() << "Adaptor '" << id() << "' resuming from standby";
- inStandbyMode_ = false;
+ m_inStandbyMode = false;
if (!startReaderThread()) {
sensordLogW() << "Adaptor '" << id() << "' failed to resume from standby!";
return false;
}
- running_ = true;
+ m_running = true;
startAdaptor();
return true;
}
bool SysfsAdaptor::openFds()
{
- QMutexLocker locker(&mutex_);
+ QMutexLocker locker(&m_mutex);
int fd;
- for (int i = 0; i < paths_.size(); i++) {
- if ((fd = open(paths_.at(i).toLatin1().constData(), O_RDONLY)) == -1) {
+ 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);
return false;
}
- sysfsDescriptors_.append(fd);
+ m_sysfsDescriptors.append(fd);
}
// Set up epoll for select mode
- if (mode_ == SelectMode) {
+ if (m_mode == SelectMode) {
- if (pipe(pipeDescriptors_) == -1 ) {
+ if (pipe(m_pipeDescriptors) == -1 ) {
sensordLogW() << "pipe(): " << strerror(errno);
return false;
}
- if (fcntl(pipeDescriptors_[0], F_SETFD, FD_CLOEXEC) == -1) {
+ if (fcntl(m_pipeDescriptors[0], F_SETFD, FD_CLOEXEC) == -1) {
sensordLogW() << "fcntl(): " << strerror(errno);
return false;
}
// Set up epoll fd
- if ((epollDescriptor_ = epoll_create(sysfsDescriptors_.size() + 1)) == -1) {
+ if ((m_epollDescriptor = epoll_create(m_sysfsDescriptors.size() + 1)) == -1) {
sensordLogW() << "epoll_create(): " << strerror(errno);
return false;
}
@@ -252,17 +252,17 @@
ev.events = EPOLLIN;
// Set up epolling for the list
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/core/sysfsadaptor.h
^
|
| @@ -73,8 +73,8 @@
void startReader();
private:
- bool running_; /**< should thread be running or not */
- SysfsAdaptor *parent_; /**< parent object. */
+ bool m_running; /**< should thread be running or not */
+ SysfsAdaptor *m_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 unsigned int value, const int sessionId);
+ virtual bool setInterval(const int sessionId, const unsigned int interval_us);
/**
* Tells which mode the adaptor is using for getting input.
@@ -245,19 +245,19 @@
*/
bool checkIntervalUsage() const;
- 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. */
+ 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. */
friend class SysfsAdaptorReader;
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,18 @@
+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
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/filters/declinationfilter/declinationfilter.cpp
^
|
| @@ -31,33 +31,35 @@
#include "config.h"
#include "logging.h"
-const char* DeclinationFilter::declinationKey = "/system/osso/location/settings/magneticvariation";
+const char *DeclinationFilter::s_declinationKey = "/system/osso/location/settings/magneticvariation";
DeclinationFilter::DeclinationFilter() :
Filter<CompassData, DeclinationFilter, CompassData>(this, &DeclinationFilter::correct),
- declinationCorrection_(0),
- lastUpdate_(0)
+ m_declinationCorrection(0),
+ m_lastUpdate_us(0)
{
- updateInterval_ = SensorFrameworkConfig::configuration()->value<quint64>("compass/declination_update_interval", 1000 * 60 * 60) * 1000;
+ // 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;
loadSettings();
}
void DeclinationFilter::correct(unsigned, const CompassData* data)
{
CompassData newOrientation(*data);
- if (newOrientation.timestamp_ - lastUpdate_ > updateInterval_) {
+ if (newOrientation.timestamp_ - m_lastUpdate_us > m_updateInterval_us) {
loadSettings();
- lastUpdate_ = newOrientation.timestamp_;
+ m_lastUpdate_us = newOrientation.timestamp_;
}
newOrientation.correctedDegrees_ = newOrientation.degrees_;
- if (declinationCorrection_.loadAcquire() != 0) {
- newOrientation.correctedDegrees_ += declinationCorrection_.loadAcquire();
+ if (m_declinationCorrection.loadAcquire() != 0) {
+ newOrientation.correctedDegrees_ += m_declinationCorrection.loadAcquire();
newOrientation.correctedDegrees_ %= 360;
// sensordLogT() << "DeclinationFilter corrected degree " << newOrientation.degrees_ << " => " << newOrientation.correctedDegrees_ << ". Level: " << newOrientation.level_;
}
- orientation_ = newOrientation;
- source_.propagate(1, &orientation_);
+ m_orientation = newOrientation;
+ source_.propagate(1, &m_orientation);
}
void DeclinationFilter::loadSettings()
@@ -66,13 +68,13 @@
confFile.beginGroup("location");
double declination = confFile.value("declination",0).toDouble();
if (declination != 0) {
- declinationCorrection_ = declination;
+ m_declinationCorrection = declination;
}
- sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_.loadAcquire();
+ sensordLogD() << "Fetched declination correction from GConf: " << m_declinationCorrection.loadAcquire();
}
int DeclinationFilter::declinationCorrection()
{
loadSettings();
- return declinationCorrection_.loadAcquire();
+ return m_declinationCorrection.loadAcquire();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/filters/declinationfilter/declinationfilter.h
^
|
| @@ -63,12 +63,12 @@
void loadSettings();
- CompassData orientation_;
- QAtomicInt declinationCorrection_;
- quint64 lastUpdate_;
- quint64 updateInterval_;
+ CompassData m_orientation;
+ QAtomicInt m_declinationCorrection;
+ quint64 m_lastUpdate_us;
+ quint64 m_updateInterval_us;
- static const char* declinationKey;
+ static const char *s_declinationKey;
};
#endif // DECLINATIONFILTER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.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 errorCode_;
- QString errorString_;
- int sessionId_;
- int interval_;
- unsigned int bufferInterval_;
- unsigned int bufferSize_;
- SocketReader socketReader_;
- bool running_;
- bool standbyOverride_;
- bool downsampling_;
+ 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;
};
AbstractSensorChannelInterface::AbstractSensorChannelInterfaceImpl::AbstractSensorChannelInterfaceImpl(QObject* parent, int sessionId, const QString& path, const char* interfaceName) :
QDBusAbstractInterface(SERVICE_NAME, path, interfaceName, QDBusConnection::systemBus(), 0),
- errorCode_(SNoError),
- errorString_(""),
- sessionId_(sessionId),
- interval_(0),
- bufferInterval_(0),
- bufferSize_(1),
- socketReader_(parent),
- running_(false),
- standbyOverride_(false),
- downsampling_(true)
+ 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)
{
}
AbstractSensorChannelInterface::AbstractSensorChannelInterface(const QString& path, const char* interfaceName, int sessionId) :
pimpl_(new AbstractSensorChannelInterfaceImpl(this, sessionId, path, interfaceName))
{
- if (!pimpl_->socketReader_.initiateConnection(sessionId)) {
+ if (!pimpl_->m_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_->sessionId_);
- if (!pimpl_->socketReader_.dropConnection())
+ SensorManagerInterface::instance().releaseInterface(id(), pimpl_->m_sessionId);
+ if (!pimpl_->m_socketReader.dropConnection())
setError(SClientSocketError, "Socket disconnect failed.");
delete pimpl_;
}
SocketReader& AbstractSensorChannelInterface::getSocketReader() const
{
- return pimpl_->socketReader_;
+ return pimpl_->m_socketReader;
}
bool AbstractSensorChannelInterface::release()
@@ -108,35 +108,35 @@
void AbstractSensorChannelInterface::setError(SensorError errorCode, const QString& errorString)
{
- pimpl_->errorCode_ = errorCode;
- pimpl_->errorString_ = errorString;
+ pimpl_->m_errorCode = errorCode;
+ pimpl_->m_errorString = errorString;
}
QDBusReply<void> AbstractSensorChannelInterface::start()
{
- return start(pimpl_->sessionId_);
+ return start(pimpl_->m_sessionId);
}
QDBusReply<void> AbstractSensorChannelInterface::stop()
{
- return stop(pimpl_->sessionId_);
+ return stop(pimpl_->m_sessionId);
}
QDBusReply<void> AbstractSensorChannelInterface::start(int sessionId)
{
clearError();
- if (pimpl_->running_) {
+ if (pimpl_->m_running) {
return QDBusReply<void>();
}
- pimpl_->running_ = true;
+ pimpl_->m_running = true;
// Discard any old data already in the socket
- if (pimpl_->socketReader_.socket()->bytesAvailable() > 0) {
- pimpl_->socketReader_.socket()->readAll();
+ if (pimpl_->m_socketReader.socket()->bytesAvailable() > 0) {
+ pimpl_->m_socketReader.socket()->readAll();
}
- connect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
+ connect(pimpl_->m_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_->standbyOverride_);
- setInterval(sessionId, pimpl_->interval_);
- setBufferInterval(sessionId, pimpl_->bufferInterval_);
- setBufferSize(sessionId, pimpl_->bufferSize_);
- setDownsampling(pimpl_->sessionId_, pimpl_->downsampling_);
+ 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);
return returnValue;
}
@@ -169,12 +169,12 @@
QDBusReply<void> AbstractSensorChannelInterface::stop(int sessionId)
{
clearError();
- if (!pimpl_->running_) {
+ if (!pimpl_->m_running) {
return QDBusReply<void>();
}
- pimpl_->running_ = false ;
+ pimpl_->m_running = false ;
- disconnect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
+ disconnect(pimpl_->m_socketReader.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));
QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId);
@@ -197,12 +197,12 @@
}
}
-QDBusReply<void> AbstractSensorChannelInterface::setInterval(int sessionId, int value)
+QDBusReply<void> AbstractSensorChannelInterface::setInterval(int sessionId, int interval_ms)
{
clearError();
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
+ argumentList << qVariantFromValue(sessionId) << qVariantFromValue(interval_ms);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setInterval"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -221,12 +221,36 @@
}
}
-QDBusReply<void> AbstractSensorChannelInterface::setBufferInterval(int sessionId, unsigned int value)
+QDBusReply<void> AbstractSensorChannelInterface::setDataRate(int sessionId, double dataRate_Hz)
{
clearError();
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
+ 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-binder-0.13.0.tar.bz2/qt-api/abstractsensor_i.h
^
|
| @@ -51,6 +51,7 @@
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)
@@ -117,15 +118,25 @@
* @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 value sampling interval (in millisecs).
+ * @param interval_ms sampling interval (in millisecs).
*/
- void setInterval(int value);
+ 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);
/**
* Is standby-override enabled or not.
@@ -159,9 +170,9 @@
* buffered data to be flushed unless the buffer is filled before it.
* Supported intervals are listed by #getAvailableBufferIntervals().
*
- * @param value interval in millisecs.
+ * @param interval_ms interval in millisecs.
*/
- void setBufferInterval(unsigned int value);
+ void setBufferInterval(unsigned int interval_ms);
/**
* Is downsampling enabled or not.
@@ -321,10 +332,19 @@
* Set interval to session.
*
* @param sessionId session ID.
- * @param value interval.
+ * @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
* @return DBus reply.
*/
- QDBusReply<void> setInterval(int sessionId, int value);
+ QDBusReply<void> setDataRate(int sessionId, double dataRate_Hz);
/**
* Set standby-override to session.
@@ -342,7 +362,7 @@
* @param value buffer interval.
* @return DBus reply.
*/
- QDBusReply<void> setBufferInterval(int sessionId, unsigned int value);
+ QDBusReply<void> setBufferInterval(int sessionId, unsigned int interval_ms);
/**
* Set buffer size to session.
@@ -472,6 +492,7 @@
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-binder-0.13.0.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.12.7
+Version: 0.13.0
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
Cflags: -I${includedir} -I${includedir}/datatypes
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/sensors/contextplugin/orientationbin.cpp
^
|
| @@ -101,8 +101,9 @@
start();
orientationChain->start();
- unsigned int pollInterval = SensorFrameworkConfig::configuration()->value("context/orientation_poll_interval", QVariant(POLL_INTERVAL)).toUInt();
- orientationChain->setIntervalRequest(sessionId, pollInterval);
+ 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);
}
void OrientationBin::stopRun()
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/sensors/rotationsensor/rotationsensor.cpp
^
|
| @@ -100,16 +100,19 @@
if (hasZ())
{
// No less than 5hz allowed for compass
- int ranges[] = {10, 20, 25, 40, 50, 100, 200};
- for(size_t i = 0; i < sizeof(ranges) / sizeof(int); ++i)
+ int ranges_ms[] = {10, 20, 25, 40, 50, 100, 200};
+ for(size_t i = 0; i < sizeof(ranges_ms) / sizeof(int); ++i)
{
- introduceAvailableInterval(DataRange(ranges[i], ranges[i], 0));
+ int range_us = ranges_ms[i] * 1000;
+ introduceAvailableInterval(DataRange(range_us, range_us, 0));
}
} else {
setIntervalSource(accelerometerChain_);
}
- setDefaultInterval(100); // Tricky. Might need to make this conditional.
+ // Tricky. Might need to make this conditional.
+ unsigned int interval_us = 100 * 1000;
+ setDefaultInterval(interval_us);
}
RotationSensorChannel::~RotationSensorChannel()
@@ -183,12 +186,12 @@
return accelerometerChain_->getInterval();
}
-bool RotationSensorChannel::setInterval(unsigned int value, int sessionId)
+bool RotationSensorChannel::setInterval(int sessionId, unsigned int interval_us)
{
- bool success = accelerometerChain_->setIntervalRequest(sessionId, value);
+ bool success = accelerometerChain_->setIntervalRequest(sessionId, interval_us);
if (hasZ())
{
- success = compassChain_->setIntervalRequest(sessionId, value) && success;
+ success = compassChain_->setIntervalRequest(sessionId, interval_us) && success;
}
return success;
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/sensors/rotationsensor/rotationsensor.h
^
|
| @@ -73,7 +73,7 @@
}
virtual unsigned int interval() const;
- virtual bool setInterval(unsigned int value, int sessionId);
+ virtual bool setInterval(int sessionId, unsigned int interval_us);
virtual void removeSession(int sessionId);
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.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), interval_(1)
+FakeAdaptor::FakeAdaptor(const QString &id) : DeviceAdaptor(id), m_interval_us(1000)
{
- t = new FakeAdaptorThread(this);
+ m_thread = new FakeAdaptorThread(this);
- buffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
- setAdaptedSensor("als", "Internal ambient light sensor lux values", buffer_);
+ m_buffer = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
+ setAdaptedSensor("als", "Internal ambient light sensor lux values", m_buffer);
}
bool FakeAdaptor::startAdaptor()
@@ -46,9 +46,10 @@
return true;
}
- interval_ = atoi(file.readLine().data());
- if (interval_ <= 0) {
+ m_interval_us = atoi(file.readLine().data()) * 1000;
+ if (m_interval_us <= 0) {
qDebug() << "Failed to get rate from" << file.fileName() << "- using 1000Hz (readline)";
+ m_interval_us = 1000;
return true;
}
@@ -62,38 +63,38 @@
bool FakeAdaptor::startSensor()
{
- qDebug() << "Pushing fake ALS data with" << interval_ << " msec interval";
+ qDebug() << "Pushing fake ALS data with" << m_interval_us << " us interval";
// Start pushing data
- t->running = true;
- t->start();
+ m_thread->running = true;
+ m_thread->start();
return true;
}
void FakeAdaptor::stopSensor()
{
// Stop pushing data
- t->running = false;
- t->wait();
+ m_thread->running = false;
+ m_thread->wait();
qDebug() << "sensor stopped";
}
void FakeAdaptor::pushNewData(int& data)
{
- TimedUnsigned* lux = buffer_->nextSlot();
+ TimedUnsigned *lux = m_buffer->nextSlot();
lux->timestamp_ = Utils::getTimeStamp();
lux->value_ = data;
- buffer_->commit();
- buffer_->wakeUpReaders();
+ m_buffer->commit();
+ m_buffer->wakeUpReaders();
}
void FakeAdaptor::init()
{
}
-FakeAdaptorThread::FakeAdaptorThread(FakeAdaptor *parent) : running(false), parent_(parent)
+FakeAdaptorThread::FakeAdaptorThread(FakeAdaptor *parent) : running(false), m_parent(parent)
{
qDebug() << "Data pusher for ALS";
}
@@ -102,8 +103,9 @@
{
int i = 0;
while(running) {
- QThread::msleep(parent_->interval_);
- parent_->pushNewData(i);
+ int interval_ms = (m_parent->m_interval_us + 999) / 1000;
+ QThread::msleep(interval_ms);
+ m_parent->pushNewData(i);
i++;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptor.h
^
|
| @@ -43,7 +43,7 @@
bool running;
private:
- FakeAdaptor *parent_;
+ FakeAdaptor *m_parent;
};
/**
@@ -68,14 +68,14 @@
void init();
- unsigned int interval_;
+ unsigned int m_interval_us;
protected:
FakeAdaptor(const QString& id);
private:
- FakeAdaptorThread* t;
- DeviceAdaptorRingBuffer<TimedUnsigned>* buffer_;
+ FakeAdaptorThread *m_thread;
+ DeviceAdaptorRingBuffer<TimedUnsigned> *m_buffer;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/abstractsensorhandler.cpp
^
|
| @@ -29,22 +29,22 @@
AbstractSensorHandler::AbstractSensorHandler(const QString& sensorName, QObject *parent) :
QThread(parent),
- sensorName_(sensorName),
- interval_(100),
- bufferinterval_(0),
- standbyoverride_(false),
- buffersize_(0),
- dataCount_(0),
- frameCount_(0),
- downsample_(false)
+ 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)
{
if (SensorFrameworkConfig::configuration() != NULL)
{
- 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);
+ 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);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/abstractsensorhandler.h
^
|
| @@ -40,18 +40,18 @@
virtual bool startClient() = 0;
virtual bool stopClient() = 0;
- int dataCount() const { return dataCount_; }
- QString sensorName() const { return sensorName_; }
+ int dataCount() const { return m_dataCount; }
+ QString sensorName() const { return m_sensorName; }
protected:
- QString sensorName_;
- int interval_;
- int bufferinterval_;
- bool standbyoverride_;
- int buffersize_;
- int dataCount_;
- int frameCount_;
- bool downsample_;
+ 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;
};
#endif // ABSTRACTSENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/sensorhandler_qmsystem2.cpp
^
|
| @@ -27,75 +27,75 @@
SensorHandler::SensorHandler(const QString& sensorName, QObject *parent) :
AbstractSensorHandler(sensorName, parent),
- sensor_(NULL)
+ m_sensor(NULL)
{
- if (sensorName_ == "compasssensor")
+ if (m_sensorName == "compasssensor")
{
- sensor_ = new MeeGo::QmCompass();
- connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmCompassReading)), this, SLOT(receivedData(const MeeGo::QmCompassReading)));
+ m_sensor = new MeeGo::QmCompass();
+ connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmCompassReading)), this, SLOT(receivedData(const MeeGo::QmCompassReading)));
}
- else if (sensorName_ == "magnetometersensor")
+ else if (m_sensorName == "magnetometersensor")
{
- sensor_ = new MeeGo::QmMagnetometer();
- connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmMagnetometerReading&)), this, SLOT(receivedData(const MeeGo::QmMagnetometerReading&)));
+ m_sensor = new MeeGo::QmMagnetometer();
+ connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmMagnetometerReading&)), this, SLOT(receivedData(const MeeGo::QmMagnetometerReading&)));
}
- else if (sensorName_ == "orientationsensor")
+ else if (m_sensorName == "orientationsensor")
{
- sensor_ = new MeeGo::QmOrientation();
- connect(sensor_, SIGNAL(orientationChanged(const MeeGo::QmOrientationReading)), this, SLOT(receivedData(const MeeGo::QmOrientationReading)));
+ m_sensor = new MeeGo::QmOrientation();
+ connect(m_sensor, SIGNAL(orientationChanged(const MeeGo::QmOrientationReading)), this, SLOT(receivedData(const MeeGo::QmOrientationReading)));
}
- else if (sensorName_ == "accelerometersensor")
+ else if (m_sensorName == "accelerometersensor")
{
- sensor_ = new MeeGo::QmAccelerometer();
- connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmAccelerometerReading&)), this, SLOT(receivedData(const MeeGo::QmAccelerometerReading&)));
+ m_sensor = new MeeGo::QmAccelerometer();
+ connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmAccelerometerReading&)), this, SLOT(receivedData(const MeeGo::QmAccelerometerReading&)));
}
- else if (sensorName_ == "alssensor")
+ else if (m_sensorName == "alssensor")
{
- sensor_ = new MeeGo::QmALS();
- connect(sensor_, SIGNAL(ALSChanged(const MeeGo::QmAlsReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
+ m_sensor = new MeeGo::QmALS();
+ connect(m_sensor, SIGNAL(ALSChanged(const MeeGo::QmAlsReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
}
- else if (sensorName_ == "rotationsensor")
+ else if (m_sensorName == "rotationsensor")
{
- sensor_ = new MeeGo::QmRotation();
- connect(sensor_, SIGNAL(dataAvailable(const MeeGo::QmRotationReading&)), this, SLOT(receivedData(const MeeGo::QmRotationReading&)));
+ m_sensor = new MeeGo::QmRotation();
+ connect(m_sensor, SIGNAL(dataAvailable(const MeeGo::QmRotationReading&)), this, SLOT(receivedData(const MeeGo::QmRotationReading&)));
}
- else if (sensorName_ == "tapsensor")
+ else if (m_sensorName == "tapsensor")
{
- sensor_ = new MeeGo::QmTap();
- connect(sensor_, SIGNAL(tapped(const MeeGo::QmTapReading)), this, SLOT(receivedData(const MeeGo::QmTapReading)));
+ m_sensor = new MeeGo::QmTap();
+ connect(m_sensor, SIGNAL(tapped(const MeeGo::QmTapReading)), this, SLOT(receivedData(const MeeGo::QmTapReading)));
}
- else if (sensorName_ == "proximitysensor")
+ else if (m_sensorName == "proximitysensor")
{
- sensor_ = new MeeGo::QmProximity();
- connect(sensor_, SIGNAL(ProximityChanged(const MeeGo::QmProximityReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
+ m_sensor = new MeeGo::QmProximity();
+ connect(m_sensor, SIGNAL(ProximityChanged(const MeeGo::QmProximityReading)), this, SLOT(receivedData(const MeeGo::QmIntReading)));
}
}
void SensorHandler::receivedData(const MeeGo::QmAccelerometerReading& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.x << " " << data.y << " " << data.z;
}
void SensorHandler::receivedData(const MeeGo::QmIntReading data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.value;
}
void SensorHandler::receivedData(const MeeGo::QmCompassReading data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.level << " " << data.degrees;
}
void SensorHandler::receivedData(const MeeGo::QmMagnetometerReading& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_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)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.value;
}
void SensorHandler::receivedData(const MeeGo::QmRotationReading& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.x << " " << data.y << " " << data.z;
}
void SensorHandler::receivedData(const MeeGo::QmTapReading data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.type << " " << data.direction;
}
bool SensorHandler::startClient()
{
- sensor_->requestSession(MeeGo::QmSensor::SessionTypeListen);
- sensor_->setInterval(interval_);
- sensor_->setStandbyOverride(standbyoverride_);
+ m_sensor->requestSession(MeeGo::QmSensor::SessionTypeListen);
+ m_sensor->setInterval(m_interval_ms);
+ m_sensor->setStandbyOverride(m_standbyoverride);
return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/sensorhandler_qmsystem2.h
^
|
| @@ -62,7 +62,7 @@
void receivedData(const MeeGo::QmTapReading data);
private:
- MeeGo::QmSensor* sensor_;
+ MeeGo::QmSensor *m_sensor;
};
#endif // SENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/sensorhandler_qtapi.cpp
^
|
| @@ -29,102 +29,102 @@
SensorHandler::SensorHandler(const QString& sensorName, QObject *parent) :
AbstractSensorHandler(sensorName, parent),
- sensorChannelInterface_(NULL)
+ m_sensorChannelInterface(NULL)
{
}
void SensorHandler::receivedData(const MagneticField& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.x() << " " << data.y() << " " << data.z();
}
void SensorHandler::receivedData(const XYZ& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.x() << " " << data.y() << " " << data.z();
}
void SensorHandler::receivedData(const Compass& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.degrees() << " " << data.level();
}
void SensorHandler::receivedData(const Unsigned& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.x();
}
void SensorHandler::receivedData(const Tap& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.direction() << " " << data.type();
}
void SensorHandler::receivedData(const Proximity& data)
{
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< data.UnsignedData().value_ << " " << data.proximityData().value_;
}
void SensorHandler::receivedFrame(const QVector<MagneticField>& frame)
{
- ++frameCount_;
- sensordLogT() << sensorName_ << " frame " << frameCount_ << " size " << frame.size();
+ ++m_frameCount;
+ sensordLogT() << m_sensorName << " frame " << m_frameCount << " size " << frame.size();
foreach (const MagneticField& data, frame)
{
sensordLogT() << data.x() << " " << data.y() << " " << data.z();
- ++dataCount_;
+ ++m_dataCount;
}
}
void SensorHandler::receivedFrame(const QVector<XYZ>& frame)
{
- ++frameCount_;
- sensordLogT() << sensorName_ << " frame " << frameCount_ << " size " << frame.size();
+ ++m_frameCount;
+ sensordLogT() << m_sensorName << " frame " << m_frameCount << " size " << frame.size();
foreach (const XYZ& data, frame)
{
sensordLogT() << data.x() << " " << data.y() << " " << data.z();
- ++dataCount_;
+ ++m_dataCount;
}
}
bool SensorHandler::startClient()
{
createSensorInterface();
- if (sensorChannelInterface_ == 0)
+ if (m_sensorChannelInterface == 0)
{
sensordLogD() << "Creating sensor client interface fails.";
return false;
}
- 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();
+ 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();
return true;
}
bool SensorHandler::stopClient()
{
- if (sensorChannelInterface_)
+ if (m_sensorChannelInterface)
{
- sensorChannelInterface_->stop();
- delete sensorChannelInterface_;
- sensorChannelInterface_ = 0;
+ m_sensorChannelInterface->stop();
+ delete m_sensorChannelInterface;
+ m_sensorChannelInterface = 0;
}
return true;
}
@@ -169,48 +169,48 @@
void SensorHandler::createSensorInterface()
{
- if (sensorName_ == "compasssensor")
+ if (m_sensorName == "compasssensor")
{
- sensorChannelInterface_ = CompassSensorChannelInterface::interface("compasssensor");
- connect(sensorChannelInterface_, SIGNAL(dataAvailable(const Compass&)), this, SLOT(receivedData(const Compass&)));
+ m_sensorChannelInterface = CompassSensorChannelInterface::interface("compasssensor");
+ connect(m_sensorChannelInterface, SIGNAL(dataAvailable(const Compass&)), this, SLOT(receivedData(const Compass&)));
}
- else if (sensorName_ == "magnetometersensor")
+ else if (m_sensorName == "magnetometersensor")
{
- 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>&)));
+ 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>&)));
}
- else if (sensorName_ == "orientationsensor")
+ else if (m_sensorName == "orientationsensor")
{
- sensorChannelInterface_ = OrientationSensorChannelInterface::interface("orientationsensor");
- connect(sensorChannelInterface_, SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
+ m_sensorChannelInterface = OrientationSensorChannelInterface::interface("orientationsensor");
+ connect(m_sensorChannelInterface, SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
}
- else if (sensorName_ == "accelerometersensor")
+ else if (m_sensorName == "accelerometersensor")
{
- 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>&)));
+ 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>&)));
}
- else if (sensorName_ == "alssensor")
+ else if (m_sensorName == "alssensor")
{
- sensorChannelInterface_ = ALSSensorChannelInterface::interface("alssensor");
- connect(sensorChannelInterface_, SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
+ m_sensorChannelInterface = ALSSensorChannelInterface::interface("alssensor");
+ connect(m_sensorChannelInterface, SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(receivedData(const Unsigned&)));
}
- else if (sensorName_ == "rotationsensor")
+ else if (m_sensorName == "rotationsensor")
{
- 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>&)));
+ 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>&)));
}
- else if (sensorName_ == "tapsensor")
+ else if (m_sensorName == "tapsensor")
{
- sensorChannelInterface_ = TapSensorChannelInterface::interface("tapsensor");
- connect(sensorChannelInterface_, SIGNAL(dataAvailable(const Tap&)), this, SLOT(receivedData(const Tap&)));
+ m_sensorChannelInterface = TapSensorChannelInterface::interface("tapsensor");
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/sensorhandler_qtapi.h
^
|
| @@ -70,7 +70,7 @@
static QString toString(const DataRangeList& ranges);
- AbstractSensorChannelInterface* sensorChannelInterface_;
+ AbstractSensorChannelInterface *m_sensorChannelInterface;
};
#endif // SENSORHANDLER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-binder-0.13.0.tar.bz2/tests/testapp/sensorhandler_qtmob.cpp
^
|
| @@ -30,58 +30,58 @@
AbstractSensorHandler(sensorName, parent),
m_sensor(NULL)
{
- if (sensorName_ == "compasssensor")
+ if (m_sensorName == "compasssensor")
{
m_sensor = new QCompass();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedCompassData()));
}
- else if (sensorName_ == "magnetometersensor")
+ else if (m_sensorName == "magnetometersensor")
{
m_sensor = new QMagnetometer();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedMagnetometerData()));
}
- else if (sensorName_ == "orientationsensor")
+ else if (m_sensorName == "orientationsensor")
{
m_sensor = new QOrientationSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedOrientationData()));
}
- else if (sensorName_ == "accelerometersensor")
+ else if (m_sensorName == "accelerometersensor")
{
m_sensor = new QAccelerometer();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedAccelerometerData()));
}
- else if (sensorName_ == "alssensor")
+ else if (m_sensorName == "alssensor")
{
m_sensor = new QAmbientLightSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedAlsData()));
}
- else if (sensorName_ == "rotationsensor")
+ else if (m_sensorName == "rotationsensor")
{
m_sensor = new QRotationSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedRotationData()));
}
- else if (sensorName_ == "tapsensor")
+ else if (m_sensorName == "tapsensor")
{
m_sensor = new QTapSensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedTapData()));
}
- else if (sensorName_ == "proximitysensor")
+ else if (m_sensorName == "proximitysensor")
{
m_sensor = new QProximitySensor();
connect(m_sensor, SIGNAL(readingChanged()),
this, SLOT(receivedProximityData()));
}
- m_sensor->setProperty("alwaysOn", standbyoverride_);
- m_sensor->setProperty("bufferSize", buffersize_);
- m_sensor->setDataRate(interval_ ? 1000 / interval_ : 0);
+ m_sensor->setProperty("alwaysOn", m_standbyoverride);
+ m_sensor->setProperty("bufferSize", m_buffersize);
+ m_sensor->setDataRate(m_interval_ms ? 1000 / m_interval_ms : 0);
}
SensorHandler::~SensorHandler()
@@ -92,16 +92,16 @@
void SensorHandler::receivedAccelerometerData()
{
QAccelerometerReading* data = (QAccelerometerReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "x " << data->x() << "y " << data->y() << "z " << data->z();
}
void SensorHandler::receivedCompassData()
{
QCompassReading* data = (QCompassReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< " azimuth: " << data->azimuth() << "calibrationLevel: " << data-> calibrationLevel();
}
@@ -109,16 +109,16 @@
void SensorHandler::receivedAlsData()
{
QAmbientLightReading* data = (QAmbientLightReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "lightLevel " << data->lightLevel();
}
void SensorHandler::receivedMagnetometerData()
{
QMagnetometerReading* data = (QMagnetometerReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_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();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "orientation " << data->orientation();
}
void SensorHandler::receivedRotationData()
{
QRotationReading* data = (QRotationReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "x " << data->x() << "y " << data->y() << "z " << data->z();
}
void SensorHandler::receivedTapData()
{
QTapReading* data = (QTapReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "DoubleTap " << data->isDoubleTap();
}
void SensorHandler::receivedProximityData()
{
QProximityReading* data = (QProximityReading*) m_sensor->reading();
- ++dataCount_;
- sensordLogT() << sensorName_ << " sample " << dataCount_ << ": "
+ ++m_dataCount;
+ sensordLogT() << m_sensorName << " sample " << m_dataCount << ": "
<< "Close " << data->close();
}
|
