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

Sim: Fix mistakes in 23d3576 and 1666e5c

Browse source
This commit is contained in:
Josh Davidson 2019-03-23 23:41:54 -04:00
commit 157fcc1823
33 changed files with 1714 additions and 1569 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
A320-main.xml
View file

@ -625,6 +625,7 @@
<brake-parking type="bool">0</brake-parking> <brake-parking type="bool">0</brake-parking>
<tiller-cmd-norm type="double">0</tiller-cmd-norm> <tiller-cmd-norm type="double">0</tiller-cmd-norm>
<tiller-enabled type="bool">0</tiller-enabled> <tiller-enabled type="bool">0</tiller-enabled>
<nws-switch type="double">1</nws-switch>
</gear> </gear>
<lighting> <lighting>
<DU> <DU>

4
AircraftConfig/acconfig.nas
View file

@ -127,9 +127,9 @@ setlistener("/systems/acconfig/new-revision", func {
}); });
var mismatch_chk = func { var mismatch_chk = func {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201810) { if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201830) {
setprop("/systems/acconfig/mismatch-code", "0x121"); setprop("/systems/acconfig/mismatch-code", "0x121");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.1.0."); setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.3.0.");
if (getprop("/systems/acconfig/out-of-date") != 1) { if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open(); error_mismatch.open();
} }

2
Engines/cfm56_5a1_1.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="CFM56_5A1"> <turbine_engine name="CFM56_5A1">
<milthrust> 25000 </milthrust> <milthrust> 25000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/cfm56_5a1_2.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="CFM56_5A1"> <turbine_engine name="CFM56_5A1">
<milthrust> 25000 </milthrust> <milthrust> 25000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/cfm56_5b4_1.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="CFM56_5B4"> <turbine_engine name="CFM56_5B4">
<milthrust> 27000 </milthrust> <milthrust> 27000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/cfm56_5b4_2.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="CFM56_5B4"> <turbine_engine name="CFM56_5B4">
<milthrust> 27000 </milthrust> <milthrust> 27000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/leap1a26_1.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="LEAP1A26"> <turbine_engine name="LEAP1A26">
<milthrust> 27000 </milthrust> <milthrust> 27000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/leap1a26_2.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="LEAP1A26"> <turbine_engine name="LEAP1A26">
<milthrust> 27000 </milthrust> <milthrust> 27000 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/pw1127g_1.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="PW1127G"> <turbine_engine name="PW1127G">
<milthrust> 26345 </milthrust> <milthrust> 26345 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/pw1127g_2.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="PW1127G"> <turbine_engine name="PW1127G">
<milthrust> 26345 </milthrust> <milthrust> 26345 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 19.7 </idlen1> <idlen1> 19.7 </idlen1>
<idlen2> 61.2 </idlen2> <idlen2> 61.2 </idlen2>

2
Engines/v2527_a5_1.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="V2527_A5"> <turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust> <milthrust> 26600 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1> <idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2> <idlen2> 60.9 </idlen2>

2
Engines/v2527_a5_2.xml
View file

@ -5,7 +5,7 @@
<turbine_engine name="V2527_A5"> <turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust> <milthrust> 26600 </milthrust>
<tsfc> 0.41 </tsfc> <tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed> <bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1> <idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2> <idlen2> 60.9 </idlen2>

2
INSTALL.md
View file

