Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-25 14:34:09 -04:00
commit 1d3fba8f8d
3 changed files with 11 additions and 10 deletions

View file

@ -451,28 +451,28 @@
<payload> <payload>
<weight n="0"> <weight n="0">
<name>Cockpit Crew</name> <name>Crew</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/> <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
<min-lb type="double">200</min-lb> <min-lb type="double">280</min-lb>
<max-lb type="double">440</max-lb> <max-lb type="double">840</max-lb>
</weight> </weight>
<weight n="1"> <weight n="1">
<name>Passengers</name> <name>Passengers</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/> <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
<min-lb type="double">1500</min-lb> <min-lb type="double">0</min-lb>
<max-lb type="double">27000</max-lb> <max-lb type="double">24360</max-lb>
</weight> </weight>
<weight n="2"> <weight n="2">
<name>Forward Cargo</name> <name>Forward Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/> <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
<min-lb type="double">300</min-lb> <min-lb type="double">0</min-lb>
<max-lb type="double">8765</max-lb> <max-lb type="double">9400</max-lb>
</weight> </weight>
<weight n="3"> <weight n="3">
<name>Aft Cargo</name> <name>Aft Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/> <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
<min-lb type="double">300</min-lb> <min-lb type="double">0</min-lb>
<max-lb type="double">8765</max-lb> <max-lb type="double">9400</max-lb>
</weight> </weight>
</payload> </payload>

View file

@ -23,6 +23,7 @@
<z> 0.19249 </z> <z> 0.19249 </z>
</location> </location>
<!-- average human weight 145 lbs, max 44000 lb -->
<pointmass name="Crew"> <pointmass name="Crew">
<weight unit="LBS">380</weight> <weight unit="LBS">380</weight>
<location name="POINTMASS" unit="M"> <location name="POINTMASS" unit="M">

View file

@ -1 +1 @@
4685 4687