GIT: Merge master

This commit is contained in:
Joshua Davidson 2019-01-29 19:30:29 -05:00
commit b6a525d970
4 changed files with 13 additions and 79 deletions
Models/Instruments/MCDU
Nasal
revision.txt

View file

@ -6,8 +6,6 @@ var MCDU_1 = nil;
var MCDU_2 = nil;
var MCDU1_display = nil;
var MCDU2_display = nil;
var updateL = 0;
var updateR = 0;
var default = "BoeingCDU-Large.ttf";
var symbol = "helvetica_medium.txf";
var normal = 70;
@ -93,31 +91,17 @@ var canvas_MCDU_base = {
update: func() {
if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/controls/lighting/DU/mcdu1") > 0.01) {
MCDU_1.update();
MCDU_1.updateFast();
updateL = 1;
MCDU_1.page.show();
} else {
updateL = 0;
MCDU_1.page.hide();
}
if (getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/mcdu2") > 0.01) {
MCDU_2.update();
MCDU_2.updateFast();
updateR = 1;
MCDU_2.page.show();
} else {
updateR = 0;
MCDU_2.page.hide();
}
},
updateFast: func() {
if (updateL) {
MCDU_1.updateFast();
}
if (updateR) {
MCDU_2.updateFast();
}
},
updateCommon: func(i) {
page = getprop("/MCDU[" ~ i ~ "]/page");
if (page == "MCDU") {
@ -1366,8 +1350,7 @@ var canvas_MCDU_base = {
setprop("/MCDU[" ~ i ~ "]/internal/switch", 1);
}
}
},
updateCommonFast: func(i) {
me["Scratchpad"].setText(sprintf("%s", getprop("/MCDU[" ~ i ~ "]/scratchpad")));
},
# ack = ignore, wht = white, grn = green, blu = blue, amb = amber, yel = yellow
@ -1684,9 +1667,6 @@ var canvas_MCDU_1 = {
update: func() {
me.updateCommon(0);
},
updateFast: func() {
me.updateCommonFast(0);
},
};
var canvas_MCDU_2 = {
@ -1699,9 +1679,6 @@ var canvas_MCDU_2 = {
update: func() {
me.updateCommon(1);
},
updateFast: func() {
me.updateCommonFast(1);
},
};
setlistener("sim/signals/fdm-initialized", func {
@ -1726,17 +1703,12 @@ setlistener("sim/signals/fdm-initialized", func {
MCDU_2 = canvas_MCDU_2.new(group_MCDU2, "Aircraft/IDG-A32X/Models/Instruments/MCDU/res/mcdu.svg");
MCDU_update.start();
MCDU_update_fast.start();
});
var MCDU_update = maketimer(0.2, func {
var MCDU_update = maketimer(0.125, func {
canvas_MCDU_base.update();
});
var MCDU_update_fast = maketimer(0.125, func {
canvas_MCDU_base.updateFast();
});
var showMCDU1 = func {
gui.showDialog("mcdu1");
}
@ -1747,8 +1719,8 @@ var showMCDU2 = func {
setlistener("/MCDU[0]/page", func {
setprop("/MCDU[0]/internal/switch", 0);
});
}, 0, 0);
setlistener("/MCDU[1]/page", func {
setprop("/MCDU[1]/internal/switch", 0);
});
}, 0, 0);

View file

@ -197,7 +197,6 @@ var ECAM = {
}
# AP / ATHR warnings
# No evidence found that re-engagement disconnects warnings - if anyone has any evidence to the contrary let me know
if (ap_active == 1 and getprop("/it-autoflight/output/ap-warning") == 0) {
ap_active = 0;
} elsif (ap_active == 1 and getprop("/it-autoflight/output/ap-warning") == 1 and getprop("/sim/time/elapsed-sec") > (getprop("/ECAM/ap-off-time") + 9)) {
@ -211,6 +210,10 @@ var ECAM = {
setprop("/ECAM/warnings/master-warning-light", 0);
}
if (getprop("/it-autoflight/output/ap-warning") == 2 and (getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1)) {
setprop("/it-autoflight/output/ap-warning", 0);
}
if (athr_active == 1 and getprop("/it-autoflight/output/athr-warning") == 0) {
athr_active = 0;
} elsif (athr_active == 1 and getprop("/it-autoflight/output/athr-warning") == 1 and getprop("/sim/time/elapsed-sec") > (getprop("/ECAM/athr-off-time") + 9)) {
@ -225,6 +228,10 @@ var ECAM = {
setprop("/ECAM/warnings/master-caution-light", 0);
}
if (getprop("/it-autoflight/output/athr-warning") == 2 and getprop("/it-autoflight/output/athr") == 1) {
setprop("/it-autoflight/output/athr-warning", 0);
}
# Warning Phases
if (getprop("/systems/electrical/bus/ac1") < 110 and getprop("/systems/electrical/bus/ac2") < 110 and getprop("/systems/electrical/bus/ac-ess") < 110) { # Reset warning phases

View file

@ -1,45 +0,0 @@
# A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath
# Copyright (c) 2019 Joshua Davidson (it0uchpods)
setprop("/MCDUC/F-PLNA/left-1", "F-PLN PAGE IS NOT ENABLED");
setprop("/MCDUC/F-PLNA/left-2", "BECAUSE IT IS NOT READY");
setprop("/MCDUC/F-PLNA/left-3", "KIND REGARDS");
setprop("/MCDUC/F-PLNA/left-4", "JOSH");
setprop("/MCDUC/F-PLNA/left-5", "");
setprop("/MCDUC/F-PLNA/left-6", "A3XX MCDU 0.55");
setprop("/MCDUC/F-PLNA/center-1", "");
setprop("/MCDUC/F-PLNA/center-2", "");
setprop("/MCDUC/F-PLNA/center-3", "");
setprop("/MCDUC/F-PLNA/center-4", "");
setprop("/MCDUC/F-PLNA/center-5", "");
setprop("/MCDUC/F-PLNA/center-6", "");
setprop("/MCDUC/F-PLNA/right-1", "");
setprop("/MCDUC/F-PLNA/right-2", "");
setprop("/MCDUC/F-PLNA/right-3", "");
setprop("/MCDUC/F-PLNA/right-4", "");
setprop("/MCDUC/F-PLNA/right-5", "");
setprop("/MCDUC/F-PLNA/right-6", "");
setprop("/MCDUC/F-PLNA/left-1c", "w");
setprop("/MCDUC/F-PLNA/left-2c", "w");
setprop("/MCDUC/F-PLNA/left-3c", "w");
setprop("/MCDUC/F-PLNA/left-4c", "w");
setprop("/MCDUC/F-PLNA/left-5c", "w");
setprop("/MCDUC/F-PLNA/left-6c", "w");
setprop("/MCDUC/F-PLNA/center-1c", "w");
setprop("/MCDUC/F-PLNA/center-2c", "w");
setprop("/MCDUC/F-PLNA/center-3c", "w");
setprop("/MCDUC/F-PLNA/center-4c", "w");
setprop("/MCDUC/F-PLNA/center-5c", "w");
setprop("/MCDUC/F-PLNA/center-6c", "w");
setprop("/MCDUC/F-PLNA/right-1c", "w");
setprop("/MCDUC/F-PLNA/right-2c", "w");
setprop("/MCDUC/F-PLNA/right-3c", "w");
setprop("/MCDUC/F-PLNA/right-4c", "w");
setprop("/MCDUC/F-PLNA/right-5c", "w");
setprop("/MCDUC/F-PLNA/right-6c", "w");
var discontinuity = "---- F-PLN DISCONTINUITY ----";
var fpln_end = "------- END OF F-PLN -------";
var altn_fpln_end = "----- END OF ALTN F-PLN -----";

View file

@ -1 +1 @@
4748
4749