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

Merge branch 'master' into dev

Browse source
This commit is contained in:
Joshua Davidson 2018-09-10 19:48:16 -04:00
commit f47f04ee96
4 changed files with 138 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Systems/a320-spoiler.xml
View file

@ -125,9 +125,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-l1/final-deg">
<pure_gain name="hydraulics/spoiler-l1/final-gain">
<input>hydraulics/spoiler-l1/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-l1/final-deg</output>
</pure_gain>
</channel>
@ -227,9 +228,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-l2/final-deg">
<pure_gain name="hydraulics/spoiler-l2/final-gain">
<input>hydraulics/spoiler-l2/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-l2/final-deg</output>
</pure_gain>
</channel>
@ -291,9 +293,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-l3/final-deg">
<pure_gain name="hydraulics/spoiler-l3/final-gain">
<input>hydraulics/spoiler-l3/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-l3/final-deg</output>
</pure_gain>
</channel>
@ -355,9 +358,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-l4/final-deg">
<pure_gain name="hydraulics/spoiler-l4/final-gain">
<input>hydraulics/spoiler-l4/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-l4/final-deg</output>
</pure_gain>
</channel>
@ -420,9 +424,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-l5/final-deg">
<pure_gain name="hydraulics/spoiler-l5/final-gain">
<input>hydraulics/spoiler-l5/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-l5/final-deg</output>
</pure_gain>
</channel>
@ -452,9 +457,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-r1/final-deg">
<pure_gain name="hydraulics/spoiler-r1/final-gain">
<input>hydraulics/spoiler-r1/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-r1/final-deg</output>
</pure_gain>
</channel>
@ -554,9 +560,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-r2/final-deg">
<pure_gain name="hydraulics/spoiler-r2/final-gain">
<input>hydraulics/spoiler-r2/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-r2/final-deg</output>
</pure_gain>
</channel>
@ -618,9 +625,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-r3/final-deg">
<pure_gain name="hydraulics/spoiler-r3/final-gain">
<input>hydraulics/spoiler-r3/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-r3/final-deg</output>
</pure_gain>
</channel>
@ -683,9 +691,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-r4/final-deg">
<pure_gain name="hydraulics/spoiler-r4/final-gain">
<input>hydraulics/spoiler-r4/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-r4/final-deg</output>
</pure_gain>
</channel>
@ -748,9 +757,10 @@
<c1>16.3</c1>
</lag_filter>
<pure_gain name="hydraulics/spoiler-r5/final-deg">
<pure_gain name="hydraulics/spoiler-r5/final-gain">
<input>hydraulics/spoiler-r5/final-lag</input>
<gain>40.0</gain>
<output>hydraulics/spoiler-r5/final-deg</output>
</pure_gain>
</channel>
@ -758,11 +768,11 @@
<channel name="Output">
<summer name="fcs/spoiler-left-sum">
<input>hydraulics/spoiler-l1/final-deg</input>
<input>hydraulics/spoiler-l2/final-deg</input>
<input>hydraulics/spoiler-l3/final-deg</input>
<input>hydraulics/spoiler-l4/final-deg</input>
<input>hydraulics/spoiler-l5/final-deg</input>
<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>
</summer>
<fcs_function name="fcs/spoiler-left-deg">
@ -775,11 +785,11 @@
</fcs_function>
<summer name="fcs/spoiler-right-sum">
<input>hydraulics/spoiler-r1/final-deg</input>
<input>hydraulics/spoiler-r2/final-deg</input>
<input>hydraulics/spoiler-r3/final-deg</input>
<input>hydraulics/spoiler-r4/final-deg</input>
<input>hydraulics/spoiler-r5/final-deg</input>
<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>
</summer>
<fcs_function name="fcs/spoiler-right-deg">

40
Systems/flight-recorder.xml
View file

@ -76,6 +76,46 @@
<type>double</type>
<property>engines/engine[1]/n2-actual</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-l1/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-l2/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-l3/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-l4/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-l5/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-r1/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-r2/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-r3/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-r4/final-deg</property>
</signal>
<signal>
<type>double</type>
<property>fdm/jsbsim/hydraulics/spoiler-r5/final-deg</property>
</signal>
</signals>
</config>

134
Systems/libraries.xml
View file

