|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
^
|
| @@ -45,6 +45,7 @@
setAdaptedSensor("accelerometer", "Internal accelerometer coordinates", accelerometerBuffer_);
setDescription("Input device accelerometer adaptor");
powerStatePath_ = Config::configuration()->value("accelerometer/powerstate_path").toByteArray();
+ accelMultiplier = Config::configuration()->value("accelerometer/multiplier", QVariant(1)).toReal();
}
AccelerometerAdaptor::~AccelerometerAdaptor()
@@ -78,13 +79,13 @@
case EV_ABS:
switch (ev->code) {
case ABS_X:
- orientationValue_.x_ = ev->value;
+ orientationValue_.x_ = ev->value * accelMultiplier;
break;
case ABS_Y:
- orientationValue_.y_ = ev->value;
+ orientationValue_.y_ = ev->value * accelMultiplier;
break;
case ABS_Z:
- orientationValue_.z_ = ev->value;
+ orientationValue_.z_ = ev->value * accelMultiplier;
break;
}
break;
@@ -134,3 +135,15 @@
sessionId = winningSessionId;
return highestValue > 0 ? highestValue : defaultInterval();
}
+
+bool AccelerometerAdaptor::resume()
+{
+ startSensor();
+ return true;
+}
+
+bool AccelerometerAdaptor::standby()
+{
+ stopSensor();
+ return true;
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptor.h
^
|
| @@ -59,6 +59,9 @@
virtual bool startSensor();
virtual void stopSensor();
+ virtual bool standby();
+ virtual bool resume();
+
protected:
/**
* Constructor.
@@ -80,6 +83,7 @@
void commitOutput(struct input_event *ev);
void interpretSync(int src, struct input_event *ev);
QByteArray powerStatePath_;
+ qreal accelMultiplier;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
^
|
| @@ -134,18 +134,12 @@
bool ALSAdaptorEvdev::standby()
{
- if (SysfsAdaptor::standby()) {
- stopSensor();
- return true;
- }
- return false;
+ stopSensor();
+ return true;
}
bool ALSAdaptorEvdev::resume()
{
- if (SysfsAdaptor::resume()) {
- startSensor();
- return true;
- }
- return false;
+ startSensor();
+ return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
^
|
| @@ -143,18 +143,12 @@
bool GyroAdaptorEvdev::standby()
{
- if (SysfsAdaptor::standby()) {
- stopSensor();
- return true;
- }
- return false;
+ stopSensor();
+ return true;
}
bool GyroAdaptorEvdev::resume()
{
- if (SysfsAdaptor::resume()) {
- startSensor();
- return true;
- }
- return false;
+ startSensor();
+ return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
^
|
| @@ -83,7 +83,7 @@
inputDev.replace("input","event");
inputDev.prepend("/dev/input/");
- if ((fd = open(inputDev.toLatin1(), O_RDONLY)) > 0) {
+ if ((fd = open(inputDev.toLatin1(), O_RDONLY)) > -1) {
if (!ioctl(fd, EVIOCGABS(ABS_MISC), &absinfo)) {
if (absinfo.value != lastLightValue)
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
^
|
| @@ -31,7 +31,7 @@
HybrisProximityAdaptor::HybrisProximityAdaptor(const QString& id) :
HybrisAdaptor(id,SENSOR_TYPE_PROXIMITY),
- lastNearValue(true)
+ lastNearValue(-1)
{
if (isValid()) {
buffer = new DeviceAdaptorRingBuffer<ProximityData>(1);
@@ -66,8 +66,8 @@
QTextStream in(&file);
QString line = in.readLine();
while (!line.isNull()) {
- if (ok && line.startsWith("S: Sysfs=")) {
- inputDev = line.split("=").at(1).section("/",-1);
+ if (ok && line.startsWith("H: Handlers")) {
+ inputDev = line.split("=").at(1).section("/",-1).simplified();
ok = false;
break;
}
@@ -84,10 +84,9 @@
struct input_absinfo absinfo;
int fd;
- inputDev.replace("input","event");
inputDev.prepend("/dev/input/");
- if ((fd = open(inputDev.toLatin1(), O_RDONLY)) > 0) {
+ if ((fd = open(inputDev.toLatin1(), O_RDONLY)) > -1) {
if (!ioctl(fd, EVIOCGABS(ABS_DISTANCE), &absinfo)) {
bool near = false;
@@ -96,7 +95,7 @@
ProximityData *d = buffer->nextSlot();
d->timestamp_ = Utils::getTimeStamp();
d->withinProximity_ = near;
- d->value_ = near ? 10 : 0;
+ d->value_ = absinfo.value;
buffer->commit();
buffer->wakeUpReaders();
} else {
@@ -108,8 +107,8 @@
ProximityData *d = buffer->nextSlot();
d->timestamp_ = Utils::getTimeStamp();
- d->withinProximity_ = lastNearValue;
- d->value_ = lastNearValue ? 10 : 0;
+ d->withinProximity_ = false;
+ d->value_ = 10;
buffer->commit();
buffer->wakeUpReaders();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.h
^
|
| @@ -61,6 +61,6 @@
private:
DeviceAdaptorRingBuffer<ProximityData>* buffer;
int sensorType;
- bool lastNearValue;
+ int lastNearValue;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
^
|
| @@ -142,18 +142,12 @@
bool MagAdaptorEvdev::standby()
{
- if (SysfsAdaptor::standby()) {
- stopSensor();
- return true;
- }
- return false;
+ stopSensor();
+ return true;
}
bool MagAdaptorEvdev::resume()
{
- if (SysfsAdaptor::resume()) {
- startSensor();
- return true;
- }
- return false;
+ startSensor();
+ return true;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
^
|
| @@ -46,6 +46,7 @@
{
proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
setAdaptedSensor("proximity", "Proximity state", proximityBuffer_);
+ powerStatePath_ = Config::configuration()->value("proximity/powerstate_path").toByteArray();
}
ProximityAdaptorEvdev::~ProximityAdaptorEvdev()
@@ -59,9 +60,9 @@
if (ev->type == EV_SW && ev->code == SW_FRONT_PROXIMITY ||
ev->type == EV_ABS && ev->code == ABS_DISTANCE) {
if (ev->value == 0) {
- currentState_ = ProximityStateOpen;
- } else if (ev->value == 1) {
currentState_ = ProximityStateClosed;
+ } else if (ev->value == 1) {
+ currentState_ = ProximityStateOpen;
} else {
currentState_ = ProximityStateUnknown;
}
@@ -92,3 +93,35 @@
proximityBuffer_->wakeUpReaders();
}
}
+
+bool ProximityAdaptorEvdev::startSensor()
+{
+ if (!powerStatePath_.isEmpty()) {
+ writeToFile(powerStatePath_, "1");
+ }
+ if (SysfsAdaptor::startSensor()) {
+ return true;
+ }
+ return false;
+}
+
+void ProximityAdaptorEvdev::stopSensor()
+{
+ if (!powerStatePath_.isEmpty()) {
+ writeToFile(powerStatePath_, "0");
+ }
+
+ SysfsAdaptor::stopSensor();
+}
+
+bool ProximityAdaptorEvdev::standby()
+{
+ stopSensor();
+ return true;
+}
+
+bool ProximityAdaptorEvdev::resume()
+{
+ startSensor();
+ return true;
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.h
^
|
| @@ -59,7 +59,13 @@
{
return new ProximityAdaptorEvdev(id);
}
+ virtual bool startSensor();
+ virtual void stopSensor();
+
+ virtual bool standby();
+
+ virtual bool resume();
protected:
/**
* Constructor.
@@ -76,6 +82,7 @@
void interpretEvent(int src, struct input_event *ev);
void commitOutput(struct input_event *ev);
void interpretSync(int src, struct input_event *ev);
+ QByteArray powerStatePath_;
};
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/core/hybrisadaptor.cpp
^
|
| @@ -173,10 +173,13 @@
bool HybrisManager::setDelay(int sensorHandle, int interval)
{
- int result = device->setDelay(device, sensorHandle, interval);
- if (result < 0) {
- sensordLogW() << "setDelay() failed" << strerror(-result);
- return false;
+ bool ok = true;
+ if (interval > 0) {
+ int result = device->setDelay(device, sensorHandle, interval);
+ if (result < 0) {
+ sensordLogW() << "setDelay() failed" << strerror(-result);
+ ok = false;
+ }
}
QList <HybrisAdaptor *> list;
list = registeredAdaptors.values();
@@ -186,7 +189,7 @@
}
}
- return true;
+ return ok;
}
void HybrisManager::startReader(HybrisAdaptor *adaptor)
@@ -470,7 +473,6 @@
}
inStandbyMode_ = true;
- sensordLogD() << "Adaptor '" << id() << "' going to standby";
hybrisManager()->standbyReader(this);
running_ = deviceStandbyOverride();
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/core/sensormanager.cpp
^
|
| @@ -130,7 +130,6 @@
}
#ifdef SENSORFW_MCE_WATCHER
-
mceWatcher_ = new MceWatcher(this);
connect(mceWatcher_, SIGNAL(displayStateChanged(const bool)),
this, SLOT(displayStateChanged(const bool)));
@@ -687,7 +686,7 @@
{
output.append(" Adaptors:");
for (QMap<QString, DeviceAdaptorInstanceEntry>::const_iterator it = deviceAdaptorInstanceMap_.constBegin(); it != deviceAdaptorInstanceMap_.constEnd(); ++it) {
- output.append(QString(" %1 [%2 listener(s)]").arg(it.value().type_).arg(it.value().cnt_));
+ output.append(QString(" %1 [%2 listener(s)] %3").arg(it.value().type_).arg(it.value().cnt_).arg(it.value().adaptor_->deviceStandbyOverride() ? "Standby Overriden" : "No standby override"));
}
output.append(" Chains:\n");
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-0.8.28.tar.bz2/core/sysfsadaptor.cpp
^
|
| @@ -146,10 +146,6 @@
return;
}
- if (!shouldBeRunning_) {
- return;
- }
-
entry->removeReference();
if (entry->referenceCount() <= 0) {
if (!inStandbyMode_) {
@@ -158,7 +154,6 @@
}
entry->setIsRunning(false);
running_ = false;
- shouldBeRunning_ = false;
}
}
@@ -173,19 +168,19 @@
sensordLogD() << "Adaptor '" << id() << "' not going to standby: overriden";
return false;
}
- inStandbyMode_ = true;
-
if (!isRunning()) {
sensordLogD() << "Adaptor '" << id() << "' not going to standby: not running";
return false;
}
+ inStandbyMode_ = true;
+ shouldBeRunning_ = true;
sensordLogD() << "Adaptor '" << id() << "' going to standby";
stopReaderThread();
closeAllFds();
running_ = false;
-
+ stopAdaptor();
return true;
}
@@ -199,7 +194,6 @@
return false;
}
- inStandbyMode_ = false;
if (!shouldBeRunning_) {
sensordLogD() << "Adaptor '" << id() << "' not resuming from standby: not running";
@@ -207,6 +201,7 @@
}
sensordLogD() << "Adaptor '" << id() << "' resuming from standby";
+ inStandbyMode_ = false;
if (!startReaderThread()) {
sensordLogW() << "Adaptor '" << id() << "' failed to resume from standby!";
@@ -214,6 +209,7 @@
}
running_ = true;
+ startAdaptor();
return true;
}
|
