Browse Source

Merge branch 'v10release' of git://github.com/pixhawk/qgroundcontrol into v10release

QGC4.4
pixhawk 14 years ago
parent
commit
a19cb4f722
  1. 0
      files/flightgear/Aircraft/Malolo1/.#Malolo1-set.xml.1.1
  2. 0
      files/flightgear/Aircraft/Malolo1/COPYING
  3. 0
      files/flightgear/Aircraft/Malolo1/Engines/18x8.xml
  4. 0
      files/flightgear/Aircraft/Malolo1/Engines/Zenoah_G-26A.xml
  5. 0
      files/flightgear/Aircraft/Malolo1/Malolo1-set.xml
  6. 0
      files/flightgear/Aircraft/Malolo1/Malolo1-splash.rgb
  7. 0
      files/flightgear/Aircraft/Malolo1/Malolo1.xml
  8. 0
      files/flightgear/Aircraft/Malolo1/Models/DSC01758.rgb
  9. 0
      files/flightgear/Aircraft/Malolo1/Models/Malolo1.ac
  10. 0
      files/flightgear/Aircraft/Malolo1/Models/Malolo1.xml
  11. 0
      files/flightgear/Aircraft/Malolo1/thumbnail.jpg
  12. 0
      files/flightgear/Aircraft/Rascal110/Dialogs/config.xml
  13. 0
      files/flightgear/Aircraft/Rascal110/Engines/18x8.xml
  14. 0
      files/flightgear/Aircraft/Rascal110/Engines/Zenoah_G-26A.xml
  15. 0
      files/flightgear/Aircraft/Rascal110/Models/Rascal.rgb
  16. 0
      files/flightgear/Aircraft/Rascal110/Models/Rascal110-000-013.ac
  17. 0
      files/flightgear/Aircraft/Rascal110/Models/Rascal110-000-013.ac.before-color-change
  18. 0
      files/flightgear/Aircraft/Rascal110/Models/Rascal110.xml
  19. 0
      files/flightgear/Aircraft/Rascal110/Models/Trajectory-Marker.ac
  20. 0
      files/flightgear/Aircraft/Rascal110/Models/Trajectory-Marker.xml
  21. 0
      files/flightgear/Aircraft/Rascal110/Models/fix.sh
  22. 0
      files/flightgear/Aircraft/Rascal110/Models/smoke.png
  23. 0
      files/flightgear/Aircraft/Rascal110/Models/smokeW.xml
  24. 0
      files/flightgear/Aircraft/Rascal110/README.Rascal
  25. 0
      files/flightgear/Aircraft/Rascal110/Rascal-keyboard.xml
  26. 0
      files/flightgear/Aircraft/Rascal110/Rascal-submodels.xml
  27. 0
      files/flightgear/Aircraft/Rascal110/Rascal110-JSBSim-set.xml
  28. 0
      files/flightgear/Aircraft/Rascal110/Rascal110-JSBSim.xml
  29. 0
      files/flightgear/Aircraft/Rascal110/Rascal110-YASim-set.xml
  30. 0
      files/flightgear/Aircraft/Rascal110/Rascal110-YASim.xml
  31. 0
      files/flightgear/Aircraft/Rascal110/Rascal110-splash.rgb
  32. 0
      files/flightgear/Aircraft/Rascal110/Systems/.#110-autopilot.xml.1.2
  33. 0
      files/flightgear/Aircraft/Rascal110/Systems/110-autopilot.xml
  34. 0
      files/flightgear/Aircraft/Rascal110/Systems/110-autopilot.xml-a
  35. 0
      files/flightgear/Aircraft/Rascal110/Systems/airdata.nas
  36. 0
      files/flightgear/Aircraft/Rascal110/Systems/electrical.xml
  37. 0
      files/flightgear/Aircraft/Rascal110/Systems/main.nas
  38. 0
      files/flightgear/Aircraft/Rascal110/Systems/ugear.nas
  39. 0
      files/flightgear/Aircraft/Rascal110/initfile.xml
  40. 0
      files/flightgear/Aircraft/Rascal110/thumbnail.jpg
  41. 0
      files/flightgear/Aircraft/YardStick/Engines/18x8.xml
  42. 0
      files/flightgear/Aircraft/YardStick/Engines/Zenoah_G-26A.xml
  43. 0
      files/flightgear/Aircraft/YardStick/Models/yardstik.ac
  44. 0
      files/flightgear/Aircraft/YardStick/Models/yardstik.xml
  45. 0
      files/flightgear/Aircraft/YardStick/YardStik-set.xml
  46. 0
      files/flightgear/Aircraft/YardStick/YardStik-splash.rgb
  47. 0
      files/flightgear/Aircraft/YardStick/YardStik.xml
  48. 0
      files/flightgear/Aircraft/YardStick/thumbnail.jpg
  49. 4
      files/flightgear/Aircraft/arducopter/Engines/a2830-12.xml
  50. 76
      files/flightgear/Aircraft/arducopter/Engines/prop10x4.5.xml
  51. 15492
      files/flightgear/Aircraft/arducopter/Models/arducopter.ac
  52. 88
      files/flightgear/Aircraft/arducopter/Models/arducopter.xml
  53. BIN
      files/flightgear/Aircraft/arducopter/Models/quad.3ds
  54. BIN
      files/flightgear/Aircraft/arducopter/Models/quad.skp
  55. 93
      files/flightgear/Aircraft/arducopter/arducopter-set.xml
  56. BIN
      files/flightgear/Aircraft/arducopter/arducopter.jpg
  57. 248
      files/flightgear/Aircraft/arducopter/arducopter.xml
  58. 9239
      files/flightgear/Aircraft/arducopter/data/arducopter_half_step.txt
  59. 11813
      files/flightgear/Aircraft/arducopter/data/arducopter_step.txt
  60. 2
      files/flightgear/Aircraft/arducopter/formatXml.sh
  61. 12
      files/flightgear/Aircraft/arducopter/initfile.xml
  62. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/airborn.xml
  63. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/army-g.xml
  64. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/hippie.xml
  65. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1.png
  66. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1a.png
  67. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1b.png
  68. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1c.png
  69. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1d.png
  70. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/navy.xml
  71. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/raf.xml
  72. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/softroof-a.png
  73. 0
      files/flightgear/Aircraft/jeep/Models/AI-Liveries/softroof.png
  74. 0
      files/flightgear/Aircraft/jeep/Models/GPA.xml
  75. 0
      files/flightgear/Aircraft/jeep/Models/Jeep.xml
  76. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/airborn.xml
  77. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/army-g.xml
  78. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/hippie.xml
  79. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1a.png
  80. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1b.png
  81. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1c.png
  82. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1d.png
  83. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/navy.xml
  84. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/raf.xml
  85. 0
      files/flightgear/Aircraft/jeep/Models/Liveries/softroof-a.png
  86. 0
      files/flightgear/Aircraft/jeep/Models/cabin.png
  87. 0
      files/flightgear/Aircraft/jeep/Models/current.ac
  88. 0
      files/flightgear/Aircraft/jeep/Models/current.rgb
  89. 0
      files/flightgear/Aircraft/jeep/Models/current.xml
  90. 0
      files/flightgear/Aircraft/jeep/Models/fuel.ac
  91. 0
      files/flightgear/Aircraft/jeep/Models/fuel.rgb
  92. 0
      files/flightgear/Aircraft/jeep/Models/fuelgauge.xml
  93. 0
      files/flightgear/Aircraft/jeep/Models/gpa.ac
  94. 0
      files/flightgear/Aircraft/jeep/Models/gpatrans.ac
  95. 0
      files/flightgear/Aircraft/jeep/Models/gpatrans.xml
  96. 0
      files/flightgear/Aircraft/jeep/Models/jeep-1.png
  97. 0
      files/flightgear/Aircraft/jeep/Models/jeep-2.png
  98. 0
      files/flightgear/Aircraft/jeep/Models/jeep.ac
  99. 0
      files/flightgear/Aircraft/jeep/Models/pilot-b.ac
  100. 0
      files/flightgear/Aircraft/jeep/Models/pilot.xml
  101. Some files were not shown because too many files have changed in this diff Show More

