Changeset 1d46203 in orbit for android/src

Timestamp:

12/28/13 01:36:08 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

80e94e7

Parents:

570ab65

Message:

• currentCommand string replaced with flightActive boolean
• end-of-line added to debug console output for tilt sensor detection

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (5 diffs)
• OrbitTabActivity.java (modified) (7 diffs)

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

@@ -588 +588 @@
                                                 orientationSensor = gravSensors.get(i);
                                                 Log.v(TAG, "Tilt Control: Using Gravity Sensor (version 3+)");
-                                                appendDebugConsole("Tilt Control: Using Gravity Sensor");
+                                                appendDebugConsole("Tilt Control: Using Gravity Sensor\n");
                                                 break;
                                         }
@@ -598 +598 @@
                                                 orientationSensor = gravSensors.get(i);
                                                 Log.v(TAG, "Tilt Control: Using Gravity Sensor");
-                                                appendDebugConsole("Tilt Control: Using Gravity Sensor");
+                                                appendDebugConsole("Tilt Control: Using Gravity Sensor\n");
                                                 break;
                                         }
@@ -607 +607 @@
                                 orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
                                 Log.v(TAG, "Tilt Control: Using Accelerometer Sensor");
-                                appendDebugConsole("Tilt Control: Using Linear Accelerometer Sensor");
+                                appendDebugConsole("Tilt Control: Using Linear Accelerometer Sensor\n");
                         }
 
@@ -616 +616 @@
                                         orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
                                         Log.v(TAG, "Tilt Control: Using Accelerometer Sensor");
-                                        appendDebugConsole("Tilt Control: Using Accelerometer Sensor");
+                                        appendDebugConsole("Tilt Control: Using Accelerometer Sensor\n");
                                 }
 
@@ -624 +624 @@
                         if (orientationSensor == null) {
                                 Toast.makeText(((OrbitTabActivity)getActivity()), "No Tilt Sensor Found", Toast.LENGTH_SHORT).show();
-                                appendDebugConsole("Tilt Control: Not Found");
+                                appendDebugConsole("Tilt Control: Not Found\n");
                                 checkBoxTiltSensorControl.setChecked(false);
                                 sensorManager.unregisterListener(this);

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

@@ -140 +140 @@
          * Flight status
          */
-        String currentCommand = "neutral";
+        //      String currentCommand = "neutral";
+        boolean flightActive = false;
 
 
@@ -775 +776 @@
 
                         /** Start playback of audio control stream */
-                        if (currentCommand == "neutral") {
+                        //                      if (currentCommand == "neutral") {
+                        if (flightActive == false) {
                                 playControl();
                         }
@@ -782 +784 @@
 
                         //                      command = "hover";
-                        currentCommand = "hover";
+                        //                      currentCommand = "hover";
+                        flightActive = true;
 
                 } else {
@@ -795 +798 @@
 
                 if (DEBUG) {
-                        Log.v(TAG, "Command: " + currentCommand);
-                        //                      appendDebugConsole("Command: " + command + "\n");
+                        //                      Log.v(TAG, "Command: " + currentCommand);
+                        Log.v(TAG, "flightActive: " + flightActive);
                 }
 
@@ -885 +888 @@
 
                 if ((generateAudio) &&
-                                (currentCommand != "neutral") &&
+                                (flightActive) &&
                                 (fragmentAdvanced != null) &&
                                 (fragmentAdvanced.checkBoxControlledDescent.isChecked()) &&
@@ -895 +898 @@
                 }
 
-                currentCommand = "hover";
+                //              currentCommand = "neutral";
+                flightActive = false;
 
 
@@ -942 +946 @@
 
                 demoFlightMode = true;
-                currentCommand = "hover";
+                //              currentCommand = "hover";
+                flightActive = true;
 
                 FragmentTabAdvanced fragmentAdvanced =