ricky/location_library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added proper compensation for device rotations.

Browse Source 
this change will allow devices with diffrent default orentations to use
the compass more accuractly.
tested on a nexus s (portrait) and asus transformer (landscsape) 

Change-Id: I2ca9a9f2f122ca3bceb20f91087d8aaaae394519
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-03-14 11:05:10 -04:00
parent 4c4986ea61
commit f2940419bb
1 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
LocationLib/src/com/TwentyCodes/android/location/CompassSensor.java
View File

@@ -7,7 +7,6 @@
package com.TwentyCodes.android.location; package com.TwentyCodes.android.location;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.hardware.GeomagneticField; import android.hardware.GeomagneticField;
import android.hardware.Sensor; import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
@@ -17,6 +16,9 @@ import android.location.Location;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.Surface;
import android.view.WindowManager;
import com.TwentyCodes.android.debug.Debug; import com.TwentyCodes.android.debug.Debug;
@@ -26,26 +28,28 @@ import com.TwentyCodes.android.debug.Debug;
*/ */
public class CompassSensor{ public class CompassSensor{
public static final String TAG = "CompassSensor";
private static final int BEARING = 0; private static final int BEARING = 0;
private final Display mDisplay;
private final Handler mHandler;
private final SensorManager mSensorManager; private final SensorManager mSensorManager;
private CompassListener mListener; private CompassListener mListener;
private final Handler mHandler;
private Context mContext; private Context mContext;
private float mDelination = 0; private float mDelination = 0;
public static final String TAG = "CompassSensor";
private final SensorEventListener mCallBack = new SensorEventListener() { private final SensorEventListener mCallBack = new SensorEventListener() {
private float[] mR = new float[16]; private float[] mRotationMatrix = new float[16];
// private float[] mRemapedRotationMatrix = new float[16];
private float[] mI = new float[16]; private float[] mI = new float[16];
private float[] mGravity = new float[3]; private float[] mGravity = new float[3];
private float[] mGeomag = new float[3]; private float[] mGeomag = new float[3];
private float[] mOrientVals = new float[3]; private float[] mOrientVals = new float[3];
private double mAzimuth = 0; private double mAzimuth = 0;
double mPitch = 0; // double mPitch = 0;
double mRoll = 0; // double mRoll = 0;
private float mInclination; // private float mInclination;
public void onSensorChanged(final SensorEvent sensorEvent) { public void onSensorChanged(final SensorEvent sensorEvent) {
if(Debug.DEBUG){ if(Debug.DEBUG){
@@ -84,22 +88,36 @@ public class CompassSensor{
if (mGravity != null && mGeomag != null) { if (mGravity != null && mGeomag != null) {
// checks that the rotation matrix is found // checks that the rotation matrix is found
boolean success = SensorManager.getRotationMatrix(mR, mI, mGravity, mGeomag); boolean success = SensorManager.getRotationMatrix(mRotationMatrix, mI, mGravity, mGeomag);
if (success) { if (success) {
/* // switch (mDisplay.getOrientation()){
* TODO remap cords due to Display.getRotation() // case Surface.ROTATION_0:
*/ // Log.v(TAG , "0");
// Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); // // SensorManager.remapCoordinateSystem(mRotationMatrix, SensorManager.AXIS_X, SensorManager.AXIS_Y, mRemapedRotationMatrix);
// switch (display.getOrientation()){ // break;
// } // case Surface.ROTATION_90:
// Log.v(TAG , "90");
// // SensorManager.remapCoordinateSystem(mRotationMatrix, SensorManager.AXIS_X, SensorManager.AXIS_Y, mRemapedRotationMatrix);
// break;
// case Surface.ROTATION_180:
// Log.v(TAG , "180");
// // SensorManager.remapCoordinateSystem(mRotationMatrix, SensorManager.AXIS_MINUS_X, SensorManager.AXIS_MINUS_Y, mRemapedRotationMatrix);
// break;
// case Surface.ROTATION_270:
// Log.v(TAG , "270");
// // SensorManager.remapCoordinateSystem(mRotationMatrix, SensorManager.AXIS_MINUS_X, SensorManager.AXIS_Y, mRemapedRotationMatrix);
// break;
// }
// SensorManager.remapCoordinateSystem(mR, SensorManager.AXIS_MINUS_Y, SensorManager.AXIS_X, mR); /*
SensorManager.getOrientation(mR, mOrientVals); * remap cords due to Display.getRotation()
mInclination = SensorManager.getInclination(mI); */
SensorManager.getOrientation(mRotationMatrix, mOrientVals);
// mInclination = SensorManager.getInclination(mI);
mAzimuth = Math.toDegrees(mOrientVals[0]); mAzimuth = Math.toDegrees(mOrientVals[0]);
mPitch = Math.toDegrees(mOrientVals[1]); // mPitch = Math.toDegrees(mOrientVals[1]);
mRoll = Math.toDegrees(mOrientVals[2]); // mRoll = Math.toDegrees(mOrientVals[2]);
/* /*
* compensate for magentic delination * compensate for magentic delination
@@ -107,22 +125,21 @@ public class CompassSensor{
mAzimuth += mDelination; mAzimuth += mDelination;
/* /*
* this will compenstate for device rotations * compensate for device orentation
* TODO compensate for inversed portrait
*/ */
if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { switch (mDisplay.getOrientation()){
boolean isNormal = false; case Surface.ROTATION_0:
if (mRoll <= -25) break;
isNormal = false; case Surface.ROTATION_90:
mAzimuth = mAzimuth + 90;
if (mRoll >= 25) break;
isNormal = true; case Surface.ROTATION_180:
mAzimuth = mAzimuth +180;
if (isNormal) break;
mAzimuth = mAzimuth - 90; case Surface.ROTATION_270:
else mAzimuth = mAzimuth - 90;
mAzimuth = mAzimuth + 90; break;
} }
} }
} }
@@ -140,6 +157,7 @@ public class CompassSensor{
*/ */
public CompassSensor(final Context context) { public CompassSensor(final Context context) {
mContext = context; mContext = context;
mDisplay = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mHandler = new Handler(){ mHandler = new Handler(){
@Override @Override
public void handleMessage(Message msg){ public void handleMessage(Message msg){