0
files/flightgear/Malolo1/.#Malolo1-set.xml.1.1 → files/flightgear/Aircraft/Malolo1/.#Malolo1-set.xml.1.1

0
files/flightgear/Malolo1/COPYING → files/flightgear/Aircraft/Malolo1/COPYING

0
files/flightgear/YardStick/Engines/18x8.xml → files/flightgear/Aircraft/Malolo1/Engines/18x8.xml

0
files/flightgear/YardStick/Engines/Zenoah_G-26A.xml → files/flightgear/Aircraft/Malolo1/Engines/Zenoah_G-26A.xml

0
files/flightgear/Malolo1/Malolo1-set.xml → files/flightgear/Aircraft/Malolo1/Malolo1-set.xml

0
files/flightgear/Malolo1/Malolo1-splash.rgb → files/flightgear/Aircraft/Malolo1/Malolo1-splash.rgb

0
files/flightgear/Malolo1/Malolo1.xml → files/flightgear/Aircraft/Malolo1/Malolo1.xml

0
files/flightgear/Malolo1/Models/DSC01758.rgb → files/flightgear/Aircraft/Malolo1/Models/DSC01758.rgb

0
files/flightgear/Malolo1/Models/Malolo1.ac → files/flightgear/Aircraft/Malolo1/Models/Malolo1.ac