@ -299,17 +299,17 @@
<expression>
<table>
<property>/systems/pressurization/cabinalt-norm</property>
<entry><ind>-1000</ind><dep> 16.50000</dep></entry>
<entry><ind> 0</ind><dep> 14.70000</dep></entry>
<entry><ind> 0</ind><dep> 14.70000</dep></entry>
<entry><ind> 1000</ind><dep> 14.20000</dep></entry>
<entry><ind> 2000</ind><dep> 13.60000</dep></entry>
<entry><ind> 3000</ind><dep> 13.20000</dep></entry>
<entry><ind> 4000</ind><dep> 12.70000</dep></entry>
<entry><ind> 5000</ind><dep> 12.20000</dep></entry>
<entry><ind> 6000</ind><dep> 11.70000</dep></entry>
<entry><ind> 7000</ind><dep> 11.30000</dep></entry>
<entry><ind> 8000</ind><dep> 10.90000</dep></entry>
<entry><ind>-1000</ind><dep>16.50000</dep></entry>
<entry><ind> 0</ind><dep>14.70000</dep></entry>
<entry><ind> 0</ind><dep>14.70000</dep></entry>
<entry><ind> 1000</ind><dep>14.20000</dep></entry>
<entry><ind> 2000</ind><dep>13.60000</dep></entry>
<entry><ind> 3000</ind><dep>13.20000</dep></entry>
<entry><ind> 4000</ind><dep>12.70000</dep></entry>
<entry><ind> 5000</ind><dep>12.20000</dep></entry>
<entry><ind> 6000</ind><dep>11.70000</dep></entry>
<entry><ind> 7000</ind><dep>11.30000</dep></entry>
<entry><ind> 8000</ind><dep>10.90000</dep></entry>
</table>
</expression>
</input>
@ -493,9 +493,9 @@
<expression>
<table>
<property>/systems/pressurization/outflowpos-man</property>
<entry><ind>0</ind><dep>-1000</dep></entry>
<entry><ind>0.5</ind><dep>0</dep></entry>
<entry><ind>1</ind><dep>2500</dep></entry>
<entry><ind>0.0</ind><dep>-1000</dep></entry>
<entry><ind>0.5</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep> 2500</dep></entry>
</table>
</expression>
</input>
@ -612,41 +612,41 @@
<expression>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind>-1000</ind><dep> 21.5</dep></entry>
<entry><ind> 0</ind><dep> 15.0</dep></entry>
<entry><ind> 1000</ind><dep> 8.5</dep></entry>
<entry><ind> 2000</ind><dep> 2.0</dep></entry>
<entry><ind> 3000</ind><dep> -4.50</dep></entry>
<entry><ind> 4000</ind><dep> -11.0</dep></entry>
<entry><ind> 5000</ind><dep> -17.5</dep></entry>
<entry><ind> 6000</ind><dep> -24.0</dep></entry>
<entry><ind> 7000</ind><dep> -30.5</dep></entry>
<entry><ind> 8000</ind><dep> -37.0</dep></entry>
<entry><ind> 9000</ind><dep> -43.0</dep></entry>
<entry><ind>10000</ind><dep> -50.0</dep></entry>
<entry><ind>11000</ind><dep> -56.5</dep></entry>
<entry><ind>12000</ind><dep> -56.5</dep></entry>
<entry><ind>13000</ind><dep> -56.5</dep></entry>
<entry><ind>14000</ind><dep> -56.5</dep></entry>
<entry><ind>15000</ind><dep> -56.5</dep></entry>
<entry><ind>16000</ind><dep> -56.5</dep></entry>
<entry><ind>17000</ind><dep> -56.5</dep></entry>
<entry><ind>18000</ind><dep> -56.5</dep></entry>
<entry><ind>19000</ind><dep> -56.5</dep></entry>
<entry><ind>20000</ind><dep> -56.5</dep></entry>
<entry><ind>22000</ind><dep> -54.5</dep></entry>
<entry><ind>24000</ind><dep> -52.5</dep></entry>
<entry><ind>26000</ind><dep> -50.5</dep></entry>
<entry><ind>28000</ind><dep> -48.5</dep></entry>
<entry><ind>30000</ind><dep> -46.5</dep></entry>
<entry><ind>32000</ind><dep> -44.5</dep></entry>
<entry><ind>34000</ind><dep> -38.9</dep></entry>
<entry><ind>36000</ind><dep> -33.3</dep></entry>
<entry><ind>38000</ind><dep> -27.7</dep></entry>
<entry><ind>39000</ind><dep> -24.9</dep></entry>
<entry><ind>40000</ind><dep> -22.1</dep></entry>
<entry><ind>41000</ind><dep> -19.3</dep></entry>
<entry><ind>42000</ind><dep> -16.5</dep></entry>
<entry><ind>-1000</ind><dep> 21.5</dep></entry>
<entry><ind> 0</ind><dep> 15.0</dep></entry>
<entry><ind> 1000</ind><dep> 8.5</dep></entry>
<entry><ind> 2000</ind><dep> 2.0</dep></entry>
<entry><ind> 3000</ind><dep>-4.50</dep></entry>
<entry><ind> 4000</ind><dep>-11.0</dep></entry>
<entry><ind> 5000</ind><dep>-17.5</dep></entry>
<entry><ind> 6000</ind><dep>-24.0</dep></entry>
<entry><ind> 7000</ind><dep>-30.5</dep></entry>
<entry><ind> 8000</ind><dep>-37.0</dep></entry>
<entry><ind> 9000</ind><dep>-43.0</dep></entry>
<entry><ind>10000</ind><dep>-50.0</dep></entry>
<entry><ind>11000</ind><dep>-56.5</dep></entry>
<entry><ind>12000</ind><dep>-56.5</dep></entry>
<entry><ind>13000</ind><dep>-56.5</dep></entry>
<entry><ind>14000</ind><dep>-56.5</dep></entry>
<entry><ind>15000</ind><dep>-56.5</dep></entry>
<entry><ind>16000</ind><dep>-56.5</dep></entry>
<entry><ind>17000</ind><dep>-56.5</dep></entry>
<entry><ind>18000</ind><dep>-56.5</dep></entry>
<entry><ind>19000</ind><dep>-56.5</dep></entry>
<entry><ind>20000</ind><dep>-56.5</dep></entry>
<entry><ind>22000</ind><dep>-54.5</dep></entry>
<entry><ind>24000</ind><dep>-52.5</dep></entry>
<entry><ind>26000</ind><dep>-50.5</dep></entry>
<entry><ind>28000</ind><dep>-48.5</dep></entry>
<entry><ind>30000</ind><dep>-46.5</dep></entry>
<entry><ind>32000</ind><dep>-44.5</dep></entry>
<entry><ind>34000</ind><dep>-38.9</dep></entry>
<entry><ind>36000</ind><dep>-33.3</dep></entry>
<entry><ind>38000</ind><dep>-27.7</dep></entry>
<entry><ind>39000</ind><dep>-24.9</dep></entry>
<entry><ind>40000</ind><dep>-22.1</dep></entry>
<entry><ind>41000</ind><dep>-19.3</dep></entry>
<entry><ind>42000</ind><dep>-16.5</dep></entry>
</table>
</expression>
</input>
@ -734,10 +734,10 @@
<expression>
<table>
<property>/controls/gear/brake-left</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>0.3</ind><dep>1000</dep></entry>
<entry><ind>0.6</ind><dep>2000</dep></entry>
<entry><ind> 1</ind><dep>3000</dep></entry>
<entry><ind>1.0</ind><dep>3000</dep></entry>
</table>
</expression>
</input>
@ -753,10 +753,10 @@
<expression>
<table>
<property>/controls/gear/brake-right</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind>0.0</ind><dep> 0</dep></entry>
<entry><ind>0.3</ind><dep>1000</dep></entry>
<entry><ind>0.6</ind><dep>2000</dep></entry>
<entry><ind> 1</ind><dep>3000</dep></entry>
<entry><ind>1.0</ind><dep>3000</dep></entry>
</table>
</expression>
</input>
@ -772,10 +772,10 @@
<expression>
<table>
<property>/gear/gear[1]/position-norm</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind>0.00</ind><dep>0</dep></entry>
<entry><ind>0.19</ind><dep>1</dep></entry>
<entry><ind>0.81</ind><dep>1</dep></entry>
<entry><ind> 1</ind><dep>0</dep></entry>
<entry><ind>1.00</ind><dep>0</dep></entry>
</table>
</expression>
</input>
@ -791,8 +791,8 @@
<expression>
<table>
<property>/systems/hydraulic/gear/door-left</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind> 1</ind><dep>-100</dep></entry>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>-100</dep></entry>
</table>
</expression>
</input>
@ -808,10 +808,10 @@
<expression>
<table>
<property>/gear/gear[2]/position-norm</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind>0.00</ind><dep>0</dep></entry>
<entry><ind>0.19</ind><dep>1</dep></entry>
<entry><ind>0.81</ind><dep>1</dep></entry>
<entry><ind> 1</ind><dep>0</dep></entry>
<entry><ind>1.00</ind><dep>0</dep></entry>
</table>
</expression>
</input>
@ -827,8 +827,8 @@
<expression>
<table>
<property>/systems/hydraulic/gear/door-right</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind> 1</ind><dep>100</dep></entry>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>100</dep></entry>
</table>
</expression>
</input>
@ -844,10 +844,10 @@
<expression>
<table>
<property>/gear/gear[0]/position-norm</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind>0.00</ind><dep>0</dep></entry>
<entry><ind>0.19</ind><dep>1</dep></entry>
<entry><ind>0.81</ind><dep>1</dep></entry>
<entry><ind> 1</ind><dep>0</dep></entry>
<entry><ind>1.00</ind><dep>0</dep></entry>
</table>
</expression>
</input>
@ -863,8 +863,8 @@
<expression>
<table>
<property>/systems/hydraulic/gear/door-nose</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind> 1</ind><dep>95</dep></entry>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>95</dep></entry>
</table>
</expression>
</input>
@ -880,8 +880,8 @@
<expression>
<table>
<property>/systems/hydraulic/gear/door-nose</property>
<entry><ind> 0</ind><dep>0</dep></entry>
<entry><ind> 1</ind><dep>-95</dep></entry>
<entry><ind>0</ind><dep> 0</dep></entry>
<entry><ind>1</ind><dep>-95</dep></entry>
</table>
</expression>
</input>

2
revision.txt
View file

@ -1 +1 @@
4633
4634