@ -1,7 +1,7 @@
# INSTALL # INSTALL
## Prerequisites ## Prerequisites
Have at least following versions installed: Have at least following versions installed:
* FlightGear 2018.1.0 or newer * FlightGear 2018.3.0 or newer
## Install using ZIP Snapshot ## Install using ZIP Snapshot
[Download](https://github.com/it0uchpods/IDG-A32X/archive/master.zip) the zip file. [Download](https://github.com/it0uchpods/IDG-A32X/archive/master.zip) the zip file.

41
Models/FlightDeck/a320.flightdeck.xml
View file

@ -852,6 +852,45 @@
</action> </action>
</animation> </animation>
<animation>
<type>rotate</type>
<object-name>land_sw</object-name>
<property>controls/gear/nws-switch</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep> 0</dep></entry>
</interpolation>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
<center>
<x-m>-0.562289</x-m>
<y-m>0.259382</y-m>
<z-m>0.253933</z-m>
</center>
</animation>
<animation>
<type>pick</type>
<object-name>land_sw</object-name>
<action>
<button>0</button>
<button>3</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/gear/nws-switch</property>
<value>0</value>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>
</binding>
</action>
</animation>
<!-- Dimmer Panel Left --> <!-- Dimmer Panel Left -->
<animation> <animation>
<type>pick</type> <type>pick</type>
@ -3226,7 +3265,7 @@
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>it-autoflight/input/lat-arm</property> <property>it-autoflight/output/lnav-armed</property>
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>

255
Models/Instruments/Audio/Audio1.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- <!-- Copyright (c) 2019 Joshua Davidson (it0uchpods) -->
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<PropertyList> <PropertyList>
<path>res/Audio1.ac</path> <path>res/Audio.ac</path>
<!-- INT/RAD switch --> <!-- INT/RAD switch -->
<animation> <animation>
@ -118,10 +114,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>vhf1</value> <value>vhf1</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>vhf1</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>vhf1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -139,10 +162,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>vhf2</value> <value>vhf2</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>vhf2</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>vhf2</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -160,10 +210,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>vhf3</value> <value>vhf3</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>vhf3</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>vhf3</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -181,10 +258,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>hf1</value> <value>hf1</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>hf1</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>hf1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -202,10 +306,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>hf2</value> <value>hf2</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>hf2</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>hf2</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -223,10 +354,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>mech</value> <value>mech</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>mech</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>mech</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -244,10 +402,37 @@
<property>systems/audio/acp[0]/call_chan</property> <property>systems/audio/acp[0]/call_chan</property>
<value>att</value> <value>att</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[0]/call_chan</property>
</greater-than-equals> <value>att</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[0]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[0]/call_chan</property>
<value>att</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -1471,4 +1656,4 @@
<object-name>audio_adf2.axis</object-name> <object-name>audio_adf2.axis</object-name>
</axis> </axis>
</animation> </animation>
</PropertyList> </PropertyList>

258
Models/Instruments/Audio/Audio2.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- <!-- Copyright (c) 2019 Joshua Davidson (it0uchpods) -->
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<PropertyList> <PropertyList>
<path>res/Audio1.ac</path> <path>res/Audio.ac</path>
<!-- INT/RAD switch --> <!-- INT/RAD switch -->
<animation> <animation>
@ -118,10 +114,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>vhf1</value> <value>vhf1</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>vhf1</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>vhf1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -139,10 +162,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>vhf2</value> <value>vhf2</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>vhf2</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>vhf2</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -160,10 +210,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>vhf3</value> <value>vhf3</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>vhf3</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>vhf3</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -181,10 +258,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>hf1</value> <value>hf1</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>hf1</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>hf1</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -202,10 +306,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>hf2</value> <value>hf2</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>hf2</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>hf2</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -223,10 +354,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>mech</value> <value>mech</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>mech</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>mech</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -244,10 +402,37 @@
<property>systems/audio/acp[1]/call_chan</property> <property>systems/audio/acp[1]/call_chan</property>
<value>att</value> <value>att</value>
<condition> <condition>
<greater-than-equals> <and>
<property>systems/electrical/bus/dc-ess</property> <not-equals>
<value>25</value> <property>systems/audio/acp[1]/call_chan</property>
</greater-than-equals> <value>att</value>
</not-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition>
</binding>
</action>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>systems/audio/acp[1]/call_chan</property>
<value></value>
<condition>
<and>
<equals>
<property>systems/audio/acp[1]/call_chan</property>
<value>att</value>
</equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</binding> </binding>
</action> </action>
@ -957,7 +1142,7 @@
<factor-prop>sim/model/lights/dome-light</factor-prop> <factor-prop>sim/model/lights/dome-light</factor-prop>
</emission> </emission>
</animation> </animation>
<effect> <effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance</inherits-from> <inherits-from>Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance</inherits-from>
<object-name>audio_body</object-name> <object-name>audio_body</object-name>
@ -1471,5 +1656,4 @@
<object-name>audio_adf2.axis</object-name> <object-name>audio_adf2.axis</object-name>
</axis> </axis>
</animation> </animation>
</PropertyList>
</PropertyList>

0
Models/Instruments/Audio/res/Audio1.ac → Models/Instruments/Audio/res/Audio.ac
View file

6
Models/Services/Pushback/Douglas.xml
View file

@ -10,7 +10,7 @@
<!-- switch to night/day textures --> <!-- switch to night/day textures -->
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<property>/sim/time/sun-angle-rad</property> <property>sim/time/sun-angle-rad</property>
<step>1.60</step> <step>1.60</step>
<factor>0.318471338</factor> <factor>0.318471338</factor>
<center> <center>
@ -29,7 +29,7 @@
<type>material</type> <type>material</type>
<condition> <condition>
<greater-than> <greater-than>
<property>/sim/time/sun-angle-rad</property> <property>sim/time/sun-angle-rad</property>
<value>1.60</value> <value>1.60</value>
</greater-than> </greater-than>
</condition> </condition>
@ -44,7 +44,7 @@
<type>material</type> <type>material</type>
<condition> <condition>
<less-than-equals> <less-than-equals>
<property>/sim/time/sun-angle-rad</property> <property>sim/time/sun-angle-rad</property>
<value>1.60</value> <value>1.60</value>
</less-than-equals> </less-than-equals>
</condition> </condition>

4
Nasal/ECAM/ECAM-logic.nas
View file

@ -384,7 +384,7 @@ var messages_right_memo = func {
rat.colour = "g"; rat.colour = "g";
} }
if (getprop("/sim/model/autopush/enabled") == 1) { if (getprop("/sim/model/autopush/enabled") == 1) { # this message is only on when towing - not when disc with switch
nw_strg_disc.active = 1; nw_strg_disc.active = 1;
} else { } else {
nw_strg_disc.active = 0; nw_strg_disc.active = 0;
@ -501,4 +501,4 @@ setlistener("/controls/fctl/fac1", func() {
} else { } else {
dualFailFACActive = 1; dualFailFACActive = 1;
} }
}, 0, 0); }, 0, 0);