0
files/flightgear/Malolo1/Models/Malolo1.xml → files/flightgear/Aircraft/Malolo1/Models/Malolo1.xml

0
files/flightgear/Malolo1/thumbnail.jpg → files/flightgear/Aircraft/Malolo1/thumbnail.jpg

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

0
files/flightgear/Rascal110/Dialogs/config.xml → files/flightgear/Aircraft/Rascal110/Dialogs/config.xml

0
files/flightgear/Rascal110/Engines/18x8.xml → files/flightgear/Aircraft/Rascal110/Engines/18x8.xml

0
files/flightgear/Rascal110/Engines/Zenoah_G-26A.xml → files/flightgear/Aircraft/Rascal110/Engines/Zenoah_G-26A.xml

0
files/flightgear/Rascal110/Models/Rascal.rgb → files/flightgear/Aircraft/Rascal110/Models/Rascal.rgb

0
files/flightgear/Rascal110/Models/Rascal110-000-013.ac → files/flightgear/Aircraft/Rascal110/Models/Rascal110-000-013.ac

0
files/flightgear/Rascal110/Models/Rascal110-000-013.ac.before-color-change → files/flightgear/Aircraft/Rascal110/Models/Rascal110-000-013.ac.before-color-change

0
files/flightgear/Rascal110/Models/Rascal110.xml → files/flightgear/Aircraft/Rascal110/Models/Rascal110.xml

0
files/flightgear/Rascal110/Models/Trajectory-Marker.ac → files/flightgear/Aircraft/Rascal110/Models/Trajectory-Marker.ac

0
files/flightgear/Rascal110/Models/Trajectory-Marker.xml → files/flightgear/Aircraft/Rascal110/Models/Trajectory-Marker.xml

0
files/flightgear/Rascal110/Models/fix.sh → files/flightgear/Aircraft/Rascal110/Models/fix.sh

0
files/flightgear/Rascal110/Models/smoke.png → files/flightgear/Aircraft/Rascal110/Models/smoke.png

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
files/flightgear/Rascal110/Models/smokeW.xml → files/flightgear/Aircraft/Rascal110/Models/smokeW.xml

0
files/flightgear/Rascal110/README.Rascal → files/flightgear/Aircraft/Rascal110/README.Rascal

0
files/flightgear/Rascal110/Rascal-keyboard.xml → files/flightgear/Aircraft/Rascal110/Rascal-keyboard.xml

0
files/flightgear/Rascal110/Rascal-submodels.xml → files/flightgear/Aircraft/Rascal110/Rascal-submodels.xml

0
files/flightgear/Rascal110/Rascal110-JSBSim-set.xml → files/flightgear/Aircraft/Rascal110/Rascal110-JSBSim-set.xml

0
files/flightgear/Rascal110/Rascal110-JSBSim.xml → files/flightgear/Aircraft/Rascal110/Rascal110-JSBSim.xml

0
files/flightgear/Rascal110/Rascal110-YASim-set.xml → files/flightgear/Aircraft/Rascal110/Rascal110-YASim-set.xml

0
files/flightgear/Rascal110/Rascal110-YASim.xml → files/flightgear/Aircraft/Rascal110/Rascal110-YASim.xml

0
files/flightgear/Rascal110/Rascal110-splash.rgb → files/flightgear/Aircraft/Rascal110/Rascal110-splash.rgb

0
files/flightgear/Rascal110/Systems/.#110-autopilot.xml.1.2 → files/flightgear/Aircraft/Rascal110/Systems/.#110-autopilot.xml.1.2

0
files/flightgear/Rascal110/Systems/110-autopilot.xml → files/flightgear/Aircraft/Rascal110/Systems/110-autopilot.xml

0
files/flightgear/Rascal110/Systems/110-autopilot.xml-a → files/flightgear/Aircraft/Rascal110/Systems/110-autopilot.xml-a

0
files/flightgear/Rascal110/Systems/airdata.nas → files/flightgear/Aircraft/Rascal110/Systems/airdata.nas

0
files/flightgear/Rascal110/Systems/electrical.xml → files/flightgear/Aircraft/Rascal110/Systems/electrical.xml

0
files/flightgear/Rascal110/Systems/main.nas → files/flightgear/Aircraft/Rascal110/Systems/main.nas

0
files/flightgear/Rascal110/Systems/ugear.nas → files/flightgear/Aircraft/Rascal110/Systems/ugear.nas

0
files/flightgear/Rascal110/initfile.xml → files/flightgear/Aircraft/Rascal110/initfile.xml

