1
0
Fork 0

Merge branch '3D' into 3D-flightdeck

This commit is contained in:
Jonathan Redpath 2022-05-09 22:18:12 +01:00
commit 66a4afa243
6 changed files with 75 additions and 68 deletions

View file

@ -2357,7 +2357,8 @@
<volume>0.05</volume> <volume>0.05</volume>
</pushback> </pushback>
<gear-screech> <!-- Antiskid stops this... but its not setup to detect slipping yet -->
<!--gear-screech>
<name>gear-screech</name> <name>gear-screech</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/A320-family/Sounds/Effects/tires-screech-asphalt.wav</path> <path>Aircraft/A320-family/Sounds/Effects/tires-screech-asphalt.wav</path>
@ -2397,7 +2398,7 @@
</volume> </volume>
<reference-dist>10</reference-dist> <reference-dist>10</reference-dist>
<max-dist>200.0</max-dist> <max-dist>200.0</max-dist>
</gear-screech> </gear-screech-->
<gear-screech-looped> <gear-screech-looped>
<name>gear-screech looped</name> <name>gear-screech looped</name>

View file

@ -118,10 +118,10 @@
<independentVar lookup="row">fcs/flap-pos-deg</independentVar> <independentVar lookup="row">fcs/flap-pos-deg</independentVar>
<tableData> <tableData>
0 0.0000 0 0.0000
10 0.1387 10 0.0923
15 0.2377 15 0.1463
20 0.3127 20 0.2079
40 0.3894 40 0.4112
</tableData> </tableData>
</table> </table>
</product> </product>
@ -137,9 +137,9 @@
<independentVar lookup="row">fcs/slat-pos-deg</independentVar> <independentVar lookup="row">fcs/slat-pos-deg</independentVar>
<tableData> <tableData>
0 0.0000 0 0.0000
18 0.2734 18 0.1814
22 0.3187 22 0.2757
27 0.3523 27 0.3975
</tableData> </tableData>
</table> </table>
</product> </product>

View file

@ -1010,7 +1010,7 @@
<!-- Alpha Floor and Toga Lk --> <!-- Alpha Floor and Toga Lk -->
<switch name="fadec/alpha-floor-engage"> <switch name="fadec/alpha-floor-engage">
<default value="13"/> <default value="9.5"/>
<test logic="OR" value="15"> <test logic="OR" value="15">
/controls/flight/flaps-pos eq 1 /controls/flight/flaps-pos eq 1
/controls/flight/flaps-pos eq 2 /controls/flight/flaps-pos eq 2
@ -1025,16 +1025,16 @@
</switch> </switch>
<switch name="fadec/alpha-floor-disengage"> <switch name="fadec/alpha-floor-disengage">
<default value="11"/> <default value="9"/>
<test logic="OR" value="13"> <test logic="OR" value="14">
/controls/flight/flaps-pos eq 1 /controls/flight/flaps-pos eq 1
/controls/flight/flaps-pos eq 2 /controls/flight/flaps-pos eq 2
/controls/flight/flaps-pos eq 3 /controls/flight/flaps-pos eq 3
</test> </test>
<test value="12"> <test value="13">
/controls/flight/flaps-pos eq 4 /controls/flight/flaps-pos eq 4
</test> </test>
<test value="11"> <test value="12">
/controls/flight/flaps-pos eq 5 /controls/flight/flaps-pos eq 5
</test> </test>
</switch> </switch>

View file

@ -87,10 +87,16 @@
<table> <table>
<independentVar lookup="row">atmosphere/density-altitude</independentVar> <independentVar lookup="row">atmosphere/density-altitude</independentVar>
<independentVar lookup="column">fcs/flap-pos-deg</independentVar> <independentVar lookup="column">fcs/flap-pos-deg</independentVar>
<tableData> <independentVar lookup="table">fcs/slat-pos-deg</independentVar>
0 15 <tableData breakPoint="0">
0 9.5 10.5 0 10 15
43000 6.5 6.8 0 9.0 11.0 10.5
43000 6.5 7.0 7.0
</tableData>
<tableData breakPoint="18">
0 10 15
0 10.0 11.0 10.5
43000 7.0 7.0 7.0
</tableData> </tableData>
</table> </table>
</function> </function>
@ -101,10 +107,16 @@
<table> <table>
<independentVar lookup="row">atmosphere/density-altitude</independentVar> <independentVar lookup="row">atmosphere/density-altitude</independentVar>
<independentVar lookup="column">fcs/flap-pos-deg</independentVar> <independentVar lookup="column">fcs/flap-pos-deg</independentVar>
<tableData> <independentVar lookup="table">fcs/slat-pos-deg</independentVar>
0 15 <tableData breakPoint="0">
0 13.5 14.5 0 10 15
43000 7.5 7.7 0 12.0 15.0 14.5
43000 7.4 7.7 7.7
</tableData>
<tableData breakPoint="18">
0 10 15
0 15.0 15.0 14.5
43000 7.7 7.7 7.7
</tableData> </tableData>
</table> </table>
</function> </function>

