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

DU: Fix bugs in ECAM

Browse source
This commit is contained in:
Joshua Davidson 2018-11-14 23:02:59 -05:00
parent c8245c7a41
commit cd0fc2088a
4 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Models/Instruments/Upper-ECAM/Upper-ECAM.nas
View file

@ -10,6 +10,8 @@ var upperECAM_iae_eis2 = nil;
var upperECAM_test = nil;
var upperECAM_display = nil;
var elapsedtime = 0;
var leftmsg = "XX";
var rightmsg = "XX";
# Create Nodes:
var fuel_1 = props.globals.initNode("/engines/engine[0]/fuel-flow_actual", 0);
@ -92,6 +94,7 @@ var ECAM_line6c = props.globals.getNode("/ECAM/msg/linec6", 1);
var ECAM_line7c = props.globals.getNode("/ECAM/msg/linec7", 1);
var ECAM_line8c = props.globals.getNode("/ECAM/msg/linec8", 1);
var ECAMleft = props.globals.getNode("/ECAM/left-msg", 1);
var ECAMright = props.globals.getNode("/ECAM/right-msg", 1);
var rate = props.globals.getNode("/systems/acconfig/options/uecam-rate", 1);
var canvas_upperECAM_base = {
@ -223,6 +226,7 @@ var canvas_upperECAM_base = {
line7c = ECAM_line7c.getValue();
line8c = ECAM_line8c.getValue();
leftmsg = ECAMleft.getValue();
rightmsg = ECAMright.getValue();
if (leftmsg == "MSG") {
me["ECAML1"].setText(sprintf("%s", ECAM_line1.getValue()));
@ -434,7 +438,7 @@ var canvas_upperECAM_base = {
}
# Right ECAM Messages
if (getprop("/ECAM/right-msg") == "MSG") {
if (rightmsg == "MSG") {
me["ECAMR1"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line1")));
me["ECAMR2"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line2")));
me["ECAMR3"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line3")));
@ -559,8 +563,6 @@ var canvas_upperECAM_base = {
me["ECAM_Right"].show();
} else {
me["ECAM_Right"].hide();
me["TO_Memo"].hide();
me["LDG_Memo"].hide();
}
},
};

3
Nasal/ECAM-controller.nas
View file

@ -62,6 +62,8 @@ var spacer = nil;
var line = nil;
var right_line = nil;
var wow = getprop("/gear/gear[1]/wow");
setprop("/ECAM/show-left-msg", 0);
setprop("/ECAM/show-right-msg", 0);
setprop("/ECAM/warnings/master-warning-light", 0);
setprop("/ECAM/warnings/master-caution-light", 0);
@ -138,6 +140,7 @@ var memo = {
}
},
};
# messages logic and added to arrays
var warnings = std.Vector.new([

4
Nasal/ECAM.nas
View file

@ -146,7 +146,7 @@ var ECAM = {
setprop("/ECAM/ldg-memo-enable", 0);
}
if (ecam.warnings.size() > 0) {
if (getprop("/ECAM/show-left-msg") == 1) {
setprop("/ECAM/left-msg", "MSG");
} else if (getprop("/FMGC/status/phase") == 0 and stateL == 3 and stateR == 3 and getprop("/ECAM/engine-start-time") + 120 < getprop("/sim/time/elapsed-sec") and getprop("/ECAM/to-memo-enable") == 1 and wow == 1) {
setprop("/ECAM/left-msg", "TO-MEMO");
@ -156,7 +156,7 @@ var ECAM = {
setprop("/ECAM/left-msg", "NONE");
}
if (ecam.memos.size() > 0) {
if (getprop("/ECAM/show-right-msg") == 1) {
setprop("/ECAM/right-msg", "MSG");
} else {
setprop("/ECAM/right-msg", "NONE");

2
revision.txt
View file

@ -1 +1 @@
4701
4702