0
files/flightgear/YardStick/thumbnail.jpg → files/flightgear/Aircraft/Rascal110/thumbnail.jpg

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
files/flightgear/Malolo1/Engines/18x8.xml → files/flightgear/Aircraft/YardStick/Engines/18x8.xml

0
files/flightgear/Malolo1/Engines/Zenoah_G-26A.xml → files/flightgear/Aircraft/YardStick/Engines/Zenoah_G-26A.xml

0
files/flightgear/YardStick/Models/yardstik.ac → files/flightgear/Aircraft/YardStick/Models/yardstik.ac

0
files/flightgear/YardStick/Models/yardstik.xml → files/flightgear/Aircraft/YardStick/Models/yardstik.xml

0
files/flightgear/YardStick/YardStik-set.xml → files/flightgear/Aircraft/YardStick/YardStik-set.xml

0
files/flightgear/YardStick/YardStik-splash.rgb → files/flightgear/Aircraft/YardStick/YardStik-splash.rgb

0
files/flightgear/YardStick/YardStik.xml → files/flightgear/Aircraft/YardStick/YardStik.xml

0
files/flightgear/Rascal110/thumbnail.jpg → files/flightgear/Aircraft/YardStick/thumbnail.jpg

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

4
files/flightgear/Aircraft/arducopter/Engines/a2830-12.xml

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
<?xml version="1.0"?>
<electric_engine name="a2830-12">
<power unit="WATTS"> 187 </power>
</electric_engine>

76
files/flightgear/Aircraft/arducopter/Engines/prop10x4.5.xml

@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@
<?xml version="1.0"?>
<!-- Generated by Aero-Matic v 1.1
Inputs:
horsepower: 0.250767
pitch: fixed
max engine rpm: 9435
prop diameter (ft): 0.83333333333333
Outputs:
max prop rpm: 22515.60
gear ratio: 0.42
Cp0: 0.002731
Ct0: 0.003823
static thrust (lbs): 0.66
-->
<propeller name="prop">
<!--<ixx> 0.00 </ixx>-->
<ixx> 0.000041666666 </ixx>
<!--assuming solid rod of mass 8 g-->
<diameter unit="IN"> 10.0 </diameter>
<numblades> 2 </numblades>
<gearratio> 1.0 </gearratio>
<p_factor> 0.79 </p_factor>
<table name="C_THRUST" type="internal">
<tableData><!--experimentally measured-->
0.0 0.0054513
1.4 0.0054513
<!--aeromatic generated-->
<!--0.0 0.0042-->
<!--0.1 0.0040-->
<!--0.2 0.0038-->
<!--0.3 0.0035-->
<!--0.4 0.0032-->
<!--0.5 0.0028-->
<!--0.6 0.0023-->
<!--0.7 0.0017-->
<!--0.8 0.0009-->
<!--1.0 -0.0003-->
<!--1.2 -0.0016-->
<!--1.4 -0.0030-->
</tableData>
</table>
<table name="C_POWER" type="internal">
<tableData>
0.0 0.0028
0.1 0.0028
0.2 0.0027
0.3 0.0027
0.4 0.0025
0.5 0.0023
0.6 0.0021
0.7 0.0018
0.8 0.0015
1.0 0.0005
1.2 -0.0008
1.4 -0.0025
1.6 -0.0042
</tableData>
</table>
<!-- thrust effects of helical tip Mach -->
<table name="CT_MACH" type="internal">
<tableData>
0.85 1.0
1.05 0.8
</tableData>
</table>
<!-- power-required effects of helical tip Mach -->
<table name="CP_MACH" type="internal">
<tableData>
0.85 1.0
1.05 1.8
2.00 1.4
</tableData>
</table>
</propeller>

15492
files/flightgear/Aircraft/arducopter/Models/arducopter.ac

File diff suppressed because it is too large Load Diff

88
files/flightgear/Aircraft/arducopter/Models/arducopter.xml

