Changeset 6b13b7f in orbit for android/src

Timestamp:

12/21/13 00:36:56 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

70c6c13

Parents:

34f56db

Message:

• Gravity and Accelerometer sensor support replaces TYPE_ORIENTATION
• Debug console set to bottom gravity (scrolls automatically from the bottom)

File:

• android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java (modified) (12 diffs)

android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java

@@ -8 +8 @@
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.List;
 
 import org.apache.http.conn.util.InetAddressUtils;
@@ -29 +30 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.text.method.ScrollingMovementMethod;
 
@@ -90 +92 @@
         private SensorManager sensorManager;
         private Sensor orientationSensor = null;
-
+        //      private Sensor accelerationSensor = null;
+        //      private Sensor gravitySensor = null;
 
         LinearLayout layoutControl;
@@ -262 +265 @@
         // ################################################################
 
+        public void onPause() {
+
+                /**
+                 * This method is called when the Activity has been 
+                 * paused and placed in the background
+                 */
+
+                sensorManager.unregisterListener(this);
+                super.onPause();
+
+        } // onResume
+
+
+        // ################################################################
+
         public void onResume() {
 
@@ -270 +288 @@
 
                 updateAdvancedOptions();
+                onCheckBoxTiltSensorControlClicked();
                 super.onResume();
 
@@ -307 +326 @@
                 if (tv != null)
                         tv.append(text);
+
+                Log.v(TAG, "Debug Console Line Count: " + tv.getLineCount());
+
+
+                //              try: 
+                //                      tv.setText(s); 
+                //                      sv.post(new Runnable() { 
+                //                          void run() { 
+                //                              sv.scrollTo(0, yPosition); 
+                //                          } 
+                //                      }); 
+
+                //              tv.setVerticalScrollbarPosition(tv.getLineCount());
 
                 //              if (tv != null) {
@@ -355 +387 @@
         public void updateScreenLayoutSmall() {
 
-                //              radioGroupChannel.setVisibility(View.GONE);
-                //              //              checkBoxAdvancedOptions.setText("Advanced");
-                //
-                //              //              checkBoxGenerateAudio.setText("Generate Signal");
-                //              //              checkBoxInvertControlSignal.setText("Invert Signal");
-
                 String generateSignalLabel = getResources().getString(R.string.checkbox_generate_audio_small);
                 checkBoxGenerateAudio.setText(generateSignalLabel);
@@ -437 +463 @@
         // ################################################################
 
-        @SuppressWarnings("deprecation")
         public void onCheckBoxTiltSensorControlClicked(View view) {
+                // Drop the View as we don't use it
+                // This is necessary for the onPause/onResume functions which don't receive a View
+                onCheckBoxTiltSensorControlClicked();
+        }
+
+
+        // ################################################################
+
+        @SuppressWarnings("unused")
+        public void onCheckBoxTiltSensorControlClicked() {
 
                 //              ((OrbitTabActivity)getActivity()).tiltSensorControl = checkBoxTiltSensorControl.isChecked();
@@ -460 +495 @@
                 if (checkBoxTiltSensorControl.isChecked()) {
 
-                        // register for orientation sensor events:
+                        //                      Log.v(TAG, "Sensor TYPE_ACCELEROMETER: " + Sensor.TYPE_ACCELEROMETER);
+                        //                      //                      Log.v(TAG, "Sensor TYPE_GAME_ROTATION_VECTOR: " + Sensor.TYPE_GAME_ROTATION_VECTOR); // API 19
+                        //                      //                      Log.v(TAG, "Sensor TYPE_GEOMAGNETIC_ROTATION_VECTOR: " + Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR); // API 19
+                        //                      Log.v(TAG, "Sensor TYPE_GYROSCOPE: " + Sensor.TYPE_GYROSCOPE);
+                        //                      Log.v(TAG, "Sensor TYPE_LINEAR_ACCELERATION: " + Sensor.TYPE_LINEAR_ACCELERATION);
+                        //                      Log.v(TAG, "Sensor TYPE_MAGNETIC_FIELD: " + Sensor.TYPE_MAGNETIC_FIELD);
+                        //                      //                      Log.v(TAG, "Sensor TYPE_GAME_ROTATION_VECTOR: " + Sensor.TYPE_GAME_ROTATION_VECTOR); // API 18
+                        //                      Log.v(TAG, "Sensor TYPE_ORIENTATION: " + Sensor.TYPE_ORIENTATION);
+                        //                      Log.v(TAG, "Sensor TYPE_MAGNETIC_FIELD: " + Sensor.TYPE_MAGNETIC_FIELD);
+
+                        //                      // register for orientation sensor events:
                         sensorManager = (SensorManager) ((OrbitTabActivity)getActivity()).getSystemService(Context.SENSOR_SERVICE);
-                        for (Sensor sensor : sensorManager.getSensorList(Sensor.TYPE_ORIENTATION)) {
-                                if (sensor.getType() == Sensor.TYPE_ORIENTATION) {
-                                        orientationSensor = sensor;
+
+
+                        Log.v(TAG, "Sensors: " + sensorManager.getSensorList(Sensor.TYPE_ALL));
+
+
+                        //                      for (Sensor sensor : sensorManager.getSensorList()) {
+                        ////                    for (Sensor sensor : sensorManager.getSensorList(Sensor.TYPE_ORIENTATION)) {
+                        ////                            if (sensor.getType() == Sensor.TYPE_ORIENTATION) {
+                        ////                                    orientationSensor = sensor;
+                        ////                            }
+                        //                              
+                        //                              Log.v(TAG, "Sensor Type Found: " + sensor.getType());
+                        //                              
+                        //                              if (sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+                        //                                      accelerationSensor = sensor;
+                        //                              }
+                        //                              
+                        //                      }
+
+
+                        if (sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY) != null) {
+                                List<Sensor> gravSensors = sensorManager.getSensorList(Sensor.TYPE_GRAVITY);
+                                for(int i=0; i < gravSensors.size(); i++) {
+                                        //                                      if ((gravSensors.get(i).getVendor().contains("Google Inc.")) &&
+                                        //                                                      (gravSensors.get(i).getVersion() == 3)){
+                                        // Use the version 3 gravity sensor.
+                                        orientationSensor = gravSensors.get(i);
+                                        Log.v(TAG, "Tilt Control: Using Gravity Sensor");
+                                        appendDebugConsole("Tilt Control: Using Gravity Sensor");
+                                        break;
+                                        //                                      }
                                 }
                         }
+                        else if (sensorManager.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION) != null) {
+                                orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+                                Log.v(TAG, "Linear accelerometer sensor found");
+                        }
+
+                        else {
+
+                                Log.v(TAG, "Tilt Control: Using Accelerometer Sensor");
+                                appendDebugConsole("Tilt Control: Using Linear Accelerometer Sensor");
+
+                                // Use the accelerometer.
+                                if (sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null){
+                                        orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+                                        Log.v(TAG, "Tilt Control: Using Accelerometer Sensor");
+                                        appendDebugConsole("Tilt Control: Using Accelerometer Sensor");
+                                }
+                                else {
+                                        // Sorry, there are no accelerometers on your device.
+                                        Log.v(TAG, "Sorry, there are no tilt sensors on your device.");
+                                        appendDebugConsole("Tilt Control: Using Gravity Sensor");
+                                }
+                        }
 
                         // if we can't access the orientation sensor then exit:
                         if (orientationSensor == null) {
-                                appendDebugConsole("Failed to attach to Orientation Sensor.");
-                                //                      cleanup();
+                                Toast.makeText(((OrbitTabActivity)getActivity()), "No Tilt Sensor Found", Toast.LENGTH_SHORT).show();
+                                appendDebugConsole("Tilt Control: Not Found");
+                                checkBoxTiltSensorControl.setChecked(false);
                                 sensorManager.unregisterListener(this);
                         } else {
@@ -657 +753 @@
 
         public void onAccuracyChanged(Sensor sensor, int accuracy) {
-                // Not interested in this event
-
+
+                // No operation
+                
         } // onAccuracyChanged
 
@@ -664 +761 @@
         // ################################################################
 
-        // Called whenever a new Orientation Sensor reading is taken.
         public void onSensorChanged(SensorEvent sensorEvent) {
-                // TODO Auto-generated method stub
-
-                tiltX = sensorEvent.values[1];
-                tiltY = -sensorEvent.values[2]; // invert the Y axis so that negative values equal left
-                //              tiltZ = sensorEvent.values[0];
-
-                //              appendDebugConsole("X: " + tiltX + ", Y: " + tiltY + "\n");
+
+                // Sensor.TYPE_ORIENTATION method
+                //              tiltX = sensorEvent.values[1];
+                //              tiltY = -sensorEvent.values[2]; // invert the Y axis so that negative values equal left
+
+                // Sensor.TYPE_GRAVITY method
+                tiltX = sensorEvent.values[1] * -4;
+                tiltY = sensorEvent.values[0] * -6; 
+
+//              appendDebugConsole("X: " + tiltX + ", Y: " + tiltY + "\n");
 
                 if (referenceTiltX == 0) {
@@ -679 +778 @@
                 }
 
-                //              seekBarYaw.setProgress(defaultControlYaw + (int) tiltY);
-                //              seekBarPitch.setProgress(defaultControlPitch + 12 + ((int) tiltX / 2));
+                // Sensor.TYPE_OPERATION method
+                //              seekBarYaw.setProgress(defaultControlYaw + (int) (tiltY - referenceTiltY));
+                //              seekBarPitch.setProgress(defaultControlPitch + (int) ((tiltX / 2) - (referenceTiltX / 2)));
+                
+                // Sensor.TYPE_GRAVITY
                 seekBarYaw.setProgress(defaultControlYaw + (int) (tiltY - referenceTiltY));
-                seekBarPitch.setProgress(defaultControlPitch + (int) ((tiltX / 2) - (referenceTiltX / 2)));
+                seekBarPitch.setProgress(defaultControlPitch + (int) (tiltX - referenceTiltX));