Merge branch 'master' into FMGC
This commit is contained in:
commit
bbb7555e94
4 changed files with 127 additions and 134 deletions
|
@ -186,7 +186,6 @@
|
|||
</menu>
|
||||
<menu n="101">
|
||||
<label>System</label>
|
||||
<enabled type="bool">true</enabled>
|
||||
<item>
|
||||
<label>Aircraft Config</label>
|
||||
<binding>
|
||||
|
@ -827,6 +826,21 @@
|
|||
</options>
|
||||
|
||||
<instrumentation n="0">
|
||||
<chrono n="0">
|
||||
<started type="bool">0</started>
|
||||
<paused type="bool">0</paused>
|
||||
<text type="string">0' 00'</text>
|
||||
<started-at type="int">0</started-at>
|
||||
<elapsed-time type="int">0</elapsed-time>
|
||||
</chrono>
|
||||
|
||||
<chrono n="1">
|
||||
<started type="bool">0</started>
|
||||
<paused type="bool">0</paused>
|
||||
<text type="string">0' 00'</text>
|
||||
<started-at type="int">0</started-at>
|
||||
<elapsed-time type="int">0</elapsed-time>
|
||||
</chrono>
|
||||
|
||||
<comm n="0">
|
||||
<frequencies>
|
||||
|
@ -896,6 +910,10 @@
|
|||
<volume type="double">0</volume>
|
||||
</dme>
|
||||
|
||||
<groundradar>
|
||||
<range type="double">1.0</range>
|
||||
</groundradar>
|
||||
|
||||
<nav n="0">
|
||||
<frequencies>
|
||||
<selected-mhz type="double">111.15</selected-mhz>
|
||||
|
@ -965,11 +983,7 @@
|
|||
<volume> 0.8 </volume> <!-- Volume at reference distance -->
|
||||
</speaker>
|
||||
</tcas>
|
||||
<nav-compass>
|
||||
<nav-display n="0" type="int">0</nav-display>
|
||||
<nav-display n="1" type="int">0</nav-display>
|
||||
</nav-compass>
|
||||
|
||||
|
||||
<!-- See http://wiki.flightgear.org/index.php/GPWS -->
|
||||
<mk-viii n="0">
|
||||
<serviceable type="bool">true</serviceable>
|
||||
|
@ -1001,27 +1015,6 @@
|
|||
<file-prefix>Aircraft/IDG-A32X/Sounds/GPWS/</file-prefix>
|
||||
</voice>
|
||||
</mk-viii>
|
||||
|
||||
<groundradar>
|
||||
<range type="double">1.0</range>
|
||||
</groundradar>
|
||||
|
||||
<chrono n="0">
|
||||
<started type="bool">0</started>
|
||||
<paused type="bool">0</paused>
|
||||
<text type="string">0' 00'</text>
|
||||
<started-at type="int">0</started-at>
|
||||
<elapsed-time type="int">0</elapsed-time>
|
||||
</chrono>
|
||||
|
||||
<chrono n="1">
|
||||
<started type="bool">0</started>
|
||||
<paused type="bool">0</paused>
|
||||
<text type="string">0' 00'</text>
|
||||
<started-at type="int">0</started-at>
|
||||
<elapsed-time type="int">0</elapsed-time>
|
||||
</chrono>
|
||||
|
||||
</instrumentation>
|
||||
|
||||
<modes>
|
||||
|
|
|
@ -78,8 +78,8 @@
|
|||
<independentVar lookup="column">fbw/roll/gain-switch</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
140 -26.2 0.0
|
||||
350 -9.5 0.0
|
||||
140 -20.0 0.0
|
||||
350 -5.0 0.0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -92,8 +92,8 @@
|
|||
<independentVar lookup="column">fbw/roll/gain-switch</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
140 -45.5 0.0
|
||||
350 -29.0 0.0
|
||||
140 -35.0 0.0
|
||||
350 -10.0 0.0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -106,8 +106,8 @@
|
|||
<independentVar lookup="column">fbw/roll/gain-switch</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
140 -2.1 0.0
|
||||
350 -0.2 0.0
|
||||
140 -2.5 0.0
|
||||
350 -0.5 0.0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -121,7 +121,7 @@
|
|||
<tableData>
|
||||
0 1
|
||||
140 28 0
|
||||
350 23 0
|
||||
350 20 0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -134,8 +134,8 @@
|
|||
<independentVar lookup="column">fbw/pitch/gain-switch</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
140 61 0
|
||||
350 45 0
|
||||
140 60 0
|
||||
350 40 0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -148,8 +148,8 @@
|
|||
<independentVar lookup="column">fbw/pitch/gain-switch</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
140 2.4 0.0
|
||||
350 0.6 0.0
|
||||
140 1.0 0.0
|
||||
350 0.4 0.0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
|
@ -1415,7 +1415,7 @@
|
|||
|
||||
<actuator name="hydraulics/aileron-l/final-actuator">
|
||||
<input>hydraulics/aileron-l/cmd-deg</input>
|
||||
<rate_limit>150</rate_limit>
|
||||
<rate_limit>82</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/aileron-l/final-deg</output>
|
||||
</actuator>
|
||||
|
@ -1491,7 +1491,7 @@
|
|||
|
||||
<actuator name="hydraulics/aileron-r/final-actuator">
|
||||
<input>hydraulics/aileron-r/cmd-deg</input>
|
||||
<rate_limit>150</rate_limit>
|
||||
<rate_limit>82</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/aileron-r/final-deg</output>
|
||||
</actuator>
|
||||
|
@ -1549,7 +1549,7 @@
|
|||
|
||||
<actuator name="hydraulics/elevator-l/final-actuator">
|
||||
<input>hydraulics/elevator-l/cmd-deg</input>
|
||||
<rate_limit>150</rate_limit>
|
||||
<rate_limit>82</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/elevator-l/final-deg</output>
|
||||
</actuator>
|
||||
|
@ -1588,7 +1588,7 @@
|
|||
|
||||
<actuator name="hydraulics/elevator-r/final-actuator">
|
||||
<input>hydraulics/elevator-r/cmd-deg</input>
|
||||
<rate_limit>150</rate_limit>
|
||||
<rate_limit>82</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/elevator-r/final-deg</output>
|
||||
</actuator>
|
||||
|
@ -1687,7 +1687,7 @@
|
|||
|
||||
<actuator name="hydraulics/rudder/final-actuator">
|
||||
<input>hydraulics/rudder/cmd-deg</input>
|
||||
<rate_limit>150</rate_limit>
|
||||
<rate_limit>80</rate_limit>
|
||||
<lag>25.5</lag>
|
||||
<output>hydraulics/rudder/final-deg</output>
|
||||
</actuator>
|
||||
|
|
|
@ -121,17 +121,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l1/final">
|
||||
<pure_gain name="hydraulics/spoiler-l1/cmd-deg">
|
||||
<input>hydraulics/spoiler-l1/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-l1/final-gain">
|
||||
<input>hydraulics/spoiler-l1/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-l1/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l1/final-actuator">
|
||||
<input>hydraulics/spoiler-l1/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-l1/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -220,17 +220,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l2/final">
|
||||
<pure_gain name="hydraulics/spoiler-l2/cmd-deg">
|
||||
<input>hydraulics/spoiler-l2/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-l2/final-gain">
|
||||
<input>hydraulics/spoiler-l2/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-l2/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l2/final-actuator">
|
||||
<input>hydraulics/spoiler-l2/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-l2/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -281,17 +281,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l3/final">
|
||||
<pure_gain name="hydraulics/spoiler-l3/cmd-deg">
|
||||
<input>hydraulics/spoiler-l3/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-l3/final-gain">
|
||||
<input>hydraulics/spoiler-l3/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-l3/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l3/final-actuator">
|
||||
<input>hydraulics/spoiler-l3/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-l3/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -342,17 +342,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l4/final">
|
||||
<pure_gain name="hydraulics/spoiler-l4/cmd-deg">
|
||||
<input>hydraulics/spoiler-l4/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-l4/final-gain">
|
||||
<input>hydraulics/spoiler-l4/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-l4/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l4/final-actuator">
|
||||
<input>hydraulics/spoiler-l4/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-l4/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -404,17 +404,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l5/final">
|
||||
<pure_gain name="hydraulics/spoiler-l5/cmd-deg">
|
||||
<input>hydraulics/spoiler-l5/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-l5/final-gain">
|
||||
<input>hydraulics/spoiler-l5/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-l5/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-l5/final-actuator">
|
||||
<input>hydraulics/spoiler-l5/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-l5/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -433,17 +433,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r1/final">
|
||||
<pure_gain name="hydraulics/spoiler-r1/cmd-deg">
|
||||
<input>hydraulics/spoiler-r1/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-r1/final-gain">
|
||||
<input>hydraulics/spoiler-r1/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-r1/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r1/final-actuator">
|
||||
<input>hydraulics/spoiler-r1/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-r1/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -532,17 +532,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r2/final">
|
||||
<pure_gain name="hydraulics/spoiler-r2/cmd-deg">
|
||||
<input>hydraulics/spoiler-r2/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-r2/final-gain">
|
||||
<input>hydraulics/spoiler-r2/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-r2/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r2/final-actuator">
|
||||
<input>hydraulics/spoiler-r2/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-r2/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -593,17 +593,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r3/final">
|
||||
<pure_gain name="hydraulics/spoiler-r3/cmd-deg">
|
||||
<input>hydraulics/spoiler-r3/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-r3/final-gain">
|
||||
<input>hydraulics/spoiler-r3/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-r3/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r3/final-actuator">
|
||||
<input>hydraulics/spoiler-r3/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-r3/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -654,17 +654,17 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r4/final">
|
||||
<pure_gain name="hydraulics/spoiler-r4/cmd-deg">
|
||||
<input>hydraulics/spoiler-r4/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-r4/final-gain">
|
||||
<input>hydraulics/spoiler-r4/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-r4/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r4/final-actuator">
|
||||
<input>hydraulics/spoiler-r4/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-r4/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
|
@ -716,28 +716,28 @@
|
|||
</clipto>
|
||||
</switch>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r5/final">
|
||||
<pure_gain name="hydraulics/spoiler-r5/cmd-deg">
|
||||
<input>hydraulics/spoiler-r5/switch</input>
|
||||
<rate_limit>1.1</rate_limit>
|
||||
<lag>16.3</lag>
|
||||
</actuator>
|
||||
|
||||
<pure_gain name="hydraulics/spoiler-r5/final-gain">
|
||||
<input>hydraulics/spoiler-r5/final</input>
|
||||
<gain>40.0</gain>
|
||||
<output>hydraulics/spoiler-r5/final-deg</output>
|
||||
</pure_gain>
|
||||
|
||||
<actuator name="hydraulics/spoiler-r5/final-actuator">
|
||||
<input>hydraulics/spoiler-r5/cmd-deg</input>
|
||||
<rate_limit>35</rate_limit>
|
||||
<lag>26.5</lag>
|
||||
<output>hydraulics/spoiler-r5/final-deg</output>
|
||||
</actuator>
|
||||
|
||||
</channel>
|
||||
|
||||
<channel name="Output">
|
||||
|
||||
<summer name="fcs/spoiler-left-sum">
|
||||
<input>hydraulics/spoiler-l1/final-gain</input>
|
||||
<input>hydraulics/spoiler-l2/final-gain</input>
|
||||
<input>hydraulics/spoiler-l3/final-gain</input>
|
||||
<input>hydraulics/spoiler-l4/final-gain</input>
|
||||
<input>hydraulics/spoiler-l5/final-gain</input>
|
||||
<input>hydraulics/spoiler-l1/final-actuator</input>
|
||||
<input>hydraulics/spoiler-l2/final-actuator</input>
|
||||
<input>hydraulics/spoiler-l3/final-actuator</input>
|
||||
<input>hydraulics/spoiler-l4/final-actuator</input>
|
||||
<input>hydraulics/spoiler-l5/final-actuator</input>
|
||||
</summer>
|
||||
|
||||
<fcs_function name="fcs/spoiler-left-deg">
|
||||
|
@ -750,11 +750,11 @@
|
|||
</fcs_function>
|
||||
|
||||
<summer name="fcs/spoiler-right-sum">
|
||||
<input>hydraulics/spoiler-r1/final-gain</input>
|
||||
<input>hydraulics/spoiler-r2/final-gain</input>
|
||||
<input>hydraulics/spoiler-r3/final-gain</input>
|
||||
<input>hydraulics/spoiler-r4/final-gain</input>
|
||||
<input>hydraulics/spoiler-r5/final-gain</input>
|
||||
<input>hydraulics/spoiler-r1/final-actuator</input>
|
||||
<input>hydraulics/spoiler-r2/final-actuator</input>
|
||||
<input>hydraulics/spoiler-r3/final-actuator</input>
|
||||
<input>hydraulics/spoiler-r4/final-actuator</input>
|
||||
<input>hydraulics/spoiler-r5/final-actuator</input>
|
||||
</summer>
|
||||
|
||||
<fcs_function name="fcs/spoiler-right-deg">
|
||||
|
|
|
@ -1 +1 @@
|
|||
4775
|
||||
4776
|
Reference in a new issue