@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
<?xml version="1.0"?>
<PropertyList>
<!--Airframe-->
<path>arducopter.ac</path>
<offsets>
<z-m>0.0</z-m>
<y-m>0</y-m>
<x-m>0.0</x-m>
<pitch-deg>0</pitch-deg>
<heading-deg>180</heading-deg>
</offsets>
<!--Propeller Right-->
<animation>
<type>noshadow</type>
<object-name>propeller0</object-name>
</animation>
<animation>
<type>spin</type>
<object-name>propeller0</object-name>
<property>/controls/engines/engine[0]/throttle</property>
<factor>12000</factor>
<axis>
<x1-m>0.000</x1-m>
<y1-m>-0.288</y1-m>
<z1-m>0.046</z1-m>
<x2-m>0.000</x2-m>
<y2-m>-0.288</y2-m>
<z2-m>0.012</z2-m>
</axis>
</animation>
<!--Propeller Left-->
<animation>
<type>noshadow</type>
<object-name>propeller1</object-name>
</animation>
<animation>
<type>spin</type>
<object-name>propeller1</object-name>
<property>/controls/engines/engine[1]/throttle</property>
<factor>12000</factor>
<axis>
<x1-m>0.000</x1-m>
<y1-m>0.288</y1-m>
<z1-m>0.046</z1-m>
<x2-m>0.000</x2-m>
<y2-m>0.288</y2-m>
<z2-m>0.012</z2-m>
</axis>
</animation>
<!--Propeller Front-->
<animation>
<type>noshadow</type>
<object-name>propeller2</object-name>
</animation>
<animation>
<type>spin</type>
<object-name>propeller2</object-name>
<property>/controls/engines/engine[2]/throttle</property>
<factor>12000</factor>
<axis>
<x1-m>0.288</x1-m>
<y1-m>0.000</y1-m>
<z1-m>0.046</z1-m>
<x2-m>0.288</x2-m>
<y2-m>0.000</y2-m>
<z2-m>0.012</z2-m>
</axis>
</animation>
<!--Propeller Back-->
<animation>
<type>noshadow</type>
<object-name>propeller3</object-name>
</animation>
<animation>
<type>spin</type>
<object-name>propeller3</object-name>
<property>/controls/engines/engine[3]/throttle</property>
<factor>12000</factor>
<axis>
<x1-m>-0.288</x1-m>
<y1-m>0.000</y1-m>
<z1-m>0.046</z1-m>
<x2-m>-0.288</x2-m>
<y2-m>0.000</y2-m>
<z2-m>0.012</z2-m>
</axis>
</animation>
</PropertyList>

BIN
files/flightgear/Aircraft/arducopter/Models/quad.3ds

Binary file not shown.

BIN
files/flightgear/Aircraft/arducopter/Models/quad.skp

Binary file not shown.

93
files/flightgear/Aircraft/arducopter/arducopter-set.xml

@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
<?xml version="1.0"?>
<!--
************************************************************************
Arducotper UAV Model
************************************************************************
-->
<PropertyList>
<sim>
<description>Arducopter UAV (R/C)</description>
<author>James Goppert</author>
<aircraft-version>0.0</aircraft-version>
<status>experimental</status>
<flight-model>jsb</flight-model>
<aero>arducopter</aero>
<model-hz>50</model-hz>
<sound>
<path>Aircraft/Generic/generic-sound.xml</path>
</sound>
<panel>
<visibility archive="n">false</visibility>
</panel>
<model>
<path archive="y">Aircraft/arducopter/Models/arducopter.xml</path>
</model>
<view>
<internal archive="y">true</internal>
<config>
<x-offset-m archive="y">0.0</x-offset-m>
<y-offset-m archive="y">0.15</y-offset-m>
<z-offset-m archive="y">0.90</z-offset-m>
<pitch-offset-deg>0</pitch-offset-deg>
</config>
</view>
<chase-distance-m archive="y" type="double">-5.5</chase-distance-m>
<help>
<title>arducopter UAV</title>
<line>Cruise speed: ? mph</line>
<line>Never-exceed (Vne): ? mph</line>
<line>Best Glide (Vglide): ? mph</line>
<line>Maneuvering (Va): ? mph</line>
<line>Approach speed: ? mph</line>
<line>Stall speed (Vs): ? mph</line>
</help>
<startup>
<splash-title>Arducopter UAV DIY Drones/ OPENMAV</splash-title>
<splash-texture>Aircraft/arducopter/arducopter.jpg</splash-texture>
</startup>
</sim>
<controls>
<flight>
<aileron-trim>0.00</aileron-trim>
<!-- fixed -->
<elevator-trim>0.00</elevator-trim>
<!-- controllable -->
</flight>
</controls>
<consumables>
<fuel>
<tank n="0">
<level-gal_us>0</level-gal_us>
</tank>
</fuel>
</consumables>
<payload>
<weight>
<name type="string">Payload</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
<min-lb type="double">0.0</min-lb>
<max-lb type="double">1.0</max-lb>
</weight>
</payload>
<nasal>
<arducopter>
<script>
setlistener("/sim/signals/fdm-initialized", func {
var left = screen.display.new(20, 10);
left.add("/controls/engines/engine[0]/throttle");
left.add("/controls/engines/engine[1]/throttle");
left.add("/controls/engines/engine[2]/throttle");
left.add("/controls/engines/engine[3]/throttle");
var right = screen.display.new(-250, 20);
right.add("/position/altitude-agl-ft");
right.add("/orientation/roll-deg");
right.add("/orientation/pitch-deg");
right.add("/orientation/heading-deg");
right.add("/instrumentation/gps/indicated-ground-speed-kt");
});
</script>
</arducopter>
</nasal>
</PropertyList>
<!-- vim:sw=4:ts=4:expandtab -->