2260
Nasal/FMGC-b.nas
View file

File diff suppressed because it is too large Load diff

62
Nasal/FMGC-c.nas
View file

@ -33,7 +33,7 @@ setprop("/modes/pfd/fma/roll-mode-armed-time", 0);
setprop("/modes/pfd/fma/ap-mode-time", 0); setprop("/modes/pfd/fma/ap-mode-time", 0);
setprop("/modes/pfd/fma/fd-mode-time", 0); setprop("/modes/pfd/fma/fd-mode-time", 0);
setprop("/modes/pfd/fma/athr-mode-time", 0); setprop("/modes/pfd/fma/athr-mode-time", 0);
setprop("/modes/fcu/hdg-time", 0); setprop("/modes/fcu/hdg-time", -45);
setlistener("sim/signals/fdm-initialized", func { setlistener("sim/signals/fdm-initialized", func {
loopFMA.start(); loopFMA.start();
@ -126,20 +126,17 @@ var loopFMA = maketimer(0.05, func {
if (((state1 == "TOGA" or state2 == "TOGA") or (flx == 1 and (state1 == "MCT" or state2 == "MCT")) or (flx == 1 and ((state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)))) and (engstate1 == 3 or engstate2 == 3)) { if (((state1 == "TOGA" or state2 == "TOGA") or (flx == 1 and (state1 == "MCT" or state2 == "MCT")) or (flx == 1 and ((state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)))) and (engstate1 == 3 or engstate2 == 3)) {
# RWY Engagement would go here, but automatic ILS selection is not simulated yet. # RWY Engagement would go here, but automatic ILS selection is not simulated yet.
if (wow and getprop("/FMGC/internal/v2-set") == 1 and getprop("/it-autoflight/output/vert") != 7) { if (wow and getprop("/FMGC/internal/v2-set") == 1 and getprop("/it-autoflight/output/vert") != 7) {
setprop("/it-autoflight/input/vert", 7); ITAF.setVertMode(7);
setprop("/it-autoflight/mode/vert", "T/O CLB"); setprop("/it-autoflight/mode/vert", "T/O CLB");
fmgc.vertical();
} }
} else { } else {
var gear1 = getprop("/gear/gear[1]/wow"); var gear1 = getprop("/gear/gear[1]/wow");
var gear2 = getprop("/gear/gear[2]/wow"); var gear2 = getprop("/gear/gear[2]/wow");
if (getprop("/it-autoflight/input/lat") == 5 and (gear1 or gear2)) { if (getprop("/it-autoflight/input/lat") == 5 and (gear1 or gear2)) {
setprop("/it-autoflight/input/lat", 9); ITAF.setLatMode(9);
fmgc.lateral();
} }
if (getprop("/it-autoflight/output/vert") == 7 and (gear1 or gear2)) { if (getprop("/it-autoflight/output/vert") == 7 and (gear1 or gear2)) {
setprop("/it-autoflight/input/vert", 9); ITAF.setVertMode(9);
fmgc.vertical();
} }
} }
@ -201,13 +198,6 @@ var loopFMA = maketimer(0.05, func {
} else { } else {
setprop("/modes/pfd/fma/pitch-mode2-armed-box", 0); setprop("/modes/pfd/fma/pitch-mode2-armed-box", 0);
} }
# Preselect HDG
if (getprop("/modes/fcu/hdg-time") + 45 >= elapsedtime) {
setprop("/it-autoflight/custom/show-hdg", 1);
} else if (getprop("/it-autoflight/output/lat") != 0 and getprop("/it-autoflight/output/lat") != 5 and getprop("/it-autoflight/output/lat") != 9) {
setprop("/it-autoflight/custom/show-hdg", 0);
}
}); });
var loopFMA_b = func { var loopFMA_b = func {
@ -344,34 +334,6 @@ setlistener("/it-autoflight/mode/vert", func {
if (newvertarm != "ALT") { if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT"); setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} }
} else if (vert == "MNG HLD") {
if (newvert != "ALT") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
}
if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
}
} else if (vert == "MNG CAP") {
if (newvert != "ALT*") {
setprop("/modes/pfd/fma/pitch-mode", "ALT*");
}
if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
}
} else if (vert == "MNG CLB") {
if (newvert != "CLB") {
setprop("/modes/pfd/fma/pitch-mode", "CLB");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == "MNG DES") {
if (newvert != "DES") {
setprop("/modes/pfd/fma/pitch-mode", "DES");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == " ") { } else if (vert == " ") {
if (newvert != " ") { if (newvert != " ") {
setprop("/modes/pfd/fma/pitch-mode", " "); setprop("/modes/pfd/fma/pitch-mode", " ");
@ -532,21 +494,7 @@ var at = func {
} }
var boxchk = func { var boxchk = func {
var ap1 = getprop("/it-autoflight/output/ap1"); if ((getprop("/it-autoflight/output/ap1") or getprop("/it-autoflight/output/ap2") or getprop("/it-autoflight/output/fd1") or getprop("/it-autoflight/output/fd2")) and getprop("/it-autoflight/output/fma-pwr") == 0) {
var ap2 = getprop("/it-autoflight/output/ap2");
var fd1 = getprop("/it-autoflight/output/fd1");
var fd2 = getprop("/it-autoflight/output/fd2");
var fma_pwr = getprop("/it-autoflight/output/fma-pwr");
if (ap1 and !ap2 and !fd1 and !fd2 and !fma_pwr) {
setprop("/it-autoflight/input/lat", 3);
boxchk_b();
} else if (!ap1 and ap2 and !fd1 and !fd2 and !fma_pwr) {
setprop("/it-autoflight/input/lat", 3);
boxchk_b();
} else if (!ap1 and !ap2 and fd1 and !fd2 and !fma_pwr) {
setprop("/it-autoflight/input/lat", 3);
boxchk_b();
} else if (!ap1 and !ap2 and !fd1 and fd2 and !fma_pwr) {
setprop("/it-autoflight/input/lat", 3); setprop("/it-autoflight/input/lat", 3);
boxchk_b(); boxchk_b();
} }

5
Nasal/FMGC.nas
View file

@ -300,7 +300,7 @@ var reset_FMGC = func {
spd = getprop("/it-autoflight/input/spd-kts"); spd = getprop("/it-autoflight/input/spd-kts");
hdg = getprop("/it-autoflight/input/hdg"); hdg = getprop("/it-autoflight/input/hdg");
alt = getprop("/it-autoflight/input/alt"); alt = getprop("/it-autoflight/input/alt");
APinit(); ITAF.init();
FMGCinit(); FMGCinit();
mcdu.MCDU_reset(0); mcdu.MCDU_reset(0);
mcdu.MCDU_reset(1); mcdu.MCDU_reset(1);
@ -353,9 +353,6 @@ var various2 = maketimer(0.5, func {
nav3(); nav3();
adf0(); adf0();
adf1(); adf1();
if (getprop("/it-autoflight/output/lat") == 0) {
setprop("/it-autoflight/custom/show-hdg", 1);
}
}); });
var nav0 = func { var nav0 = func {

16
Nasal/buttons.nas
View file

@ -52,7 +52,7 @@ var variousReset = func {
setprop("/controls/lighting/DU/du6", 1); setprop("/controls/lighting/DU/du6", 1);
setprop("/controls/lighting/DU/mcdu1", 1); setprop("/controls/lighting/DU/mcdu1", 1);
setprop("/controls/lighting/DU/mcdu2", 1); setprop("/controls/lighting/DU/mcdu2", 1);
setprop("/modes/fcu/hdg-time", 0); setprop("/modes/fcu/hdg-time", -45);
setprop("/controls/switching/ATTHDG", 0); setprop("/controls/switching/ATTHDG", 0);
setprop("/controls/switching/AIRDATA", 0); setprop("/controls/switching/AIRDATA", 0);
setprop("/controls/switches/no-smoking-sign", 1); setprop("/controls/switches/no-smoking-sign", 1);
@ -358,10 +358,8 @@ var APPanel = {
if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) { if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) {
if (latMode.getValue() == 0 or !showHDG.getBoolValue()) { if (latMode.getValue() == 0 or !showHDG.getBoolValue()) {
setprop("/it-autoflight/input/lat", 3); setprop("/it-autoflight/input/lat", 3);
showHDG.setBoolValue(1);
} else { } else {
setprop("/it-autoflight/input/lat", 0); setprop("/it-autoflight/input/lat", 0);
showHDG.setBoolValue(1);
} }
} }
} }
@ -399,26 +397,26 @@ var APPanel = {
if (latMode.getValue() == 2) { if (latMode.getValue() == 2) {
setprop("/it-autoflight/input/lat", 0); setprop("/it-autoflight/input/lat", 0);
} else { } else {
fmgc.disarmLOC(); fmgc.ITAF.disarmLOC();
} }
if (vertTemp == 2 or vertTemp == 6) { if (vertTemp == 2 or vertTemp == 6) {
me.VSPull(); me.VSPull();
} else { } else {
fmgc.disarmGS(); fmgc.ITAF.disarmGS();
} }
} else { } else {
setprop("/it-autoflight/input/lat", 2); setprop("/it-autoflight/input/lat", 2);
if (vertTemp == 2 or vertTemp == 6) { if (vertTemp == 2 or vertTemp == 6) {
me.VSPull(); me.VSPull();
} else { } else {
fmgc.disarmGS(); fmgc.ITAF.disarmGS();
} }
} }
} }
}, },
TRKFPA: func() { TRKFPA: func() {
if (dcEss.getValue() >= 25) { if (dcEss.getValue() >= 25) {
fmgc.toggle_trkfpa(); fmgc.ITAF.toggleTrkFpa();
} }
}, },
ALTPush: func() { ALTPush: func() {
@ -535,12 +533,12 @@ var APPanel = {
if (latMode.getValue() == 2) { if (latMode.getValue() == 2) {
setprop("/it-autoflight/input/lat", 0); setprop("/it-autoflight/input/lat", 0);
} else { } else {
fmgc.disarmLOC(); fmgc.ITAF.disarmLOC();
} }
if (vertTemp == 2 or vertTemp == 6) { if (vertTemp == 2 or vertTemp == 6) {
me.VSPull(); me.VSPull();
} else { } else {
fmgc.disarmGS(); fmgc.ITAF.disarmGS();
} }
} else { } else {
setprop("/it-autoflight/input/vert", 2); setprop("/it-autoflight/input/vert", 2);

2
Nasal/fadec-common.nas
View file

@ -222,7 +222,7 @@ var thrust_loop = maketimer(0.04, func {
gs = getprop("/velocities/groundspeed-kt"); gs = getprop("/velocities/groundspeed-kt");
if (getprop("/FMGC/internal/flex-set") == 1 and getprop("/systems/fadec/n1mode1") == 0 and getprop("/systems/fadec/n1mode2") == 0 and getprop("/gear/gear[1]/wow") == 1 and getprop("/gear/gear[2]/wow") == 1 and gs < 40) { if (getprop("/FMGC/internal/flex-set") == 1 and getprop("/systems/fadec/n1mode1") == 0 and getprop("/systems/fadec/n1mode2") == 0 and getprop("/gear/gear[1]/wow") == 1 and getprop("/gear/gear[2]/wow") == 1 and gs < 40) {
setprop("/systems/thrust/lim-flex", 1); setprop("/systems/thrust/lim-flex", 1);
} else if (getprop("/FMGC/internal/flex-set") == 0 and engstate1 != 3 and engstate2 != 3) { } else if (getprop("/FMGC/internal/flex-set") == 0 or engstate1 != 3 or engstate2 != 3) {
setprop("/systems/thrust/lim-flex", 0); setprop("/systems/thrust/lim-flex", 0);
} }
if (getprop("/controls/engines/engine[0]/reverser") == "1" or getprop("/controls/engines/engine[1]/reverser") == "1") { if (getprop("/controls/engines/engine[0]/reverser") == "1" or getprop("/controls/engines/engine[1]/reverser") == "1") {

8
Nasal/libraries.nas
View file

@ -192,15 +192,13 @@ var systemsInit = func {
systems.fire_init(); systems.fire_init();
systems.autobrake_init(); systems.autobrake_init();
fadec.FADEC.init(); fadec.FADEC.init();
fmgc.APinit(); fmgc.ITAF.init();
fmgc.FMGCinit(); fmgc.FMGCinit();
mcdu.MCDU_init(0); mcdu.MCDU_init(0);
mcdu.MCDU_init(1); mcdu.MCDU_init(1);
systemsLoop.start(); systemsLoop.start();
icing.icingInit(); icing.icingInit();
lightsLoop.start(); lightsLoop.start();
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
libraries.ECAM.init(); libraries.ECAM.init();
libraries.BUTTONS.init(); libraries.BUTTONS.init();
libraries.variousReset(); libraries.variousReset();
@ -235,10 +233,6 @@ var systemsLoop = maketimer(0.1, func {
setprop("/systems/shake/effect", 0); setprop("/systems/shake/effect", 0);
} }
if (getprop("/it-autoflight/custom/show-hdg") == 0 and getprop("/it-autoflight/output/lat") != 4) {
setprop("/it-autoflight/input/hdg", math.round(getprop("/instrumentation/pfd/heading-scale")));
}
if (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1 or (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1 and getprop("/controls/flight/flap-pos") >= 4)) { if (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1 or (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1 and getprop("/controls/flight/flap-pos") >= 4)) {
setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 1); setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 1);
} else { } else {

54
Systems/a320-fcs.xml
View file

@ -2022,6 +2022,36 @@
</test> </test>
</switch> </switch>
<switch name="hydraulics/tiller/elec-pwr">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/bus/ac1 ge 110
/systems/electrical/bus/ac2 ge 110
/systems/electrical/bus/dc1 ge 25
/systems/electrical/bus/dc2 ge 25
</test>
</switch>
<switch name="hydraulics/tiller/hyd-pwr">
<default value="0"/>
<test logic="AND" value="1">
position/wow eq 1
hydraulics/tiller/elec-pwr eq 1
/systems/hydraulic/yellow-psi ge 1500
/sim/model/autopush/connected eq 0
/controls/gear/nws-switch eq 1
/engines/engine[0]/state eq 3
</test>
<test logic="AND" value="1">
position/wow eq 1
hydraulics/tiller/elec-pwr eq 1
/systems/hydraulic/yellow-psi ge 1500
/sim/model/autopush/connected eq 0
/controls/gear/nws-switch eq 1
/engines/engine[1]/state eq 3
</test>
</switch>
<fcs_function name="hydraulics/tiller/function"> <fcs_function name="hydraulics/tiller/function">
<function> <function>
<ifthen> <ifthen>
@ -2031,26 +2061,36 @@
</eq> </eq>
<product> <product>
<property>hydraulics/tiller/autopush-cmd</property> <property>hydraulics/tiller/autopush-cmd</property>
<value>70</value> <value>75</value>
</product> </product>
<table> <table>
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar> <independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
<independentVar lookup="column">hydraulics/tiller/switch</independentVar> <independentVar lookup="column">hydraulics/tiller/switch</independentVar>
<tableData> <tableData>
-1 0 1 -1 0 1
0.500 00.0 0.0 00.0 0.500 0 0 0
1.000 -70.0 0.0 70.0 1.000 -75 0 75
30.000 -70.0 0.0 70.0 30.000 -47 0 47
30.001 -10.0 0.0 10.0 30.001 -6 0 6
135.000 0 0 0
</tableData> </tableData>
</table> </table>
</ifthen> </ifthen>
</function> </function>
</fcs_function> </fcs_function>
<switch name="fcs/steer-rate">
<default value="0"/>
<test logic="OR" value="75">
hydraulics/tiller/hyd-pwr eq 1
/sim/model/autopush/connected eq 1
/systems/acconfig/autoconfig-running eq 1
</test>
</switch>
<actuator name="fcs/steer-deg"> <actuator name="fcs/steer-deg">
<input>hydraulics/tiller/function</input> <input>hydraulics/tiller/function</input>
<rate_limit>70</rate_limit> <rate_limit>fcs/steer-rate</rate_limit>
<output>fcs/steer-pos-deg[0]</output> <output>fcs/steer-pos-deg[0]</output>
</actuator> </actuator>

127
Systems/a320-ground-reactions.xml
View file

@ -9,12 +9,53 @@
<y> 0 </y> <y> 0 </y>
<z> -4.31395 </z> <z> -4.31395 </z>
</location> </location>
<static_friction> 0.4 </static_friction> <static_friction> 1.4 </static_friction> <!-- Arbitrarily high to help nose wheel steering - no effect on braking -->
<dynamic_friction> 0.6 </dynamic_friction> <dynamic_friction> 0.6 </dynamic_friction>
<rolling_friction> 0.02 </rolling_friction> <rolling_friction> 0.02 </rolling_friction>
<spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff> <spring_coeff unit="LBS/FT"> 30935.5 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff> <damping_coeff unit="LBS/FT/SEC"> 16978.5 </damping_coeff>
<max_steer unit="DEG"> 70 </max_steer> <max_steer unit="DEG"> 75 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.03 2.85 1.4 1.03 1.4 -->
-90.0 -0.64429852792097750
-85.0 -0.65803784878515970
-80.0 -0.67367546323532410
-75.0 -0.69148835376736980
-70.0 -0.71179130570975040
-65.0 -0.73493212105552120
-60.0 -0.76127441823995780
-55.0 -0.79115479580170660
-50.0 -0.82478835297656280
-45.0 -0.86207184328003720
-40.0 -0.90218731471298370
-35.0 -0.94282786495867110
-30.0 -0.97874912755212280
-25.0 -0.99927325792190310
-20.0 -0.98471983766820350
-15.0 -0.90363984864415470
-10.0 -0.71770750752441240
-5.0 -0.40543502538657494
0.0 0.00000000000000000
5.0 0.40543502538657494
10.0 0.71770750752441240
15.0 0.90363984864415470
20.0 0.98471983766820350
25.0 0.99927325792190310
30.0 0.97874912755212280
35.0 0.94282786495867110
40.0 0.90218731471298370
45.0 0.86207184328003720
50.0 0.82478835297656280
55.0 0.79115479580170660
60.0 0.76127441823995780
65.0 0.73493212105552120
70.0 0.71179130570975040
75.0 0.69148835376736980
80.0 0.67367546323532410
85.0 0.65803784878515970
90.0 0.64429852792097750
</tableData>
</table>
<brake_group> NONE </brake_group> <brake_group> NONE </brake_group>
<retractable> 1 </retractable> <retractable> 1 </retractable>
</contact> </contact>
@ -30,6 +71,47 @@
<spring_coeff unit="LBS/FT"> 59785 </spring_coeff> <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff> <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer> <max_steer unit="DEG"> 0.0 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.06 2.8 0.4 1.03 0.4 -->
-90.0 -0.5760395836174765
-85.0 -0.5776440181093163
-80.0 -0.5803918992801416
-75.0 -0.5845010317001210
-70.0 -0.5902476568617109
-65.0 -0.5979865464058901
-60.0 -0.6081793463286825
-55.0 -0.6214348494943271
-50.0 -0.6385661913510731
-45.0 -0.6606706311692150
-40.0 -0.6892340269266316
-35.0 -0.7262408296125531
-30.0 -0.7741813043425955
-25.0 -0.8355026710967954
-20.0 -0.9097416834082445
-15.0 -0.9818532434458515
-10.0 -0.9824937511496707
-5.0 -0.7127565569007204
0.0 0.0000000000000000
5.0 0.7127565569007204
10.0 0.9824937511496707
15.0 0.9818532434458515
20.0 0.9097416834082445
25.0 0.8355026710967954
30.0 0.7741813043425955
35.0 0.7262408296125531
40.0 0.6892340269266316
45.0 0.6606706311692150
50.0 0.6385661913510731
55.0 0.6214348494943271
60.0 0.6081793463286825
65.0 0.5979865464058901
70.0 0.5902476568617109
75.0 0.5845010317001210
80.0 0.5803918992801416
85.0 0.5776440181093163
90.0 0.5760395836174765
</tableData>
</table>
<brake_group> LEFT </brake_group> <brake_group> LEFT </brake_group>
<retractable> 1 </retractable> <retractable> 1 </retractable>
</contact> </contact>
@ -45,6 +127,47 @@
<spring_coeff unit="LBS/FT"> 59785 </spring_coeff> <spring_coeff unit="LBS/FT"> 59785 </spring_coeff>
<damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff> <damping_coeff unit="LBS/FT/SEC"> 23957 </damping_coeff>
<max_steer unit="DEG"> 0.0 </max_steer> <max_steer unit="DEG"> 0.0 </max_steer>
<table name="CORNERING_COEFF" type="internal">
<tableData> <!-- jsbsim-pacejka.py 3.0 0.06 2.8 0.4 1.03 0.4 -->
-90.0 -0.5760395836174765
-85.0 -0.5776440181093163
-80.0 -0.5803918992801416
-75.0 -0.5845010317001210
-70.0 -0.5902476568617109
-65.0 -0.5979865464058901
-60.0 -0.6081793463286825
-55.0 -0.6214348494943271
-50.0 -0.6385661913510731
-45.0 -0.6606706311692150
-40.0 -0.6892340269266316
-35.0 -0.7262408296125531
-30.0 -0.7741813043425955
-25.0 -0.8355026710967954
-20.0 -0.9097416834082445
-15.0 -0.9818532434458515
-10.0 -0.9824937511496707
-5.0 -0.7127565569007204
0.0 0.0000000000000000
5.0 0.7127565569007204
10.0 0.9824937511496707
15.0 0.9818532434458515
20.0 0.9097416834082445
25.0 0.8355026710967954
30.0 0.7741813043425955
35.0 0.7262408296125531
40.0 0.6892340269266316
45.0 0.6606706311692150
50.0 0.6385661913510731
55.0 0.6214348494943271
60.0 0.6081793463286825
65.0 0.5979865464058901
70.0 0.5902476568617109
75.0 0.5845010317001210
80.0 0.5803918992801416
85.0 0.5776440181093163
90.0 0.5760395836174765
</tableData>
</table>
<brake_group> RIGHT </brake_group> <brake_group> RIGHT </brake_group>
<retractable> 1 </retractable> <retractable> 1 </retractable>
</contact> </contact>

28
Systems/fadec-cfm.xml
View file

@ -382,10 +382,16 @@
<value>MAN</value> <value>MAN</value>
</equals> </equals>
</or> </or>
<equals> <or>
<property>/it-autoflight/output/thr-mode</property> <equals>
<value>0</value> <property>/it-autoflight/output/thr-mode</property>
</equals> <value>0</value>
</equals>
<equals>
<property>/it-autoflight/mode/thr</property>
<value>RETARD</value>
</equals>
</or>
</and> </and>
</condition> </condition>
<value>0.3</value> <value>0.3</value>
@ -594,10 +600,16 @@
<value>MAN</value> <value>MAN</value>
</equals> </equals>
</or> </or>
<equals> <or>
<property>/it-autoflight/output/thr-mode</property> <equals>
<value>0</value> <property>/it-autoflight/output/thr-mode</property>
</equals> <value>0</value>
</equals>
<equals>
<property>/it-autoflight/mode/thr</property>
<value>RETARD</value>
</equals>
</or>
</and> </and>
</condition> </condition>
<value>0.3</value> <value>0.3</value>

36
Systems/fadec-iae.xml
View file

@ -183,7 +183,7 @@
<expression> <expression>
<table> <table>
<property>/fdm/jsbsim/atmosphere/density-altitude</property> <property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.6738</dep></entry> <entry><ind> 0</ind><dep>0.6740</dep></entry>
<entry><ind>42000</ind><dep>0.7570</dep></entry> <entry><ind>42000</ind><dep>0.7570</dep></entry>
</table> </table>
</expression> </expression>
@ -205,7 +205,7 @@
<property>/fdm/jsbsim/aero/alpha-deg</property> <property>/fdm/jsbsim/aero/alpha-deg</property>
</input> </input>
<input>0</input> <input>0</input>
<output>/fdm/jsbsim/aero/alpha-deg-norm</output> <output>/fdm/jsbsim/aero/alpha-deg-fixed</output>
</filter> </filter>
<filter> <filter>
@ -217,7 +217,7 @@
<difference> <difference>
<table> <table>
<property>/fdm/jsbsim/atmosphere/density-altitude</property> <property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.9867</dep></entry> <entry><ind> 0</ind><dep>0.9857</dep></entry>
<entry><ind>43000</ind><dep>0.8584</dep></entry> <entry><ind>43000</ind><dep>0.8584</dep></entry>
</table> </table>
<table> <table>
@ -229,7 +229,7 @@
<entry><ind>1.00</ind><dep>0.010</dep></entry> <entry><ind>1.00</ind><dep>0.010</dep></entry>
</table> </table>
<table> <table>
<property>/fdm/jsbsim/aero/alpha-deg-norm</property> <property>/fdm/jsbsim/aero/alpha-deg-fixed</property>
<entry><ind> 0.0</ind><dep>0.00</dep></entry> <entry><ind> 0.0</ind><dep>0.00</dep></entry>
<entry><ind> 7.5</ind><dep>0.01</dep></entry> <entry><ind> 7.5</ind><dep>0.01</dep></entry>
<entry><ind>17.0</ind><dep>0.03</dep></entry> <entry><ind>17.0</ind><dep>0.03</dep></entry>
@ -670,10 +670,16 @@
<value>MAN</value> <value>MAN</value>
</equals> </equals>
</or> </or>
<equals> <or>
<property>/it-autoflight/output/thr-mode</property> <equals>
<value>0</value> <property>/it-autoflight/output/thr-mode</property>
</equals> <value>0</value>
</equals>
<equals>
<property>/it-autoflight/mode/thr</property>
<value>RETARD</value>
</equals>
</or>
</and> </and>
</condition> </condition>
<value>0.3</value> <value>0.3</value>
@ -882,10 +888,16 @@
<value>MAN</value> <value>MAN</value>
</equals> </equals>
</or> </or>
<equals> <or>
<property>/it-autoflight/output/thr-mode</property> <equals>
<value>0</value> <property>/it-autoflight/output/thr-mode</property>
</equals> <value>0</value>
</equals>
<equals>
<property>/it-autoflight/mode/thr</property>
<value>RETARD</value>
</equals>
</or>
</and> </and>
</condition> </condition>
<value>0.3</value> <value>0.3</value>

20
Systems/fmgc-drivers.xml
View file

@ -506,6 +506,16 @@
<max-rate-of-change> <max-rate-of-change>
<condition> <condition>
<and> <and>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
<equals> <equals>
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>1</value> <value>1</value>
@ -570,16 +580,6 @@
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>7</value> <value>7</value>
</equals> </equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>4</value>
</equals>
</and>
</or> </or>
<or> <or>
<equals> <equals>

70
Systems/fmgc-pitch.xml
View file

@ -143,16 +143,6 @@
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>7</value> <value>7</value>
</equals> </equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>4</value>
</equals>
</and>
</or> </or>
<or> <or>
<equals> <equals>
@ -352,22 +342,10 @@
<gain>1.0</gain> <gain>1.0</gain>
<input> <input>
<condition> <condition>
<or> <equals>
<equals> <property>/it-autoflight/output/vert</property>
<property>/it-autoflight/output/vert</property> <value>0</value>
<value>0</value> </equals>
</equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>0</value>
</equals>
</and>
</or>
</condition> </condition>
<property>/it-autoflight/internal/target-fpm</property> <property>/it-autoflight/internal/target-fpm</property>
</input> </input>
@ -391,16 +369,6 @@
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>7</value> <value>7</value>
</equals> </equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>4</value>
</equals>
</and>
</or> </or>
</condition> </condition>
<property>/it-autoflight/internal/target-fpm-b</property> <property>/it-autoflight/internal/target-fpm-b</property>
@ -501,22 +469,10 @@
<input>/it-autoflight/internal/vert-speed-fpm</input> <input>/it-autoflight/internal/vert-speed-fpm</input>
<reference> <reference>
<condition> <condition>
<or> <equals>
<equals> <property>/it-autoflight/output/vert</property>
<property>/it-autoflight/output/vert</property> <value>0</value>
<value>0</value> </equals>
</equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>0</value>
</equals>
</and>
</or>
</condition> </condition>
<property>/it-autoflight/internal/target-fpm</property> <property>/it-autoflight/internal/target-fpm</property>
</reference> </reference>
@ -540,16 +496,6 @@
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/output/vert</property>
<value>7</value> <value>7</value>
</equals> </equals>
<and>
<equals>
<property>/it-autoflight/output/vert</property>
<value>8</value>
</equals>
<equals>
<property>/it-autoflight/output/vert-mng</property>
<value>4</value>
</equals>
</and>
</or> </or>
</condition> </condition>
<property>/it-autoflight/internal/target-fpm-b</property> <property>/it-autoflight/internal/target-fpm-b</property>

2
Systems/fmgc-roll-yaw.xml
View file

@ -284,7 +284,7 @@
</input> </input>
<input>0</input> <input>0</input>
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw --> <output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
<max-rate-of-change>0.6</max-rate-of-change> <max-rate-of-change>1.2</max-rate-of-change>
</filter> </filter>
</PropertyList> </PropertyList>

2
revision.txt
View file

@ -1 +1 @@
4780 4786