Merge branch 'master' into Lower-ECAM

This commit is contained in:
Joshua Davidson 2018-07-15 22:11:22 -04:00
commit 0275cc2f29
2 changed files with 4 additions and 4 deletions

View file

@ -60,7 +60,7 @@
<ice-inches>0.0</ice-inches>
<salvage-control>/controls/deice/windowprobeheat</salvage-control>
<sensitivity type="double">0.5</sensitivity>
<!-- not relevant for fdm, ignore output-property -->
<!-- not relevant for fdm, ignore output-property -->
</iceable>
<iceable>
<name>Fuselage</name>
@ -323,7 +323,7 @@
<float n="6" alias="/fdm/jsbsim/hydraulics/aileron-l/final-deg" />
<float n="7" alias="/fdm/jsbsim/hydraulics/aileron-r/final-deg" />
<float n="8" alias="/fdm/jsbsim/hydraulics/rudder/final-deg" />
<float n="9" alias="/fdm/jsbsim/fcs/pitch-trim-pos-deg" />
<float n="9" alias="/fdm/jsbsim/hydraulics/elevator-trim/final-deg" />
<float n="11" alias="/fdm/jsbsim/fcs/slat-pos-norm" />
<int n="2" alias="/controls/lighting/landing-lights[0]" />
<int n="3" alias="/controls/lighting/landing-lights[1]" />

View file

@ -1171,7 +1171,7 @@
<table>
<independentVar lookup="row">/velocities/airspeed-kt</independentVar>
<tableData>
62 0.5
62 1.0
116 0.0
</tableData>
</table>
@ -1183,7 +1183,7 @@
<table>
<independentVar lookup="row">/velocities/airspeed-kt</independentVar>
<tableData>
72 0.5
72 1.0
121 0.0
</tableData>
</table>