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

A3XX: FADEC Improvement

Browse source
This commit is contained in:
Joshua Davidson 2017-11-02 10:09:59 -04:00
parent 06384b53fb
commit 2b38f150c9
5 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/Instruments/PFD/PFD1.xml
View file

@ -2198,6 +2198,7 @@
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>
<or>
<not-equals> <not-equals>
<property>modes/pfd/fma/pitch-mode-armed</property> <property>modes/pfd/fma/pitch-mode-armed</property>
<value> </value> <value> </value>
@ -2206,6 +2207,7 @@
<property>modes/pfd/fma/pitch-mode2-armed</property> <property>modes/pfd/fma/pitch-mode2-armed</property>
<value> </value> <value> </value>
</not-equals> </not-equals>
</or>
</and> </and>
</condition> </condition>
</animation> </animation>

2
Models/Instruments/PFD/PFD2.xml
View file

@ -2198,6 +2198,7 @@
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>
<or>
<not-equals> <not-equals>
<property>modes/pfd/fma/pitch-mode-armed</property> <property>modes/pfd/fma/pitch-mode-armed</property>
<value> </value> <value> </value>
@ -2206,6 +2207,7 @@
<property>modes/pfd/fma/pitch-mode2-armed</property> <property>modes/pfd/fma/pitch-mode2-armed</property>
<value> </value> <value> </value>
</not-equals> </not-equals>
</or>
</and> </and>
</condition> </condition>
</animation> </animation>

4
Nasal/PFD_FMA.nas
View file

@ -107,7 +107,9 @@ var loopFMA = maketimer(0.05, func {
var thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); var thr1 = getprop("/controls/engines/engine[0]/throttle-pos");
var thr2 = getprop("/controls/engines/engine[1]/throttle-pos"); var thr2 = getprop("/controls/engines/engine[1]/throttle-pos");
var wow = getprop("/gear/gear[0]/wow"); var wow = getprop("/gear/gear[0]/wow");
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)))) { var engstate1 = getprop("/engines/engine[0]/state");
var engstate2 = getprop("/engines/engine[1]/state");
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); setprop("/it-autoflight/input/vert", 7);

24
Nasal/fadec-common.nas
View file

