Changeset a314cf9 in orbit for android/src/info

Timestamp:

12/27/13 23:04:28 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

570ab65

Parents:

4a3e18a

Message:

• currentCommand handling adjusted to support demoFlightMode

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (1 diff)
• OrbitTabActivity.java (modified) (5 diffs)

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

@@ -907 +907 @@
 
         public void registerControlledDescent() {
+                
+                Log.v(TAG, "registerControlledDescent()");
 
                 // Abort if a controlled descent task is in progress or

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

@@ -781 +781 @@
                         updateScore();
 
-                        command = "hover";
+                        //                      command = "hover";
+                        currentCommand = "hover";
 
                 } else {
@@ -790 +791 @@
                         resetCurrentScore();
 
-                        command = "neutral";
+                        //                      command = "neutral";
                 }
 
                 if (DEBUG) {
-                        Log.v(TAG, "Command: " + command);
+                        Log.v(TAG, "Command: " + currentCommand);
                         //                      appendDebugConsole("Command: " + command + "\n");
                 }
 
-                currentCommand = command;
+                //              currentCommand = command;
 
         } // updatePower
@@ -884 +885 @@
 
                 if ((generateAudio) &&
-                                (currentCommand != "neutral") &&
+                                ((currentCommand != "neutral") || (demoFlightMode)) &&
                                 (fragmentAdvanced != null) &&
                                 (fragmentAdvanced.checkBoxControlledDescent.isChecked()) &&
@@ -890 +891 @@
                         fragmentAdvanced.registerControlledDescent();
                 } else {
+                        //                      Log.v(TAG, "generateAudio: " + generateAudio);
+                        //                      Log.v(TAG, "currentCommand: " + currentCommand);
+                        //                      Log.v(TAG, "demoFlightMode: " + demoFlightMode);
+                        //                      Log.v(TAG, "((currentCommand != \"neutral\") || (demoFlightMode)):" + ((currentCommand != "neutral") || (demoFlightMode)));
+                        //                      Log.v(TAG, "fragmentAdvanced: " + (fragmentAdvanced != null));
+                        //                      if (fragmentAdvanced != null)
+                        //                              Log.v(TAG, "checkBoxControlledDescent: " + fragmentAdvanced.checkBoxControlledDescent.isChecked());
+                        //                      Log.v(TAG, "audioHandler: " + (audioHandler != null));
                         stopAudio();
                 }
+
+                currentCommand = "hover";
+
 
         } // stopControl
@@ -937 +949 @@
 
                 demoFlightMode = true;
+                currentCommand = "hover";
 
                 FragmentTabAdvanced fragmentAdvanced =