|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,8 +1,8 @@
<services>
<service name="tar_git">
- <param name="url">https://git.merproject.org/mer-core/sensorfw.git</param>
+ <param name="url">https://git.sailfishos.org/mer-core/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">2b65a1a363117293c2144750d849e9ecd6baa71b</param>
+ <param name="revision">da053281df941b9f4d12a77003a5daca9f2edae8</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.4.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.json.prv
^
|
| @@ -1,14 +0,0 @@
-{
- "role": {
- "exeName":"/usr/sbin/sensorfwd",
- "type": "privileged",
- "allowedNames": ["com.nokia.SensorService"]
- },
- "permissions": [
- {
- "service":"com.nokia.SensorService",
- "inbound":["*"],
- "outbound":["*"]
- }
- ]
-}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.4.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service.prv
^
|
| @@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.SensorService
-Exec=/usr/sbin/sensrofwd
-Type=static
|
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.5.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.role.json
^
|
| @@ -0,0 +1,12 @@
+{
+ "exeName":"/usr/sbin/sensorfwd",
+ "type": "privileged",
+ "allowedNames": ["com.nokia.SensorService"],
+ "permissions": [
+ {
+ "service":"com.nokia.SensorService",
+ "inbound":["*"],
+ "outbound":["*"]
+ }
+ ]
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.5.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service
^
|
| @@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.nokia.SensorService
+Exec=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf
+Type=static
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.5.tar.bz2/LuneOS/systemd/sensorfwd.service
^
|
| @@ -1,7 +1,7 @@
[Unit]
Description=Sensor daemon for sensor framework
-After=dbus.socket ls-hubd_private.service
-Requires=dbus.service ls-hubd_private.service
+After=dbus.socket ls-hubd.service
+Requires=dbus.service ls-hubd.service
Conflicts=actdead.target
[Service]
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.5.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
| @@ -56,6 +56,7 @@
// Proximity sensor
#define PROXIMITY_DEFAULT_THRESHOLD 250
#define PROXIMITY_NEAR_VALUE 0
+#define PROXIMITY_FAR_VALUE 100
/* Conversion of acceleration data to SI units (m/s^2) */
#define CONVERT_A_X(x) ((float(x) / 1000) * (GRAVITY * -1.0))
@@ -433,10 +434,15 @@
sensordLogW() << "read():" << strerror(errno);
return;
}
- result = strtol(buf, NULL, 10);
- if (result == 0)
+ errno = 0; // reset errno before call
+ result = strtol(buf, NULL, 10);
+
+ // If any conversion error occurs, abort
+ if (errno != 0) {
+ sensordLogW() << "strtol(): Unable to convert string to long";
return;
+ }
switch(channel) {
case 0: {
@@ -459,11 +465,12 @@
bool near = false;
int proximityValue = (result + iioDevice.offset) * iioDevice.scale;
proximityData = proximityBuffer_->nextSlot();
+ // IIO proximity sensors are inverted in comparison to Hybris proximity sensors
if (proximityValue >= proximityThreshold) {
near = true;
}
proximityData->withinProximity_ = near;
- proximityData->value_ = near ? PROXIMITY_NEAR_VALUE : proximityValue;
+ proximityData->value_ = near ? PROXIMITY_NEAR_VALUE : PROXIMITY_FAR_VALUE;
}
break;
default:
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.5.tar.bz2/debian/libsensorfw-qt5-plugins.install
^
|
| @@ -38,5 +38,4 @@
/usr/lib/sensord-qt5/liboaktrailaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/libpegatronaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/librotationsensor-qt5.so
-
-
+/usr/lib/sensord-qt5/libiiosensorsadaptor-qt5.so
|