@ -35,6 +35,8 @@ setlistener("/sim/signals/fdm-initialized", func {
var thr2 = getprop("/controls/engines/engine[1]/throttle-pos"); var thr2 = getprop("/controls/engines/engine[1]/throttle-pos");
var state1 = getprop("/systems/thrust/state1"); var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2"); var state2 = getprop("/systems/thrust/state2");
var engstate1 = getprop("/engines/engine[0]/state");
var engstate2 = getprop("/engines/engine[1]/state");
var eprtoga = getprop("/systems/thrust/epr/toga-lim"); var eprtoga = getprop("/systems/thrust/epr/toga-lim");
var eprmct = getprop("/systems/thrust/epr/mct-lim"); var eprmct = getprop("/systems/thrust/epr/mct-lim");
var eprflx = getprop("/systems/thrust/epr/flx-lim"); var eprflx = getprop("/systems/thrust/epr/flx-lim");
@ -50,6 +52,8 @@ setlistener("/sim/signals/fdm-initialized", func {
}); });
setlistener("/controls/engines/engine[0]/throttle-pos", func { setlistener("/controls/engines/engine[0]/throttle-pos", func {
engstate1 = getprop("/engines/engine[0]/state");
engstate2 = getprop("/engines/engine[1]/state");
thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); thr1 = getprop("/controls/engines/engine[0]/throttle-pos");
if (getprop("/systems/thrust/alpha-floor") == 0 and getprop("/systems/thrust/toga-lk") == 0) { if (getprop("/systems/thrust/alpha-floor") == 0 and getprop("/systems/thrust/toga-lk") == 0) {
if (thr1 < 0.01) { if (thr1 < 0.01) {
@ -66,23 +70,20 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
setprop("/systems/thrust/state1", "MAN THR"); setprop("/systems/thrust/state1", "MAN THR");
unflex(); unflex();
} else if (thr1 >= 0.78 and thr1 < 0.83) { } else if (thr1 >= 0.78 and thr1 < 0.83) {
if (getprop("/gear/gear[0]/wow") == 1) { if (getprop("/controls/engines/thrust-limit") == "FLX") {
if (getprop("/gear/gear[0]/wow") == 1 and (engstate1 == 3 or engstate2 == 3)) {
setprop("/it-autoflight/input/athr", 1); setprop("/it-autoflight/input/athr", 1);
} }
if (getprop("/controls/engines/thrust-limit") == "FLX") {
setprop("/controls/engines/engine[0]/throttle-fdm", 0.99); setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
} else { } else {
setprop("/controls/engines/engine[0]/throttle-fdm", 0.95); setprop("/controls/engines/engine[0]/throttle-fdm", 0.95);
} }
setprop("/systems/thrust/state1", "MCT"); setprop("/systems/thrust/state1", "MCT");
} else if (thr1 >= 0.83 and thr1 < 0.95) { } else if (thr1 >= 0.83 and thr1 < 0.95) {
if (getprop("/gear/gear[0]/wow") == 1) {
setprop("/it-autoflight/input/athr", 1);
}
setprop("/systems/thrust/state1", "MAN THR"); setprop("/systems/thrust/state1", "MAN THR");
unflex(); unflex();
} else if (thr1 >= 0.95) { } else if (thr1 >= 0.95) {
if (getprop("/gear/gear[0]/wow") == 1) { if (getprop("/gear/gear[0]/wow") == 1 and (engstate1 == 3 or engstate2 == 3)) {
setprop("/it-autoflight/input/athr", 1); setprop("/it-autoflight/input/athr", 1);
} }
setprop("/controls/engines/engine[0]/throttle-fdm", 0.99); setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
@ -110,6 +111,8 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
}); });
setlistener("/controls/engines/engine[1]/throttle-pos", func { setlistener("/controls/engines/engine[1]/throttle-pos", func {
engstate1 = getprop("/engines/engine[0]/state");
engstate2 = getprop("/engines/engine[1]/state");
thr2 = getprop("/controls/engines/engine[1]/throttle-pos"); thr2 = getprop("/controls/engines/engine[1]/throttle-pos");
if (getprop("/systems/thrust/alpha-floor") == 0 and getprop("/systems/thrust/toga-lk") == 0) { if (getprop("/systems/thrust/alpha-floor") == 0 and getprop("/systems/thrust/toga-lk") == 0) {
if (thr2 < 0.01) { if (thr2 < 0.01) {
@ -126,23 +129,20 @@ setlistener("/controls/engines/engine[1]/throttle-pos", func {
setprop("/systems/thrust/state2", "MAN THR"); setprop("/systems/thrust/state2", "MAN THR");
unflex(); unflex();
} else if (thr2 >= 0.78 and thr2 < 0.83) { } else if (thr2 >= 0.78 and thr2 < 0.83) {
if (getprop("/gear/gear[0]/wow") == 1) { if (getprop("/controls/engines/thrust-limit") == "FLX") {
if (getprop("/gear/gear[0]/wow") == 1 and (engstate1 == 3 or engstate2 == 3)) {
setprop("/it-autoflight/input/athr", 1); setprop("/it-autoflight/input/athr", 1);
} }
if (getprop("/controls/engines/thrust-limit") == "FLX") {
setprop("/controls/engines/engine[1]/throttle-fdm", 0.99); setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
} else { } else {
setprop("/controls/engines/engine[1]/throttle-fdm", 0.95); setprop("/controls/engines/engine[1]/throttle-fdm", 0.95);
} }
setprop("/systems/thrust/state2", "MCT"); setprop("/systems/thrust/state2", "MCT");
} else if (thr2 >= 0.83 and thr2 < 0.95) { } else if (thr2 >= 0.83 and thr2 < 0.95) {
if (getprop("/gear/gear[0]/wow") == 1) {
setprop("/it-autoflight/input/athr", 1);
}
setprop("/systems/thrust/state2", "MAN THR"); setprop("/systems/thrust/state2", "MAN THR");
unflex(); unflex();
} else if (thr2 >= 0.95) { } else if (thr2 >= 0.95) {
if (getprop("/gear/gear[0]/wow") == 1) { if (getprop("/gear/gear[0]/wow") == 1 and (engstate1 == 3 or engstate2 == 3)) {
setprop("/it-autoflight/input/athr", 1); setprop("/it-autoflight/input/athr", 1);
} }
setprop("/controls/engines/engine[1]/throttle-fdm", 0.99); setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);

2
revision.txt
View file

@ -1 +1 @@
3041 3042