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

Merge branch 'master' into FDM

Browse source
This commit is contained in:
Joshua Davidson 2017-12-27 13:12:54 -05:00
commit 095dd60e48
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Models/Instruments/PFD/PFD.nas
View file

@ -276,11 +276,15 @@ var canvas_PFD_base = {
me["FMA_flxtemp"].hide(); me["FMA_flxtemp"].hide();
} }
if ((state1 == "CL" and state2 != "CL") or (state1 != "CL" and state2 == "CL") and getprop("/systems/thrust/eng-out") != 1) {
me["FMA_lvrclb"].setText("LVR ASYM");
} else {
if (getprop("/systems/thrust/eng-out") == 1) { if (getprop("/systems/thrust/eng-out") == 1) {
me["FMA_lvrclb"].setText("LVR MCT"); me["FMA_lvrclb"].setText("LVR MCT");
} else { } else {
me["FMA_lvrclb"].setText("LVR CLB"); me["FMA_lvrclb"].setText("LVR CLB");
} }
}
if (athr == 1 and getprop("/systems/thrust/lvrclb") == 1) { if (athr == 1 and getprop("/systems/thrust/lvrclb") == 1) {
me["FMA_lvrclb"].show(); me["FMA_lvrclb"].show();

16
Nasal/fadec-common.nas
View file

@ -21,7 +21,7 @@ setprop("/controls/engines/epr-limit", 0.0);
setprop("/controls/engines/n1-limit", 0.0); setprop("/controls/engines/n1-limit", 0.0);
setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state1", "IDLE");
setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/state2", "IDLE");
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", 0);
setprop("/systems/thrust/clbreduc-ft", "1500"); setprop("/systems/thrust/clbreduc-ft", "1500");
setprop("/systems/thrust/toga-lim", 0.0); setprop("/systems/thrust/toga-lim", 0.0);
setprop("/systems/thrust/mct-lim", 0.0); setprop("/systems/thrust/mct-lim", 0.0);
@ -272,25 +272,27 @@ var thrust_loop = func {
} }
if (state1 == "CL" and state2 == "CL" and getprop("/systems/thrust/eng-out") != 1) { if (state1 == "CL" and state2 == "CL" and getprop("/systems/thrust/eng-out") != 1) {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", 0);
} else if (state1 == "MCT" and state2 == "MCT" and getprop("/systems/thrust/lim-flex") != 1 and getprop("/systems/thrust/eng-out") == 1) { } else if (state1 == "MCT" and state2 == "MCT" and getprop("/systems/thrust/lim-flex") != 1 and getprop("/systems/thrust/eng-out") == 1) {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", 0);
} else { } else {
var status = getprop("/systems/thrust/lvrclb"); var status = getprop("/systems/thrust/lvrclb");
if (status == 0) { if (status == 0) {
if (getprop("/gear/gear[0]/wow") == 0) { if (getprop("/gear/gear[0]/wow") == 0) {
if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") { if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") {
setprop("/systems/thrust/lvrclb", "1"); setprop("/systems/thrust/lvrclb", 1);
} else { } else {
if (getprop("/instrumentation/altimeter/indicated-altitude-ft") >= getprop("/systems/thrust/clbreduc-ft") and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) { if (getprop("/instrumentation/altimeter/indicated-altitude-ft") >= getprop("/systems/thrust/clbreduc-ft") and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
setprop("/systems/thrust/lvrclb", "1"); setprop("/systems/thrust/lvrclb", 1);
} else if ((state1 == "CL" and state2 != "CL") or (state1 != "CL" and state2 == "CL") and getprop("/systems/thrust/eng-out") != 1) {
setprop("/systems/thrust/lvrclb", 1);
} else { } else {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", 0);
} }
} }
} }
} else if (status == 1) { } else if (status == 1) {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", 0);
} }
} }

2
revision.txt
View file

@ -1 +1 @@
4113 4114