BIN
files/flightgear/Aircraft/arducopter/arducopter.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

248
files/flightgear/Aircraft/arducopter/arducopter.xml

@ -0,0 +1,248 @@ @@ -0,0 +1,248 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<fdm_config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="dflyer" version="2.0" release="ALPHA" xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<fileheader>
<author> James Goppert </author>
<filecreationdate> 2010-03-11 </filecreationdate>
<version>0.0 </version>
<description> Arducopter DIY Drones UAV. </description>
</fileheader>
<metrics>
<wingarea unit="M2"> 0.017</wingarea>
<wingspan unit="M"> 0.13 </wingspan>
<chord unit="FT"> 0.0 </chord>
<htailarea unit="FT2"> 0.0 </htailarea>
<htailarm unit="FT"> 0.0 </htailarm>
<vtailarea unit="FT2"> 0.0 </vtailarea>
<vtailarm unit="FT"> 0.0 </vtailarm>
<location name="AERORP" unit="IN">
<x> 0.00 </x>
<y> 0.00 </y>
<z> 0.00 </z>
</location>
<location name="EYEPOINT" unit="IN">
<x> 0.0 </x>
<y> 0.0 </y>
<z> 0.0 </z>
</location>
<location name="VRP" unit="IN">
<x>0</x>
<y>0</y>
<z>0</z>
</location>
</metrics>
<mass_balance>
<!--roughtly approximating this as a solid sphere with correct mass-->
<ixx unit="KG*M2"> 0.036 </ixx>
<iyy unit="KG*M2"> 0.036 </iyy>
<izz unit="KG*M2"> 0.036 </izz>
<emptywt unit="KG"> 1.0 </emptywt>
<location name="CG" unit="IN">
<x> 0.0 </x>
<y> 0.0 </y>
<z> 0.0 </z>
</location>
<pointmass name="Payload">
<weight unit="KG"> 0.0 </weight>
<location unit="IN">
<x> 0.0 </x>
<y> 0.0 </y>
<z> 0.0 </z>
</location>
</pointmass>
</mass_balance>
<ground_reactions>
<contact type="BOGEY" name="frontbase">
<location unit="M">
<x> -0.283 </x>
<y> 0.00 </y>
<z> -0.033</z>
</location>
<static_friction> 0.80 </static_friction>
<dynamic_friction> 0.50 </dynamic_friction>
<spring_coeff unit="N/M"> 800 </spring_coeff>
<damping_coeff unit="N/M2/SEC2" type="SQUARE"> 7 </damping_coeff>
<damping_coeff_rebound unit="N/M2/SEC2" type="SQUARE"> 300 </damping_coeff_rebound>
</contact>
<contact type="BOGEY" name="rearbase">
<location unit="M">
<x> 0.283 </x>
<y> 0.00 </y>
<z> -0.033</z>
</location>
<static_friction> 0.80 </static_friction>
<dynamic_friction> 0.50 </dynamic_friction>
<spring_coeff unit="N/M"> 800 </spring_coeff>
<damping_coeff unit="N/M2/SEC2" type="SQUARE"> 7 </damping_coeff>
<damping_coeff_rebound unit="N/M2/SEC2" type="SQUARE"> 300 </damping_coeff_rebound>
</contact>
<contact type="BOGEY" name="leftbase">
<location unit="M">
<x> 0.00 </x>
<y> 0.283 </y>
<z> -0.033</z>
</location>
<static_friction> 0.80 </static_friction>
<dynamic_friction> 0.50 </dynamic_friction>
<spring_coeff unit="N/M"> 800 </spring_coeff>
<damping_coeff unit="N/M2/SEC2" type="SQUARE"> 7 </damping_coeff>
<damping_coeff_rebound unit="N/M2/SEC2" type="SQUARE"> 300 </damping_coeff_rebound>
</contact>
<contact type="BOGEY" name="rightbase">
<location unit="M">
<x> 0.00 </x>
<y> -0.283 </y>
<z> -0.033</z>
</location>
<static_friction> 0.80 </static_friction>
<dynamic_friction> 0.50 </dynamic_friction>
<spring_coeff unit="N/M"> 800 </spring_coeff>
<damping_coeff unit="N/M2/SEC2" type="SQUARE"> 7 </damping_coeff>
<damping_coeff_rebound unit="N/M2/SEC2" type="SQUARE"> 300 </damping_coeff_rebound>
</contact>
</ground_reactions>
<!-- the front and rear motors spin clockwise, and the left and right motors spin counter-clockwise. -->
<propulsion>
<engine file="a2830-12" name="front">
<location unit="M">
<x> -0.283 </x>
<y> 0.00 </y>
<z> 0.00 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<feed>0</feed>
<thruster file="prop10x4.5">
<location unit="M">
<x> -0.283 </x>
<y> 0.00 </y>
<z> 0.125 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<sense> 1 </sense>
<p_factor> 10 </p_factor>
</thruster>
</engine>
<engine file="a2830-12" name="rear">
<location unit="M">
<x> 0.283 </x>
<y> 0.000 </y>
<z> 0.000 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<feed>0</feed>
<thruster file="prop10x4.5">
<location unit="M">
<x> 0.283 </x>
<y> 0.000 </y>
<z> 0.125 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<sense> 1 </sense>
<p_factor> 10 </p_factor>
</thruster>
</engine>
<engine file="a2830-12" name="left">
<location unit="M">
<x> 0.00 </x>
<y> 0.283 </y>
<z> 0.00 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<feed>0</feed>
<thruster file="prop10x4.5">
<location unit="M">
<x> 0.00 </x>
<y> 0.283 </y>
<z> 0.125 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<sense> -1 </sense>
<p_factor> 10 </p_factor>
</thruster>
</engine>
<engine file="a2830-12" name="right">
<location unit="M">
<x> 0.000 </x>
<y> -0.283 </y>
<z> 0.000 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<feed>0</feed>
<thruster file="prop10x4.5">
<location unit="M">
<x> 0.000 </x>
<y> -0.283 </y>
<z> 0.125 </z>
</location>
<orient unit="DEG">
<pitch> 90.00 </pitch>
<roll> 0.00 </roll>
<yaw> 0.00 </yaw>
</orient>
<sense> -1 </sense>
<p_factor> 10 </p_factor>
</thruster>
</engine>
<tank type="FUEL" number="0">
<location unit="M">
<x> 0.00 </x>
<y> 0.00 </y>
<z> -0.07 </z>
</location>
<!--have to have a fuel capacity, so setting it small-->
<capacity unit="KG"> 0.00000000001 </capacity>
<contents unit="KG"> 0.0 </contents>
</tank>
</propulsion>
<aerodynamics>
<axis name="LIFT">
</axis>
<axis name="DRAG">
<function name="aero/coefficient/CD0">
<description>Overall Drag</description>
<product>
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<value>1</value>
</product>
</function>
</axis>
<axis name="SIDE">
</axis>
<axis name="ROLL">
</axis>
<axis name="PITCH">
</axis>
<axis name="YAW">
</axis>
</aerodynamics>
</fdm_config>
<!-- vim:ts=2:sw=2:expandtab -->

