Changeset 1d46203 in orbit for android/src
- Timestamp:
- 12/28/13 01:36:08 (9 years ago)
- Branches:
- master, Servo
- Children:
- 80e94e7
- Parents:
- 570ab65
- Location:
- android/src/info/puzzlebox/orbit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java
r570ab65 r1d46203 588 588 orientationSensor = gravSensors.get(i); 589 589 Log.v(TAG, "Tilt Control: Using Gravity Sensor (version 3+)"); 590 appendDebugConsole("Tilt Control: Using Gravity Sensor ");590 appendDebugConsole("Tilt Control: Using Gravity Sensor\n"); 591 591 break; 592 592 } … … 598 598 orientationSensor = gravSensors.get(i); 599 599 Log.v(TAG, "Tilt Control: Using Gravity Sensor"); 600 appendDebugConsole("Tilt Control: Using Gravity Sensor ");600 appendDebugConsole("Tilt Control: Using Gravity Sensor\n"); 601 601 break; 602 602 } … … 607 607 orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); 608 608 Log.v(TAG, "Tilt Control: Using Accelerometer Sensor"); 609 appendDebugConsole("Tilt Control: Using Linear Accelerometer Sensor ");609 appendDebugConsole("Tilt Control: Using Linear Accelerometer Sensor\n"); 610 610 } 611 611 … … 616 616 orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); 617 617 Log.v(TAG, "Tilt Control: Using Accelerometer Sensor"); 618 appendDebugConsole("Tilt Control: Using Accelerometer Sensor ");618 appendDebugConsole("Tilt Control: Using Accelerometer Sensor\n"); 619 619 } 620 620 … … 624 624 if (orientationSensor == null) { 625 625 Toast.makeText(((OrbitTabActivity)getActivity()), "No Tilt Sensor Found", Toast.LENGTH_SHORT).show(); 626 appendDebugConsole("Tilt Control: Not Found ");626 appendDebugConsole("Tilt Control: Not Found\n"); 627 627 checkBoxTiltSensorControl.setChecked(false); 628 628 sensorManager.unregisterListener(this); -
android/src/info/puzzlebox/orbit/OrbitTabActivity.java
r570ab65 r1d46203 140 140 * Flight status 141 141 */ 142 String currentCommand = "neutral"; 142 // String currentCommand = "neutral"; 143 boolean flightActive = false; 143 144 144 145 … … 775 776 776 777 /** Start playback of audio control stream */ 777 if (currentCommand == "neutral") { 778 // if (currentCommand == "neutral") { 779 if (flightActive == false) { 778 780 playControl(); 779 781 } … … 782 784 783 785 // command = "hover"; 784 currentCommand = "hover"; 786 // currentCommand = "hover"; 787 flightActive = true; 785 788 786 789 } else { … … 795 798 796 799 if (DEBUG) { 797 Log.v(TAG, "Command: " + currentCommand);798 // appendDebugConsole("Command: " + command + "\n");800 // Log.v(TAG, "Command: " + currentCommand); 801 Log.v(TAG, "flightActive: " + flightActive); 799 802 } 800 803 … … 885 888 886 889 if ((generateAudio) && 887 ( currentCommand != "neutral") &&890 (flightActive) && 888 891 (fragmentAdvanced != null) && 889 892 (fragmentAdvanced.checkBoxControlledDescent.isChecked()) && … … 895 898 } 896 899 897 currentCommand = "hover"; 900 // currentCommand = "neutral"; 901 flightActive = false; 898 902 899 903 … … 942 946 943 947 demoFlightMode = true; 944 currentCommand = "hover"; 948 // currentCommand = "hover"; 949 flightActive = true; 945 950 946 951 FragmentTabAdvanced fragmentAdvanced =
Note: See TracChangeset
for help on using the changeset viewer.