Changeset ca52be2 in orbit

Timestamp:

12/22/13 07:38:41 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

3baad6d

Parents:

bdaa595

Message:

• fix to for moving slider left to cause helicopter to spin left instead of right

Location:

android

Files:

• res/layout/fragment_advanced.xml (modified) (3 diffs)
• src/info/puzzlebox/orbit/FragmentTabAdvanced.java (modified) (3 diffs)

android/res/layout/fragment_advanced.xml

@@ -32 +32 @@
             android:text="@string/textview_yaw" />
 
+             <SeekBar
+            android:id="@+id/seekBarYaw"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:max="127"
+            android:progress="78" />
+
+        <!--
         <SeekBar
             android:id="@+id/seekBarYaw"
@@ -37 +45 @@
             android:layout_height="wrap_content"
             android:max="127"
-            android:progress="78" />
+            android:progress="49" />
+        -->
 
         <TextView
@@ -236 +245 @@
             android:layout_height="wrap_content"
             android:text="@string/checkbox_tilt_sensor_control_throttle" />
-
     </LinearLayout>
 

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

@@ -46 +46 @@
         int defaultControlThrottle = 80;
         int defaultControlYaw = 78;
+        //      int defaultControlYaw = 49;
         int defaultControlPitch = 31;
 
         int hoverControlThrottle = 80;
         int hoverControlYaw = 78;
+        //      int hoverControlYaw = 49;
         int hoverControlPitch = 31;
 
         int forwardControlThrottle = 80;
         int forwardControlYaw = 78;
+        //      int forwardControlYaw = 49;
         int forwardControlPitch = 50;
 
         int leftControlThrottle = 80;
         int leftControlYaw = 42;
+        //      int leftControlYaw = 85;
         int leftControlPitch = 31;
 
         int rightControlThrottle = 80;
         int rightControlYaw = 114;
+        //      int rightControlYaw = 13;
         int rightControlPitch = 31;
 
@@ -569 +574 @@
 
         public void checkBoxTiltSensorControlThrottleClicked(View v) {
-                
+
                 referenceTiltX = 0;
                 referenceTiltY = 0;
-                
+
         } // checkBoxTiltSensorControlThrottleClicked
-        
+
 
         // ################################################################
@@ -654 +659 @@
         public void updateControlSignal() {
 
+                //              Integer[] command =  {
+                //                              seekBarThrottle.getProgress(),
+                //                              seekBarYaw.getProgress(),
+                //                              seekBarPitch.getProgress(),
+                //                              1};
+
+                // We subtract the current Yaw position from the maximum slider value
+                // because smaller values instruct the helicopter to spin to the right
+                // (clockwise if looking down from above) whereas intuitively moving
+                // the slider to the left should cause it to spin left
                 Integer[] command =  {
                                 seekBarThrottle.getProgress(),
-                                seekBarYaw.getProgress(),
+                                seekBarYaw.getMax() - seekBarYaw.getProgress(),
                                 seekBarPitch.getProgress(),
                                 1};
+
 
                 //              serviceBinder.command = command;