9239
files/flightgear/Aircraft/arducopter/data/arducopter_half_step.txt

File diff suppressed because it is too large Load Diff

11813
files/flightgear/Aircraft/arducopter/data/arducopter_step.txt

File diff suppressed because it is too large Load Diff

2
files/flightgear/Aircraft/arducopter/formatXml.sh

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
#!/bin/bash
find . -name "*.xml" -exec xmllint -format {} -o {} \;

12
files/flightgear/Aircraft/arducopter/initfile.xml

@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
<?xml version="1.0"?>
<initialize name="reset00">
<ubody unit="M/SEC"> nan </ubody>
<vbody unit="M/SEC"> nan </vbody>
<wbody unit="M/SEC"> nan </wbody>
<phi unit="DEG"> nan </phi>
<theta unit="DEG"> -nan </theta>
<psi unit="DEG"> nan </psi>
<longitude unit="DEG"> nan </longitude>
<latitude unit="DEG"> nan </latitude>
<altitude unit="M"> nan </altitude>
</initialize>

0
files/flightgear/jeep/Models/AI-Liveries/airborn.xml → files/flightgear/Aircraft/jeep/Models/AI-Liveries/airborn.xml

0
files/flightgear/jeep/Models/AI-Liveries/army-g.xml → files/flightgear/Aircraft/jeep/Models/AI-Liveries/army-g.xml

0
files/flightgear/jeep/Models/AI-Liveries/hippie.xml → files/flightgear/Aircraft/jeep/Models/AI-Liveries/hippie.xml

0
files/flightgear/jeep/Models/AI-Liveries/jeep-1.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1.png

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

0
files/flightgear/jeep/Models/AI-Liveries/jeep-1a.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1a.png

Before

Width:  |  Height:  |  Size: 346 KiB

After

Width:  |  Height:  |  Size: 346 KiB

0
files/flightgear/jeep/Models/AI-Liveries/jeep-1b.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1b.png

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 246 KiB

