Changeset ca52be2 in orbit
- Timestamp:
- 12/22/13 07:38:41 (8 years ago)
- Branches:
- master, Servo
- Children:
- 3baad6d
- Parents:
- bdaa595
- Location:
- android
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/res/layout/fragment_advanced.xml
re089694 rca52be2 32 32 android:text="@string/textview_yaw" /> 33 33 34 <SeekBar 35 android:id="@+id/seekBarYaw" 36 android:layout_width="match_parent" 37 android:layout_height="wrap_content" 38 android:max="127" 39 android:progress="78" /> 40 41 <!-- 34 42 <SeekBar 35 43 android:id="@+id/seekBarYaw" … … 37 45 android:layout_height="wrap_content" 38 46 android:max="127" 39 android:progress="78" /> 47 android:progress="49" /> 48 --> 40 49 41 50 <TextView … … 236 245 android:layout_height="wrap_content" 237 246 android:text="@string/checkbox_tilt_sensor_control_throttle" /> 238 239 247 </LinearLayout> 240 248 -
android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java
r680b5d9 rca52be2 46 46 int defaultControlThrottle = 80; 47 47 int defaultControlYaw = 78; 48 // int defaultControlYaw = 49; 48 49 int defaultControlPitch = 31; 49 50 50 51 int hoverControlThrottle = 80; 51 52 int hoverControlYaw = 78; 53 // int hoverControlYaw = 49; 52 54 int hoverControlPitch = 31; 53 55 54 56 int forwardControlThrottle = 80; 55 57 int forwardControlYaw = 78; 58 // int forwardControlYaw = 49; 56 59 int forwardControlPitch = 50; 57 60 58 61 int leftControlThrottle = 80; 59 62 int leftControlYaw = 42; 63 // int leftControlYaw = 85; 60 64 int leftControlPitch = 31; 61 65 62 66 int rightControlThrottle = 80; 63 67 int rightControlYaw = 114; 68 // int rightControlYaw = 13; 64 69 int rightControlPitch = 31; 65 70 … … 569 574 570 575 public void checkBoxTiltSensorControlThrottleClicked(View v) { 571 576 572 577 referenceTiltX = 0; 573 578 referenceTiltY = 0; 574 579 575 580 } // checkBoxTiltSensorControlThrottleClicked 576 581 577 582 578 583 // ################################################################ … … 654 659 public void updateControlSignal() { 655 660 661 // Integer[] command = { 662 // seekBarThrottle.getProgress(), 663 // seekBarYaw.getProgress(), 664 // seekBarPitch.getProgress(), 665 // 1}; 666 667 // We subtract the current Yaw position from the maximum slider value 668 // because smaller values instruct the helicopter to spin to the right 669 // (clockwise if looking down from above) whereas intuitively moving 670 // the slider to the left should cause it to spin left 656 671 Integer[] command = { 657 672 seekBarThrottle.getProgress(), 658 seekBarYaw.get Progress(),673 seekBarYaw.getMax() - seekBarYaw.getProgress(), 659 674 seekBarPitch.getProgress(), 660 675 1}; 676 661 677 662 678 // serviceBinder.command = command;
Note: See TracChangeset
for help on using the changeset viewer.