fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into ECAM2

Browse source
This commit is contained in:
Joshua Davidson 2019-03-07 20:32:10 -05:00
commit be7bf73530
5 changed files with 196 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
A320-main.xml
View file

@ -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>

50
Systems/a320-fcs.xml
View file

@ -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>
@ -1413,10 +1413,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/aileron-l/final-deg">
<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>
</channel>
@ -1488,10 +1489,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/aileron-r/final-deg">
<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>
</channel>
@ -1545,10 +1547,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/elevator-l/final-deg">
<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>
</channel>
@ -1583,10 +1586,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/elevator-r/final-deg">
<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>
</channel>
@ -1612,10 +1616,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/elevator-trim/final-deg">
<actuator name="hydraulics/elevator-trim/final-actuator">
<input>hydraulics/elevator-trim/cmd-deg</input>
<rate_limit>hydraulics/elevator-trim/rate</rate_limit>
<lag>22.5</lag>
<output>hydraulics/elevator-trim/final-deg</output>
</actuator>
</channel>
@ -1680,10 +1685,11 @@
</range>
</aerosurface_scale>
<actuator name="hydraulics/rudder/final-deg">
<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>
</channel>

180
Systems/a320-spoiler.xml
View file

@ -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">

82
Systems/flight-recorder.xml
View file

@ -11,95 +11,127 @@
<name>A3XX Flight Recorder</name>
<!-- Include Generic Stuff -->
<signals include="/Aircraft/Generic/flightrecorder/components/position.xml" />
<signals include="/Aircraft/Generic/flightrecorder/components/controls.xml" />
<signals include="/Aircraft/Generic/flightrecorder/components/surfaces.xml"/>
<signals include="/Aircraft/Generic/flightrecorder/components/engine-jet.xml">
<signals include="Aircraft/Generic/flightrecorder/components/position.xml" />
<signals include="Aircraft/Generic/flightrecorder/components/controls.xml" />
<signals include="Aircraft/Generic/flightrecorder/components/surfaces.xml"/>
<signals include="Aircraft/Generic/flightrecorder/components/engine-jet.xml">
<count type="int">2</count>
</signals>
<signals include="/Aircraft/Generic/flightrecorder/components/gear-retractable.xml">
<signals include="Aircraft/Generic/flightrecorder/components/gear-retractable.xml">
<count type="int">3</count>
</signals>
<signals include="/Aircraft/Generic/flightrecorder/components/tanks.xml">
<signals include="Aircraft/Generic/flightrecorder/components/tanks.xml">
<count type="int">5</count>
</signals>
<!-- Now Custom Stuff -->
<signals>
<signal>
<type>double</type>
<type>float</type>
<property>/velocities/groundspeed-kt</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/position/gear-agl-ft</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[0]/reverser-pos-norm</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[1]/reverser-pos-norm</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/fcs/slat-pos-norm</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[3]/n1</property>
</signal>
<signal>
<type>float</type>
<property>/engines/engine[4]/n1</property>
</signal>
<signal>
<type>float</type>
<property>/engines/engine[0]/n1-actual</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[1]/n1-actual</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[0]/n2-actual</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/engines/engine[1]/n2-actual</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/aileron-l/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/aileron-r/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/elevator-l/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/elevator-r/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/elevator-trim/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/rudder/final-deg</property>
</signal>
<signal>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-l1/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-l2/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-l3/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-l4/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-l5/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-r1/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-r2/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-r3/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-r4/final-deg</property>
</signal>
<signal>
<type>double</type>
<type>float</type>
<property>/fdm/jsbsim/hydraulics/spoiler-r5/final-deg</property>
</signal>
</signals>

2
revision.txt
View file

@ -1 +1 @@
4774
4776