0
files/flightgear/jeep/Models/AI-Liveries/jeep-1c.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1c.png

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 127 KiB

0
files/flightgear/jeep/Models/AI-Liveries/jeep-1d.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/jeep-1d.png

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

0
files/flightgear/jeep/Models/Liveries/navy.xml → files/flightgear/Aircraft/jeep/Models/AI-Liveries/navy.xml

0
files/flightgear/jeep/Models/Liveries/raf.xml → files/flightgear/Aircraft/jeep/Models/AI-Liveries/raf.xml

0
files/flightgear/jeep/Models/AI-Liveries/softroof-a.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/softroof-a.png

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

0
files/flightgear/jeep/Models/AI-Liveries/softroof.png → files/flightgear/Aircraft/jeep/Models/AI-Liveries/softroof.png

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
files/flightgear/jeep/Models/GPA.xml → files/flightgear/Aircraft/jeep/Models/GPA.xml

0
files/flightgear/jeep/Models/Jeep.xml → files/flightgear/Aircraft/jeep/Models/Jeep.xml

0
files/flightgear/jeep/Models/Liveries/airborn.xml → files/flightgear/Aircraft/jeep/Models/Liveries/airborn.xml

0
files/flightgear/jeep/Models/Liveries/army-g.xml → files/flightgear/Aircraft/jeep/Models/Liveries/army-g.xml

0
files/flightgear/jeep/Models/Liveries/hippie.xml → files/flightgear/Aircraft/jeep/Models/Liveries/hippie.xml

0
files/flightgear/jeep/Models/Liveries/jeep-1a.png → files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1a.png

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

0
files/flightgear/jeep/Models/Liveries/jeep-1b.png → files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1b.png

Before

Width:  |  Height:  |  Size: 868 KiB

After

Width:  |  Height:  |  Size: 868 KiB

0
files/flightgear/jeep/Models/Liveries/jeep-1c.png → files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1c.png

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

0
files/flightgear/jeep/Models/Liveries/jeep-1d.png → files/flightgear/Aircraft/jeep/Models/Liveries/jeep-1d.png

Before

Width:  |  Height:  |  Size: 866 KiB

After

Width:  |  Height:  |  Size: 866 KiB

0
files/flightgear/jeep/Models/AI-Liveries/navy.xml → files/flightgear/Aircraft/jeep/Models/Liveries/navy.xml

0
files/flightgear/jeep/Models/AI-Liveries/raf.xml → files/flightgear/Aircraft/jeep/Models/Liveries/raf.xml

0
files/flightgear/jeep/Models/Liveries/softroof-a.png → files/flightgear/Aircraft/jeep/Models/Liveries/softroof-a.png

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 182 KiB

0
files/flightgear/jeep/Models/cabin.png → files/flightgear/Aircraft/jeep/Models/cabin.png

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 231 KiB

0
files/flightgear/jeep/Models/current.ac → files/flightgear/Aircraft/jeep/Models/current.ac

0
files/flightgear/jeep/Models/current.rgb → files/flightgear/Aircraft/jeep/Models/current.rgb

0
files/flightgear/jeep/Models/current.xml → files/flightgear/Aircraft/jeep/Models/current.xml

0
files/flightgear/jeep/Models/fuel.ac → files/flightgear/Aircraft/jeep/Models/fuel.ac

0
files/flightgear/jeep/Models/fuel.rgb → files/flightgear/Aircraft/jeep/Models/fuel.rgb

0
files/flightgear/jeep/Models/fuelgauge.xml → files/flightgear/Aircraft/jeep/Models/fuelgauge.xml

0
files/flightgear/jeep/Models/gpa.ac → files/flightgear/Aircraft/jeep/Models/gpa.ac

0
files/flightgear/jeep/Models/gpatrans.ac → files/flightgear/Aircraft/jeep/Models/gpatrans.ac

0
files/flightgear/jeep/Models/gpatrans.xml → files/flightgear/Aircraft/jeep/Models/gpatrans.xml

0
files/flightgear/jeep/Models/jeep-1.png → files/flightgear/Aircraft/jeep/Models/jeep-1.png

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

0
files/flightgear/jeep/Models/jeep-2.png → files/flightgear/Aircraft/jeep/Models/jeep-2.png

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 330 KiB

0
files/flightgear/jeep/Models/jeep.ac → files/flightgear/Aircraft/jeep/Models/jeep.ac

0
files/flightgear/jeep/Models/pilot-b.ac → files/flightgear/Aircraft/jeep/Models/pilot-b.ac

0
files/flightgear/jeep/Models/pilot.xml → files/flightgear/Aircraft/jeep/Models/pilot.xml

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save