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

Merge https://github.com/FGMEMBERS/A320Family

Browse source
This commit is contained in:
omega13a 2017-06-16 21:43:39 -07:00
commit 064098e877
24 changed files with 299 additions and 10615 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
A320-main.xml
View file

@ -104,8 +104,11 @@
<sounde>
<seatbelt-sign type="bool">0</seatbelt-sign>
<no-smoking-sign type="bool">0</no-smoking-sign>
<oh-btn type="bool">0</oh-btn>
<oh-knb type="bool">0</oh-knb>
<btn1 type="bool">0</btn1>
<btn2 type="bool">0</btn2>
<btn3 type="bool">0</btn3>
<knb1 type="bool">0</knb1>
<switch1 type="bool">0</switch1>
</sounde>
<instrumentation>

4
Models/A320neo-CFM.xml
View file

@ -79,7 +79,7 @@
<model>
<name>Horizontal Stabilizer</name>
<path>Aircraft/A320Family/Models/Fuselages/A320/hstab.xml</path>
<path>Aircraft/A320Family/Models/Fuselages/A320neo/hstab.xml</path>
<offsets>
<x-m>34.1512207</x-m>
<pitch-deg>0.0</pitch-deg>
@ -88,7 +88,7 @@
<model>
<name>Vertical Stabilizer</name>
<path>Aircraft/A320Family/Models/Fuselages/A320/vstab.xml</path>
<path>Aircraft/A320Family/Models/Fuselages/A320neo/vstab.xml</path>
<offsets>
<x-m>32.2535728</x-m>
</offsets>

4
Models/A321neo-CFM.xml
View file

@ -78,7 +78,7 @@
<model>
<name>Horizontal Stabilizer</name>
<path>Aircraft/A320Family/Models/Fuselages/A321/hstab.xml</path>
<path>Aircraft/A320Family/Models/Fuselages/A321neo/hstab.xml</path>
<offsets>
<x-m>36.8212207</x-m>
<pitch-deg>0.0</pitch-deg>
@ -87,7 +87,7 @@
<model>
<name>Vertical Stabilizer</name>
<path>Aircraft/A320Family/Models/Fuselages/A321/vstab.xml</path>
<path>Aircraft/A320Family/Models/Fuselages/A321neo/vstab.xml</path>
<offsets>
<x-m>34.9235728</x-m>
</offsets>

10446
Models/Engines/Models/a320.nacelle.cfm.ac.bak
View file

File diff suppressed because it is too large Load diff

3
Models/Engines/XMLs/a320.nacelle.iae.xml
View file

@ -12,9 +12,8 @@
<animation>
<type>translate</type>
<object-name>Reverser</object-name>
<object-name>Nozzle</object-name>
<property alias="../../params/reverser-pos-norm" />
<factor>0.25</factor>
<factor>0.50</factor>
<axis>
<x>1</x>
<y>0</y>

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

@ -4667,7 +4667,7 @@
<animation>
<type>rotate</type>
<object-name>ParkBrk</object-name>
<property>controls/parking-brake</property>
<property>/controls/gear/brake-parking</property>
<factor>-90</factor>
<center>
<x-m>0.1270</x-m>
@ -4689,7 +4689,7 @@
<repeatable type="bool">false</repeatable>
<binding>
<command>property-toggle</command>
<property>controls/parking-brake</property>
<property>/controls/gear/brake-parking</property>
</binding>
</action>
</animation>