View file

@ -193,43 +193,24 @@
<!-- V alpha prot/max --> <!-- V alpha prot/max -->
<lag_filter name="/FMGC/internal/valpha-lag"> <lag_filter name="/FMGC/internal/valpha-lag">
<input>aero/alpha-deg-fixed</input> <input>aero/alpha-deg-fixed</input>
<c1>0.3</c1> <c1>0.35</c1>
</lag_filter> </lag_filter>
<fcs_function name="/FMGC/internal/valpha-prot-input">
<function>
<sqrt>
<quotient>
<property>/FMGC/internal/valpha-lag</property>
<property>fbw/alpha-prot-deg</property>
</quotient>
</sqrt>
</function>
</fcs_function>
<fcs_function name="/FMGC/internal/valpha-max-input">
<function>
<sqrt>
<quotient>
<property>/FMGC/internal/valpha-lag</property>
<property>fbw/alpha-max-deg</property>
</quotient>
</sqrt>
</function>
</fcs_function>
<fcs_function name="/FMGC/internal/valpha-prot"> <fcs_function name="/FMGC/internal/valpha-prot">
<function> <function>
<product> <product>
<property>velocities/vc-kts</property> <min>
<table> <property>/systems/navigation/adr/output/cas-1</property>
<independentVar lookup="row">/FMGC/internal/valpha-prot-input</independentVar> <property>/systems/navigation/adr/output/cas-2</property>
<tableData> <property>/systems/navigation/adr/output/cas-3</property>
0 0.3 </min>
1 1.0 <pow>
2 1.6 <quotient>
</tableData> <property>/FMGC/internal/valpha-lag</property>
</table> <property>fbw/alpha-prot-deg</property>
</quotient>
<value>0.28</value>
</pow>
</product> </product>
</function> </function>
</fcs_function> </fcs_function>
@ -237,15 +218,18 @@
<fcs_function name="/FMGC/internal/valpha-max"> <fcs_function name="/FMGC/internal/valpha-max">
<function> <function>
<product> <product>
<property>velocities/vc-kts</property> <min>
<table> <property>/systems/navigation/adr/output/cas-1</property>
<independentVar lookup="row">/FMGC/internal/valpha-max-input</independentVar> <property>/systems/navigation/adr/output/cas-2</property>
<tableData> <property>/systems/navigation/adr/output/cas-3</property>
0 0.3 </min>
1 1.0 <pow>
2 1.6 <quotient>
</tableData> <property>/FMGC/internal/valpha-lag</property>
</table> <property>fbw/alpha-max-deg</property>
</quotient>
<value>0.275</value>
</pow>
</product> </product>
</function> </function>
</fcs_function> </fcs_function>
@ -609,6 +593,16 @@
<!-- Vls --> <!-- Vls -->
<switch name="/FMGC/internal/takeoff-latch"> <switch name="/FMGC/internal/takeoff-latch">
<default value="/FMGC/internal/takeoff-latch"/> <default value="/FMGC/internal/takeoff-latch"/>
<test logic="AND" value="0">
position/wow eq 0
fadec/eng-out eq 0
fadec/max-detent le 2
</test>
<test logic="AND" value="0">
position/wow eq 0
fadec/eng-out eq 1
fadec/max-detent le 4
</test>
<test logic="OR" value="1"> <test logic="OR" value="1">
position/wow eq 1 position/wow eq 1
/FMGC/internal/phase lt 2 /FMGC/internal/phase lt 2

View file

@ -1469,7 +1469,7 @@
<!-- Alpha Floor and Toga Lk --> <!-- Alpha Floor and Toga Lk -->
<switch name="fadec/alpha-floor-engage"> <switch name="fadec/alpha-floor-engage">
<default value="13"/> <default value="9.5"/>
<test logic="OR" value="15"> <test logic="OR" value="15">
/controls/flight/flaps-pos eq 1 /controls/flight/flaps-pos eq 1
/controls/flight/flaps-pos eq 2 /controls/flight/flaps-pos eq 2
@ -1484,16 +1484,16 @@
</switch> </switch>
<switch name="fadec/alpha-floor-disengage"> <switch name="fadec/alpha-floor-disengage">
<default value="11"/> <default value="9"/>
<test logic="OR" value="13"> <test logic="OR" value="14">
/controls/flight/flaps-pos eq 1 /controls/flight/flaps-pos eq 1
/controls/flight/flaps-pos eq 2 /controls/flight/flaps-pos eq 2
/controls/flight/flaps-pos eq 3 /controls/flight/flaps-pos eq 3
</test> </test>
<test value="12"> <test value="13">
/controls/flight/flaps-pos eq 4 /controls/flight/flaps-pos eq 4
</test> </test>
<test value="11"> <test value="12">
/controls/flight/flaps-pos eq 5 /controls/flight/flaps-pos eq 5
</test> </test>
</switch> </switch>