Merge branch 'jb39284_compass_sensor' into 'master'

Fix interval handling so that compass sensor can be started See merge request mer-core/sensorfw!25
sailfishos · Jun 19, 2018 · e1566a8 · e1566a8
2 parents bd1f16e + 02ee4ab
commit e1566a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/chains/compasschain/compasschain.cpp b/chains/compasschain/compasschain.cpp
@@ -178,6 +178,9 @@ CompassChain::CompassChain(const QString& id) :
 
         addStandbyOverrideSource(accelerometerChain);
         setIntervalSource(accelerometerChain);
+    } else {
+      addStandbyOverrideSource(orientAdaptor);
+      setIntervalSource(orientAdaptor);
     }
 }
 

diff --git a/core/hybrisadaptor.cpp b/core/hybrisadaptor.cpp
@@ -205,9 +205,13 @@ int HybrisManager::maxRange(int sensorType)
 
 int HybrisManager::minDelay(int sensorType)
 {
-    if (sensorMap.contains(sensorType))
-        return sensorList[sensorMap[sensorType]].minDelay;
-    return 0;
+    int res = 0;
+    if (sensorMap.contains(sensorType)) {
+        res = sensorList[sensorMap[sensorType]].minDelay;
+        // us -> ms, round up
+        res = (res + 999) / 1000;
+    }
+    return res;
 }
 
 int HybrisManager::resolution(int sensorType)