74
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -606,7 +606,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -673,7 +673,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -740,7 +740,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1047,7 +1047,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1119,7 +1119,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1152,7 +1152,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1219,7 +1219,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1286,7 +1286,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1353,7 +1353,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1421,7 +1421,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1486,7 +1486,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1551,7 +1551,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1616,7 +1616,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1680,7 +1680,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation-->
@ -1745,7 +1745,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1810,7 +1810,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1875,7 +1875,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1941,7 +1941,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -1996,7 +1996,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2051,7 +2051,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2171,7 +2171,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2247,7 +2247,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2322,7 +2322,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2393,7 +2393,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2431,7 +2431,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2536,7 +2536,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2726,7 +2726,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2803,7 +2803,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2878,7 +2878,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -2945,7 +2945,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3011,7 +3011,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3086,7 +3086,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3169,7 +3169,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3218,7 +3218,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3290,7 +3290,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3628,7 +3628,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
@ -3707,7 +3707,7 @@
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/btn1", 1);</script>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>

40
Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml
View file

@ -626,26 +626,26 @@
<object-name>Line6G</object-name>
<object-name>Line7G</object-name>
<object-name>Line8G</object-name>
<diffuse>
<red>0.2</red>
<green>0.4</green>
<blue>0.2</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>0.2</red>
<green>0.4</green>
<blue>0.2</blue>
</emission>
<diffuse>
<red>0</red>
<green>0.543</green>
<blue>0</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>0</red>
<green>0.543</green>
<blue>0</blue>
</emission>
</animation>
<!-- Blue -->

2
Nasal/MCDU/MCDU1.nas
View file

