commit a2abcf415f32542d9b32fc7b6aaea0b886135c1b
author Rosa Chow <rchow@invensense.com> Fri Sep 30 18:42:36 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 30 18:42:36 2011 -0700
tree 100fd0ad4287c95cafb37e3ddf8078413f4039bb
parent 3e1893ee9f0c84d623fd4a1ec3fc01a5354f8cc2
parent 8dd45d19608d8cdce7f76439a9634cb48ba841b9

am 8dd45d19: (-s ours) Integrate Noise Filter Providied by Yamaha

* commit '8dd45d19608d8cdce7f76439a9634cb48ba841b9':
  Integrate Noise Filter Providied by Yamaha

mlsdk/Android.mk

diff --git a/mlsdk/Android.mk b/mlsdk/Android.mk
index 79b8f4b..30b9104 100644
--- a/mlsdk/Android.mk
+++ b/mlsdk/Android.mk
@@ -46,6 +46,12 @@
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/$(MLSDK_ROOT)/mllite/akmd
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/$(MLPLATFORM_DIR)/linux
 
+# optionally apply the compass filter. this is set in
+# BoardConfig.mk
+ifeq ($(BOARD_INVENSENSE_APPLY_COMPASS_NOISE_FILTER),true)
+LOCAL_CFLAGS += -DAPPLY_COMPASS_FILTER
+endif
+
 ML_SOURCES = \
         $(MLLITE_DIR)/accel.c \
         $(MLLITE_DIR)/compass.c \

mlsdk/mllite/mlsupervisor.c

diff --git a/mlsdk/mllite/mlsupervisor.c b/mlsdk/mllite/mlsupervisor.c
index cbd4ac4..8a23ab6 100644
--- a/mlsdk/mllite/mlsupervisor.c
+++ b/mlsdk/mllite/mlsupervisor.c
@@ -431,6 +431,7 @@
                     }
                 }
 
+#ifdef APPLY_COMPASS_FILTER
                 if (inv_get_compass_id() == COMPASS_ID_YAS530)
                 {
                     fcin[0] = 1000*((float)inv_obj.compass_calibrated_data[0] /65536.f);
@@ -443,7 +444,7 @@
                     inv_obj.compass_calibrated_data[1] = (long)(fcout[1]*65536.f/1000.f);
                     inv_obj.compass_calibrated_data[2] = (long)(fcout[2]*65536.f/1000.f);
                 }
-
+#endif
 
                 if (SUPERVISOR_DEBUG) {
                     MPL_LOGI("RM : %+10.6f %+10.6f %+10.6f\n",