Integrate quaternions

[~andy/iBeaconNav] / src / edu / ucla / iBeaconNav / Main.java

diff --git a/src/edu/ucla/iBeaconNav/Main.java b/src/edu/ucla/iBeaconNav/Main.java
index 3e421c99ba344f6e5dcd9d1a4b4df7c7fa0321ae..e9fef307f33bd331de10afc4f7f1ffdf1b7cc25f 100644 (file)
--- a/src/edu/ucla/iBeaconNav/Main.java
+++ b/src/edu/ucla/iBeaconNav/Main.java
@@ -111,6 +111,11 @@ public class Main extends Activity
                        textView2 = (TextView)findViewById(R.id.gyrText2);
                        textView3 = (TextView)findViewById(R.id.gyrText3);
                        break;
+               case GYR1HZ:
+                       textView1 = (TextView)findViewById(R.id.gyr1hzx);
+                       textView2 = (TextView)findViewById(R.id.gyr1hzy);
+                       textView3 = (TextView)findViewById(R.id.gyr1hzz);
+                       break;
                case ORIENT:
                        textView1 = (TextView)findViewById(R.id.orientText1);
                        textView2 = (TextView)findViewById(R.id.orientText2);
@@ -131,6 +136,11 @@ public class Main extends Activity
                        textView2 = (TextView)findViewById(R.id.curPosYText);
                        displayNum = 2;
                        break;
+               case ROTATION:
+                       textView1 = (TextView)findViewById(R.id.roll);
+                       textView2 = (TextView)findViewById(R.id.pitch);
+                       textView3 = (TextView)findViewById(R.id.yaw);
+                       break;
                case HEADING:
                        textView1 = (TextView)findViewById(R.id.headingText);
                        displayNum = 1;