@ -577,7 +577,7 @@ var perfTOInput = func(key) {
setprop("/MCDU[0]/scratchpad", "");
} else {
var tfs = size(scratchpad);
if (tfs == 9) {
if (tfs >= 7 or tfs <= 9) {
var thracc = split("/", scratchpad);
var thrred = size(thracc[0]);
var acc = size(thracc[1]);

8
Nasal/MCDU/MCDU2.nas
View file

@ -69,9 +69,9 @@ var lskbutton = func(btn) {
radnavInput("L2");
} else if (getprop("/MCDU[1]/page") == "CLB") {
initInputA("L5"); # Does the same thing as on the INIT page
} else if (getprop("/MCDU[0]/page") == "CRZ") {
} else if (getprop("/MCDU[1]/page") == "CRZ") {
initInputA("L5");
} else if (getprop("/MCDU[0]/page") == "DES") {
} else if (getprop("/MCDU[1]/page") == "DES") {
initInputA("L5");
} else {
setprop("/MCDU[1]/scratchpad-msg", "1");
@ -121,7 +121,7 @@ var lskbutton = func(btn) {
perfCLBInput("L6");
} else if (getprop("/MCDU[1]/page") == "CRZ") {
perfCRZInput("L6");
} else if (getprop("/MCDU[0]/page") == "DES") {
} else if (getprop("/MCDU[1]/page") == "DES") {
perfDESInput("L6");
} else {
setprop("/MCDU[1]/scratchpad-msg", "1");
@ -577,7 +577,7 @@ var perfTOInput = func(key) {
setprop("/MCDU[1]/scratchpad", "");
} else {
var tfs = size(scratchpad);
if (tfs == 9) {
if (tfs >= 7 or tfs <= 9) {
var thracc = split("/", scratchpad);
var thrred = size(thracc[0]);
var acc = size(thracc[1]);

51
Nasal/electrical.nas
View file

@ -1,4 +1,5 @@
# Electrical system for A320 by Joshua Davidson (it0uchpods) and Johnathan Redpath (legoboyvdlp).
# A3XX Electrical System
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
#############
# Init Vars #
@ -173,7 +174,7 @@ var master_elec = func {
}
# Left DC bus yes?
if (extpwr_on and gen_ext_sw) {
if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
@ -181,7 +182,7 @@ var master_elec = func {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (stateL == 3 and gen1_sw and !gen1_fail) {
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
@ -202,7 +203,7 @@ var master_elec = func {
}
# Right DC bus yes?
if (extpwr_on and gen_ext_sw) {
if (stateR == 3 and gen2_sw and !gen2_fail) {
setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
@ -210,7 +211,7 @@ var master_elec = func {
setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else if (stateR == 3 and gen2_sw and !gen2_fail) {
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
@ -231,11 +232,11 @@ var master_elec = func {
}
# Left AC bus yes?
if (extpwr_on and gen_ext_sw) {
if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
} else if (gen_apu and !genapu_fail) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
} else if (stateL == 3 and gen1_sw and !gen1_fail) {
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
} else if (apu_ext_crosstie_sw == 1 and xtieL) {
setprop("/systems/electrical/bus/ac1", ac_volt_std);
@ -246,11 +247,11 @@ var master_elec = func {
}
# Right AC bus yes?
if (extpwr_on and gen_ext_sw) {
if (stateR == 3 and gen2_sw and !gen2_fail) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
} else if (gen_apu and !genapu_fail) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
} else if (stateR == 3 and gen2_sw and !gen2_fail) {
} else if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
} else if (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/ac2", ac_volt_std);
@ -261,22 +262,6 @@ var master_elec = func {
}
# HZ/Volts yes?
if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
setprop("/systems/electrical/extra/ext-hz", ac_hz_std);
} else {
setprop("/systems/electrical/extra/ext-volts", 0);
setprop("/systems/electrical/extra/ext-hz", 0);
}
if (gen_apu and !genapu_fail) {
setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
setprop("/systems/electrical/extra/apu-hz", ac_hz_std);
} else {
setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/apu-hz", 0);
}
if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/extra/gen1-volts", ac_volt_std);
setprop("/systems/electrical/bus/gen1-hz", ac_hz_std);
@ -293,6 +278,22 @@ var master_elec = func {
setprop("/systems/electrical/bus/gen2-hz", 0);
}
if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
setprop("/systems/electrical/extra/ext-hz", ac_hz_std);
} else {
setprop("/systems/electrical/extra/ext-volts", 0);
setprop("/systems/electrical/extra/ext-hz", 0);
}
if (gen_apu and !genapu_fail) {
setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
setprop("/systems/electrical/extra/apu-hz", ac_hz_std);
} else {
setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/apu-hz", 0);
}
var ac1 = getprop("/systems/electrical/bus/ac1");
var ac2 = getprop("/systems/electrical/bus/ac2");

32
Nasal/fadec.nas
View file

@ -14,7 +14,7 @@ setprop("/engines/flx-thr", 0.0);
setlistener("/sim/signals/fdm-initialized", func {
setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", 1.308);
setprop("/controls/engines/n1-limit", 101.8);
setprop("/controls/engines/n1-limit", 95.9);
setprop("/systems/thrust/state1", "IDLE");
setprop("/systems/thrust/state2", "IDLE");
setprop("/systems/thrust/lvrclb", "0");
@ -47,9 +47,9 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
setprop("/it-autoflight/input/athr", 1);
if (getprop("/controls/engines/thrust-limit") == "FLX") {
var derate = getprop("/engines/flex-derate");
setprop("/controls/engines/engine[0]/throttle-fdm", 0.95 - derate);
setprop("/controls/engines/engine[0]/throttle-fdm", 0.88 - derate);
} else {
setprop("/controls/engines/engine[0]/throttle-fdm", 0.90);
setprop("/controls/engines/engine[0]/throttle-fdm", 0.84);
}
setprop("/systems/thrust/state1", "MCT");
} else if (thrr >= 0.83 and thrr < 0.95) {
@ -58,7 +58,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
unflex();
} else if (thrr >= 0.95) {
setprop("/it-autoflight/input/athr", 1);
setprop("/controls/engines/engine[0]/throttle-fdm", 0.95);
setprop("/controls/engines/engine[0]/throttle-fdm", 0.88);
setprop("/systems/thrust/state1", "TOGA");
unflex();
}
@ -78,7 +78,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
} else if (thrr >= 0.95) {
setprop("/systems/thrust/state1", "TOGA");
}
setprop("/controls/engines/engine[0]/throttle-fdm", 0.95);
setprop("/controls/engines/engine[0]/throttle-fdm", 0.88);
}
});
@ -102,9 +102,9 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
setprop("/it-autoflight/input/athr", 1);
if (getprop("/controls/engines/thrust-limit") == "FLX") {
var derate = getprop("/engines/flex-derate");
setprop("/controls/engines/engine[1]/throttle-fdm", 0.95 - derate);
setprop("/controls/engines/engine[1]/throttle-fdm", 0.88 - derate);
} else {
setprop("/controls/engines/engine[1]/throttle-fdm", 0.90);
setprop("/controls/engines/engine[1]/throttle-fdm", 0.84);
}
setprop("/systems/thrust/state2", "MCT");
} else if (thrr >= 0.83 and thrr < 0.95) {
@ -113,7 +113,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
unflex();
} else if (thrr >= 0.95) {
setprop("/it-autoflight/input/athr", 1);
setprop("/controls/engines/engine[1]/throttle-fdm", 0.95);
setprop("/controls/engines/engine[1]/throttle-fdm", 0.88);
setprop("/systems/thrust/state2", "TOGA");
unflex();
}
@ -133,7 +133,7 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
} else if (thrr >= 0.95) {
setprop("/systems/thrust/state2", "TOGA");
}
setprop("/controls/engines/engine[1]/throttle-fdm", 0.95);
setprop("/controls/engines/engine[1]/throttle-fdm", 0.88);
}
});
@ -177,19 +177,19 @@ var thrust_lim = func {
if ((state1 == "TOGA" or state2 == "TOGA" or (state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) or getprop("/systems/thrust/alpha-floor") == 1 or getprop("/systems/thrust/toga-lk") == 1) {
setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", eprtoga);
setprop("/controls/engines/n1-limit", 101.8);
setprop("/controls/engines/n1-limit", 95.9);
} else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 0) {
setprop("/controls/engines/thrust-limit", "MCT");
setprop("/controls/engines/epr-limit", eprmct);
setprop("/controls/engines/n1-limit", 97.7);
setprop("/controls/engines/n1-limit", 92.6);
} else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 1) {
setprop("/controls/engines/thrust-limit", "FLX");
setprop("/controls/engines/epr-limit", eprmct);
setprop("/controls/engines/n1-limit", 97.7);
setprop("/controls/engines/epr-limit", eprflx);
setprop("/controls/engines/n1-limit", n1flx);
} else if (state1 == "CL" or state2 == "CL" or state1 == "MAN" or state2 == "MAN" or state1 == "IDLE" or state2 == "IDLE") {
setprop("/controls/engines/thrust-limit", "CLB");
setprop("/controls/engines/epr-limit", eprclb);
setprop("/controls/engines/n1-limit", 91.9);
setprop("/controls/engines/n1-limit", 89.2);
}
} else if (getprop("/FMGC/internal/flex-set") == 1) {
setprop("/systems/thrust/lim-flex", 1);
@ -199,7 +199,7 @@ var thrust_lim = func {
} else {
setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", eprtoga);
setprop("/controls/engines/n1-limit", 101.8);
setprop("/controls/engines/n1-limit", 95.9);
}
}
@ -213,7 +213,7 @@ var unflex = func {
var thrust_loop = func {
var derate = getprop("/engines/flex-derate");
setprop("/engines/flx-thr", 0.95 - derate);
setprop("/engines/flx-thr", 0.88 - derate);
var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2");
if ((state1 == "CL") and (state2 == "CL")) {

2
Nasal/hydraulics.nas
View file

@ -1,4 +1,4 @@
# A320 Hydraulic System
# A3XX Hydraulic System
# Joshua Davidson (it0uchpods)
#############

20
Nasal/libraries.nas
View file

@ -79,6 +79,24 @@ setlistener("/sim/sounde/btn1", func {
}, 0.05);
});
setlistener("/sim/sounde/oh-btn", func {
if (!getprop("/sim/sounde/oh-btn")) {
return;
}
settimer(func {
props.globals.getNode("/sim/sounde/oh-btn").setBoolValue(0);
}, 0.05);
});
setlistener("/sim/sounde/btn3", func {
if (!getprop("/sim/sounde/btn3")) {
return;
}
settimer(func {
props.globals.getNode("/sim/sounde/btn3").setBoolValue(0);
}, 0.05);
});
setlistener("/sim/sounde/knb1", func {
if (!getprop("/sim/sounde/knb1")) {
return;
@ -108,7 +126,7 @@ setlistener("/controls/switches/no-smoking-sign", func {
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(1);
settimer(func {
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(0);
}, 2);
}, 1);
});
#########

2
Nasal/pneumatics.nas
View file

@ -1,4 +1,4 @@
# A3XX Pneumatics System
# A3XX Pneumatic System
# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp)
#############

26
Sounds/A320-common-sound.xml
View file

@ -713,6 +713,30 @@
</volume>
</switch>
<switch>
<name>ButtonOH</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/Cockpit/button2.wav</path>
<condition>
<property>/sim/sounde/oh-btn</property>
</condition>
<volume>
<factor>0.75</factor>
</volume>
</switch>
<switch>
<name>Button3</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/Cockpit/button3.wav</path>
<condition>
<property>/sim/sounde/btn3</property>
</condition>
<volume>
<factor>0.75</factor>
</volume>
</switch>
<switch>
<name>Knob</name>
<mode>once</mode>
@ -733,7 +757,7 @@
<property>/sim/sounde/switch1</property>
</condition>
<volume>
<factor>0.60</factor>
<factor>0.75</factor>
</volume>
</switch>

BIN
Sounds/Cockpit/button2.wav Normal file
View file

Binary file not shown.

BIN
Sounds/Cockpit/button3.wav Normal file
View file

Binary file not shown.

BIN
Sounds/Cockpit/switch.wav
View file

Binary file not shown.

15
Systems/a319-aerodynamics.xml
View file

@ -82,11 +82,11 @@
<table>
<independentVar lookup="row">aero/alpha-rad</independentVar>
<tableData>
-1.57 1.260
-0.26 0.018
-1.57 1.275
-0.26 0.025
0.00 0.008
0.26 0.017
1.57 1.320
0.26 0.019
1.57 1.322
</tableData>
</table>
</product>
@ -111,8 +111,7 @@
<independentVar lookup="row">velocities/mach</independentVar>
<tableData>
0.00 0.000
0.79 0.000
1.10 0.023
1.10 0.018
1.80 0.015
</tableData>
</table>
@ -125,7 +124,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/flap-pos-deg</property>
<value> 0.00080 </value>
<value> 0.00110 </value>
</product>
</function>
@ -155,7 +154,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/speedbrake-pos-norm</property>
<value>0.035</value>
<value>0.025</value>
</product>
</function>

15
Systems/a320-aerodynamics.xml
View file

@ -82,11 +82,11 @@
<table>
<independentVar lookup="row">aero/alpha-rad</independentVar>
<tableData>
-1.57 1.260
-0.26 0.018
-1.57 1.275
-0.26 0.025
0.00 0.008
0.26 0.017
1.57 1.320
0.26 0.019
1.57 1.322
</tableData>
</table>
</product>
@ -111,8 +111,7 @@
<independentVar lookup="row">velocities/mach</independentVar>
<tableData>
0.00 0.000
0.79 0.000
1.10 0.023
1.10 0.018
1.80 0.015
</tableData>
</table>
@ -125,7 +124,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/flap-pos-deg</property>
<value> 0.00080 </value>
<value> 0.00110 </value>
</product>
</function>
@ -155,7 +154,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/speedbrake-pos-norm</property>
<value>0.035</value>
<value>0.025</value>
</product>
</function>

15
Systems/a321-aerodynamics.xml
View file

@ -82,11 +82,11 @@
<table>
<independentVar lookup="row">aero/alpha-rad</independentVar>
<tableData>
-1.57 1.260
-0.26 0.018
-1.57 1.275
-0.26 0.025
0.00 0.008
0.26 0.017
1.57 1.320
0.26 0.019
1.57 1.322
</tableData>
</table>
</product>
@ -111,8 +111,7 @@
<independentVar lookup="row">velocities/mach</independentVar>
<tableData>
0.00 0.000
0.79 0.000
1.10 0.023
1.10 0.018
1.80 0.015
</tableData>
</table>
@ -125,7 +124,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/flap-pos-deg</property>
<value> 0.00080 </value>
<value> 0.00110 </value>
</product>
</function>
@ -155,7 +154,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>fcs/speedbrake-pos-norm</property>
<value>0.035</value>
<value>0.025</value>
</product>
</function>

66
Systems/fadec-cfm.xml
View file

@ -16,11 +16,11 @@
<property>/controls/engines/engine[0]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
<entry><ind>0.83</ind><dep>0.90</dep></entry>
<entry><ind>0.95</ind><dep>0.95</dep></entry>
<entry><ind>0.60</ind><dep>0.80</dep></entry>
<entry><ind>0.65</ind><dep>0.80</dep></entry>
<entry><ind>0.78</ind><dep>0.84</dep></entry>
<entry><ind>0.83</ind><dep>0.84</dep></entry>
<entry><ind>0.95</ind><dep>0.88</dep></entry>
</table>
</expression>
</input>
@ -38,11 +38,11 @@
<property>/controls/engines/engine[1]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
<entry><ind>0.83</ind><dep>0.90</dep></entry>
<entry><ind>0.95</ind><dep>0.95</dep></entry>
<entry><ind>0.60</ind><dep>0.80</dep></entry>
<entry><ind>0.65</ind><dep>0.80</dep></entry>
<entry><ind>0.78</ind><dep>0.84</dep></entry>
<entry><ind>0.83</ind><dep>0.84</dep></entry>
<entry><ind>0.95</ind><dep>0.88</dep></entry>
</table>
</expression>
</input>
@ -54,12 +54,33 @@
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<condition>
<and>
<equals>
<property>/controls/engines/thrust-limit</property>
<value>FLX</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MCT</value>
</equals>
</and>
</condition>
<expression>
<table>
<property>/engines/flx-thr</property>
<entry><ind>0.00</ind><dep> 22.4</dep></entry>
<entry><ind>1.00</ind><dep>105.8</dep></entry>
</table>
</expression>
</input>
<input>
<expression>
<table>
<property>/controls/engines/engine[0]/throttle-man</property>
<entry><ind>0.00</ind><dep> 22.4</dep></entry>
<entry><ind>0.95</ind><dep>101.7</dep></entry>
<entry><ind>1.00</ind><dep>105.8</dep></entry>
</table>
</expression>
</input>
@ -71,12 +92,33 @@
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<condition>
<and>
<equals>
<property>/controls/engines/thrust-limit</property>
<value>FLX</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
</and>
</condition>
<expression>
<table>
<property>/engines/flx-thr</property>
<entry><ind>0.00</ind><dep> 22.4</dep></entry>
<entry><ind>1.00</ind><dep>105.8</dep></entry>
</table>
</expression>
</input>
<input>
<expression>
<table>
<property>/controls/engines/engine[1]/throttle-man</property>
<entry><ind>0.00</ind><dep> 22.4</dep></entry>
<entry><ind>0.95</ind><dep>101.7</dep></entry>
<entry><ind>1.00</ind><dep>105.8</dep></entry>
</table>
</expression>
</input>

78
Systems/fadec-iae.xml
View file

@ -16,11 +16,11 @@
<property>/controls/engines/engine[0]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
<entry><ind>0.83</ind><dep>0.90</dep></entry>
<entry><ind>0.95</ind><dep>0.95</dep></entry>
<entry><ind>0.60</ind><dep>0.80</dep></entry>
<entry><ind>0.65</ind><dep>0.80</dep></entry>
<entry><ind>0.78</ind><dep>0.84</dep></entry>
<entry><ind>0.83</ind><dep>0.84</dep></entry>
<entry><ind>0.95</ind><dep>0.88</dep></entry>
</table>
</expression>
</input>
@ -38,11 +38,11 @@
<property>/controls/engines/engine[1]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
<entry><ind>0.83</ind><dep>0.90</dep></entry>
<entry><ind>0.95</ind><dep>0.95</dep></entry>
<entry><ind>0.60</ind><dep>0.80</dep></entry>
<entry><ind>0.65</ind><dep>0.80</dep></entry>
<entry><ind>0.78</ind><dep>0.84</dep></entry>
<entry><ind>0.83</ind><dep>0.84</dep></entry>
<entry><ind>0.95</ind><dep>0.88</dep></entry>
</table>
</expression>
</input>
@ -58,8 +58,8 @@
<expression>
<table>
<property>/position/altitude-ft</property>
<entry><ind> 0</ind><dep>0.441</dep></entry>
<entry><ind>42000</ind><dep>0.671</dep></entry>
<entry><ind> 0</ind><dep>0.444</dep></entry>
<entry><ind>42000</ind><dep>0.684</dep></entry>
</table>
</expression>
</input>
@ -76,7 +76,7 @@
<table>
<property>/position/altitude-ft</property>
<entry><ind> 0</ind><dep>0.992</dep></entry>
<entry><ind>13000</ind><dep>0.979</dep></entry>
<entry><ind>13000</ind><dep>0.977</dep></entry>
<entry><ind>42000</ind><dep>0.969</dep></entry>
</table>
</expression>
@ -125,6 +125,29 @@
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<condition>
<and>
<equals>
<property>/controls/engines/thrust-limit</property>
<value>FLX</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MCT</value>
</equals>
</and>
</condition>
<expression>
<table>
<property>/engines/flx-thr</property>
<entry><ind>0.000</ind><dep>0.03</dep></entry>
<entry><ind>0.141</ind><dep>0.20</dep></entry>
<entry><ind>1.000</ind><dep>1.00</dep></entry>
</table>
</expression>
<scale>/engines/epr-scale</scale>
</input>
<input>
<expression>
<table>
@ -196,6 +219,29 @@
<type>gain</type>
<gain>1</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<condition>
<and>
<equals>
<property>/controls/engines/thrust-limit</property>
<value>FLX</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
</and>
</condition>
<expression>
<table>
<property>/engines/flx-thr</property>
<entry><ind>0.000</ind><dep>0.03</dep></entry>
<entry><ind>0.141</ind><dep>0.20</dep></entry>
<entry><ind>1.000</ind><dep>1.00</dep></entry>
</table>
</expression>
<scale>/engines/epr-scale</scale>
</input>
<input>
<expression>
<table>
@ -560,7 +606,7 @@
<input>
<expression>
<table>
<value>0.95</value>
<value>0.88</value>
<entry><ind>0.000</ind><dep>0.03</dep></entry>
<entry><ind>0.141</ind><dep>0.20</dep></entry>
<entry><ind>1.000</ind><dep>1.00</dep></entry>
@ -595,7 +641,7 @@
<input>
<expression>
<table>
<value>0.90</value>
<value>0.84</value>
<entry><ind>0.000</ind><dep>0.03</dep></entry>
<entry><ind>0.141</ind><dep>0.20</dep></entry>
<entry><ind>1.000</ind><dep>1.00</dep></entry>
@ -665,7 +711,7 @@
<input>
<expression>
<table>
<value>0.83</value>
<value>0.80</value>
<entry><ind>0.000</ind><dep>0.03</dep></entry>
<entry><ind>0.141</ind><dep>0.20</dep></entry>
<entry><ind>1.000</ind><dep>1.00</dep></entry>