[sensorfw] Fix MER#983 revert accel x & y values.

They used to be opposite to what they are. This fixes that and the corresponding orientation.
sailfishos · May 8, 2015 · d314e8f · d314e8f
1 parent 9f94ae7
commit d314e8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/sensord-hybris.conf b/config/sensord-hybris.conf
@@ -12,7 +12,7 @@ transformation_matrix = "-1,0,0,0,1,0,0,0,1"
 needs_calibration = 0
 
 [accelerometer]
-transformation_matrix = "-1,0,0,0,-1,0,0,0,1"
+transformation_matrix = "1,0,0,0,1,0,0,0,1"
 
 
 #[magnetometer]

diff --git a/filters/orientationinterpreter/orientationinterpreter.cpp b/filters/orientationinterpreter/orientationinterpreter.cpp
@@ -135,7 +135,7 @@ int OrientationInterpreter::orientationCheck(const AccelerationData &data,  Orie
 PoseData OrientationInterpreter::rotateToPortrait(int rotation)
 {
     PoseData newTopEdge = PoseData::Undefined;
-    newTopEdge.orientation_ = (rotation >= 0) ? PoseData::BottomUp : PoseData::BottomDown;
+    newTopEdge.orientation_ = (rotation <= 0) ? PoseData::BottomUp : PoseData::BottomDown;
 
     // Some threshold to switching between portrait modes
     if (topEdge.orientation_ == PoseData::BottomUp || topEdge.orientation_ == PoseData::BottomDown)
@@ -153,7 +153,7 @@ PoseData OrientationInterpreter::rotateToLandscape(int rotation)
 {
 
     PoseData newTopEdge = PoseData::Undefined;
-    newTopEdge.orientation_ = (rotation >= 0) ? PoseData::LeftUp : PoseData::RightUp;
+    newTopEdge.orientation_ = (rotation <= 0) ? PoseData::LeftUp : PoseData::RightUp;
     // Some threshold to switching between landscape modes
     if (topEdge.orientation_ == PoseData::LeftUp || topEdge.orientation_ == PoseData::RightUp)
     {