Changeset a314cf9 in orbit for android/src/info
- Timestamp:
- 12/27/13 23:04:28 (9 years ago)
- Branches:
- master, Servo
- Children:
- 570ab65
- Parents:
- 4a3e18a
- Location:
- android/src/info/puzzlebox/orbit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java
rebf23f0 ra314cf9 907 907 908 908 public void registerControlledDescent() { 909 910 Log.v(TAG, "registerControlledDescent()"); 909 911 910 912 // Abort if a controlled descent task is in progress or -
android/src/info/puzzlebox/orbit/OrbitTabActivity.java
r71f66b0 ra314cf9 781 781 updateScore(); 782 782 783 command = "hover"; 783 // command = "hover"; 784 currentCommand = "hover"; 784 785 785 786 } else { … … 790 791 resetCurrentScore(); 791 792 792 command = "neutral";793 // command = "neutral"; 793 794 } 794 795 795 796 if (DEBUG) { 796 Log.v(TAG, "Command: " + c ommand);797 Log.v(TAG, "Command: " + currentCommand); 797 798 // appendDebugConsole("Command: " + command + "\n"); 798 799 } 799 800 800 currentCommand = command;801 // currentCommand = command; 801 802 802 803 } // updatePower … … 884 885 885 886 if ((generateAudio) && 886 ( currentCommand != "neutral") &&887 ((currentCommand != "neutral") || (demoFlightMode)) && 887 888 (fragmentAdvanced != null) && 888 889 (fragmentAdvanced.checkBoxControlledDescent.isChecked()) && … … 890 891 fragmentAdvanced.registerControlledDescent(); 891 892 } else { 893 // Log.v(TAG, "generateAudio: " + generateAudio); 894 // Log.v(TAG, "currentCommand: " + currentCommand); 895 // Log.v(TAG, "demoFlightMode: " + demoFlightMode); 896 // Log.v(TAG, "((currentCommand != \"neutral\") || (demoFlightMode)):" + ((currentCommand != "neutral") || (demoFlightMode))); 897 // Log.v(TAG, "fragmentAdvanced: " + (fragmentAdvanced != null)); 898 // if (fragmentAdvanced != null) 899 // Log.v(TAG, "checkBoxControlledDescent: " + fragmentAdvanced.checkBoxControlledDescent.isChecked()); 900 // Log.v(TAG, "audioHandler: " + (audioHandler != null)); 892 901 stopAudio(); 893 902 } 903 904 currentCommand = "hover"; 905 894 906 895 907 } // stopControl … … 937 949 938 950 demoFlightMode = true; 951 currentCommand = "hover"; 939 952 940 953 FragmentTabAdvanced fragmentAdvanced =
Note: See TracChangeset
for help on using the changeset viewer.