Changeset 71f66b0 in orbit


Ignore:
Timestamp:
12/27/13 05:15:53 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
3d25264
Parents:
ebf23f0
Message:
  • Tutorial updated with "Scores" chapter
  • various typos fixed in tutorial
Location:
android
Files:
4 added
2 deleted
8 edited
1 copied
6 moved

Legend:

Unmodified
Added
Removed
  • android/assets/tutorial/contents.html

    rf41f5d3 r71f66b0  
    7777               </td> 
    7878               <td colspan="2"> 
    79                   <a class='chapter left' href="step10-1.html">Steering</a> 
     79                  <a class='chapter left' href="step10.html">Scores</a> 
    8080               </td> 
    8181            </tr>     
     
    8383            <tr> 
    8484               <td colspan="2"> 
    85                   <a class='chapter right' href="step11-1.html">Advanced</a> 
     85                  <a class='chapter right' href="step11-1.html">Steering</a> 
    8686               </td> 
    8787               <td colspan="2"> 
    88                   <a class='chapter left' href="tips.html">Tips</a> 
     88                  <a class='chapter left' href="step12-1.html">Advanced</a> 
     89               </td> 
     90            </tr>    
     91 
     92            <tr> 
     93               <td colspan="2"> 
     94                  <a class='chapter right' href="tips.html">Tips</a> 
     95               </td> 
     96               <td colspan="2"> 
     97                  <a class='chapter left' href="faq.html">FAQ</a> 
    8998               </td> 
    9099            </tr>    
  • android/assets/tutorial/faq.html

    r0a60a15 r71f66b0  
    1919      </ul> 
    2020       
    21       <a class='prev button' href="step10.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
     21      <a class='prev button' href="tips.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2222      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    2323      <a class='next button' href="index.html">&nbsp;&nbsp; &crarr; &nbsp;&nbsp;</a> 
  • android/assets/tutorial/step09.html

    rf41f5d3 r71f66b0  
    2525      <a class='prev button' href="step08-5.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2626      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    27       <a class='next button' href="step10-1.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
     27      <a class='next button' href="step10.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
    2828       
    2929   </body> 
  • android/assets/tutorial/step11-1.html

    rf41f5d3 r71f66b0  
    99       
    1010      <center> 
    11          <h2>Advanced</h2> 
     11         <h2>Steering</h2> 
    1212      </center> 
    1313       
    1414      <center> 
    15          <img src="images/tutorial-11-advanced-control_signal.png" width="100%"> 
    16          <b class="label">Control Signal Setings</b> 
     15         <img src="images/tutorial-11-steering-throttle_yaw_pitch.png" width="100%"> 
     16         <b class="label">Fine-tune flight characteristics with these sliders</b> 
    1717      </center> 
    1818 
    1919      <ul> 
    20          <li><b>Generate Control Signal</b> This setting determines whether or not the Orbit's control signal is generated on the fly. It is necessary to enable this setting for all steering and several advanced capabilities.</li> 
    21          <li><b>Invert Control Signal</b> Android devices differ from one another on a hardware level. Certain models are known to use audio chipsets whose output requires adjustment in order to communicate with the Puzzlebox Orbit through the infrared dongle. Enabling this option should be the first thing to try if an Android device fails a "Test Flight".</li> 
     20         <li><b>Throttle</b> Controls how high the Orbit will fly when activated. As battery power drops this setting may need to be increased in order to maintain a consistent response.</li> 
     21         <li><b>Yaw</b> Controls the clockwise and counter-clockwise rotation of the Orbit.</li> 
     22         <li><b>Pitch</b> Controls the forward/backward motion of the Orbit helicopter. This is achieved by operating the small propeller at the top of the Orbit.</li> 
    2223      </ul> 
    2324       
    24       <a class='prev button' href="step10-3.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
     25      <a class='prev button' href="step10.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2526      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    2627      <a class='next button' href="step11-2.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
  • android/assets/tutorial/step11-2.html

    rf41f5d3 r71f66b0  
    99       
    1010      <center> 
    11          <h2>Advanced</h2> 
     11         <h2>Steering</h2> 
    1212      </center> 
    1313       
    1414      <center> 
    15          <img src="images/tutorial-11-advanced-controlled_descent.png" width="100%"> 
    16          <b class="label">Control descent for soft landings</b> 
     15         <img src="images/tutorial-11-steering-presets.png" width="100%"> 
     16         <b class="label">Preset sliders with example settings</b> 
    1717      </center> 
    1818 
    1919      <ul> 
    20          <li><b>Controlled Descent</b> By default, whenever the Orbit is instructed to land, the throttle is cut completely, causing the helicopter to fall to the ground. This "smooth landing" function will take into account the current throttle setting, and slowly drop it down to zero over a short period of time. This can be best tested using the "Test Fly" and "Land" buttons in succession.</li> 
     20         <li><b>Hover</b> This preset is designed for an average Orbit to hover in place when fully charged. Due to variations in manufacturing, it is normally necesary to fine-tune this setting using the Throttle slider. The Hover button will also reset the Throttle, Yaw, and Pitch sliders back to their defaults.</li> 
     21         <li><b>Forward</b> Fly forward while hovering</li> 
     22         <li><b>Left</b> Spin counter-clockwise while hovering</li> 
     23         <li><b>Right</b> Spin clockwise while hovering</li> 
    2124      </ul> 
    2225       
    2326      <a class='prev button' href="step11-1.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2427      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    25       <a class='next button' href="tips.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
     28      <a class='next button' href="step11-3.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
    2629       
    2730   </body> 
  • android/assets/tutorial/step11-3.html

    r641eb78 r71f66b0  
    1313       
    1414      <center> 
    15          <img src="images/tutorial-10-steering-tilt_sensor.png" width="100%"> 
     15         <img src="images/tutorial-11-steering-tilt_sensor.png" width="100%"> 
    1616         <b class="label">Steer the Orbit using your device's tilt sensors</b> 
    1717      </center> 
     
    2121         <li>As an alternative it is also possible to steer the Orbit while in flight by using tilt sensors found in many mobile devices.</li> 
    2222         <li>It is recommended to use focused concentration or meditation to achieve hovering, then steer using this feature</li> 
    23          <li><b>Tilt Sensor Control</b> Enable this setting to use your devices's gravity sensor, accelerometer, or compass to steer the Orbit helicopter while in flight. Tilting forward and backward will adjust Pitch, while tilting left and right will adjust Yaw.</li> 
    24          <li><b>Adjust Throttle Only</b> This setting will disable Pitch and Yaw control in favor of adjusting the Orbit's height while in flight.</li> 
    25          <li>If the Yaw and Pitch are moving wildly, simply unclick "Tilt Sensor Control" and choose a preset (such as the "Hover" button). Try placing the device on a flat surface before re-enabling Tilt Control</li> 
     23         <li><i>(continued...)</i></li> 
    2624      </ul> 
    2725       
    28       <a class='prev button' href="step10-2.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
     26      <a class='prev button' href="step11-2.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2927      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    30       <a class='next button' href="step11-1.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
     28      <a class='next button' href="step11-4.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
    3129       
    3230   </body> 
  • android/assets/tutorial/step11-4.html

    r641eb78 r71f66b0  
    1313       
    1414      <center> 
    15          <img src="images/tutorial-10-steering-tilt_sensor.png" width="100%"> 
     15         <img src="images/tutorial-11-steering-tilt_sensor.png" width="100%"> 
    1616         <b class="label">Steer the Orbit using your device's tilt sensors</b> 
    1717      </center> 
    1818 
    1919      <ul> 
    20          <li>While it is possible to steer an Orbit helicopter using brainwaves via EEG, this requires advanced hardware with multiple electrodes, whereas the NeuroSky MindWave Mobile only has a single channel</li> 
    21          <li>As an alternative it is also possible to steer the Orbit while in flight by using tilt sensors found in many mobile devices.</li> 
    22          <li>It is recommended to use focused concentration or meditation to achieve hovering, then steer using this feature</li> 
     20         <li><i>(...continued)</i></li> 
    2321         <li><b>Tilt Sensor Control</b> Enable this setting to use your devices's gravity sensor, accelerometer, or compass to steer the Orbit helicopter while in flight. Tilting forward and backward will adjust Pitch, while tilting left and right will adjust Yaw.</li> 
    2422         <li><b>Adjust Throttle Only</b> This setting will disable Pitch and Yaw control in favor of adjusting the Orbit's height while in flight.</li> 
     
    2624      </ul> 
    2725       
    28       <a class='prev button' href="step10-2.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
     26      <a class='prev button' href="step11-3.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    2927      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    30       <a class='next button' href="step11-1.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
     28      <a class='next button' href="step12-1.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
    3129       
    3230   </body> 
  • android/assets/tutorial/tips.html

    r641eb78 r71f66b0  
    2828      </ul> 
    2929            
    30       <a class='prev button' href="step11-2.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
     30      <a class='prev button' href="step12-2.html">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a> 
    3131      <a class='contents button' href="contents.html">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    3232      <a class='next button' href="faq.html">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
  • android/src/info/puzzlebox/orbit/FragmentTabFlightThinkGear.java

    rebf23f0 r71f66b0  
    99 
    1010import android.bluetooth.BluetoothAdapter; 
     11import android.content.pm.PackageManager.NameNotFoundException; 
    1112import android.content.res.Configuration; 
    1213import android.graphics.Color; 
     
    412413 
    413414 
    414                 ((OrbitTabActivity)getActivity()).appendDebugConsole(text); // perform by parent activity 
    415  
     415                try { 
     416                        ((OrbitTabActivity)getActivity()).appendDebugConsole(text); // perform by parent activity 
     417                } 
     418                catch (Exception e) { 
     419                        Log.v(TAG, e.getMessage()); 
     420                } 
    416421 
    417422        } // appendDebugConsole 
     
    10041009 
    10051010        public void updateScore() { 
    1006                  
     1011 
    10071012                /** 
    10081013                 * Score points based on target slider levels 
    1009                  * If you pass your goal with either Attention or Mediation 
     1014                 * If you pass your goal with either Attention or Meditation 
    10101015                 * the higher target of the two will counts as points per second. 
    10111016                 *  
  • android/src/info/puzzlebox/orbit/OrbitTabActivity.java

    rebf23f0 r71f66b0  
    604604        // ################################################################ 
    605605 
    606         //      protected void appendDebugConsole(String text) { 
    607606        public void appendDebugConsole(String text) { 
    608607 
Note: See TracChangeset for help on using the changeset viewer.