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

Add colour support, system working

Browse source
This commit is contained in:
Jonathan Redpath 2018-07-31 15:11:12 +01:00
parent 5f1aa81106
commit 9f790be2c4
3 changed files with 139 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,99 +147,99 @@ var canvas_upperECAM_base = {
me["ECAML7"].setText(sprintf("%s", getprop("/ECAM/msg/line7")));
me["ECAML8"].setText(sprintf("%s", getprop("/ECAM/msg/line8")));
if (getprop("/ECAM/msg/line1c") == "w") {
if (getprop("/ECAM/msg/linec1") == "w") {
me["ECAML1"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line1c") == "b") {
} else if (getprop("/ECAM/msg/linec1") == "b") {
me["ECAML1"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line1c") == "g") {
} else if (getprop("/ECAM/msg/linec1") == "g") {
me["ECAML1"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line1c") == "a") {
} else if (getprop("/ECAM/msg/linec1") == "a") {
me["ECAML1"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line1c") == "r") {
} else if (getprop("/ECAM/msg/linec1") == "r") {
me["ECAML1"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line2c") == "w") {
if (getprop("/ECAM/msg/linec2") == "w") {
me["ECAML2"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line2c") == "b") {
} else if (getprop("/ECAM/msg/linec2") == "b") {
me["ECAML2"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line2c") == "g") {
} else if (getprop("/ECAM/msg/linec2") == "g") {
me["ECAML2"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line2c") == "a") {
} else if (getprop("/ECAM/msg/linec2") == "a") {
me["ECAML2"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line2c") == "r") {
} else if (getprop("/ECAM/msg/linec2") == "r") {
me["ECAML2"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line3c") == "w") {
if (getprop("/ECAM/msg/linec3") == "w") {
me["ECAML3"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line3c") == "b") {
} else if (getprop("/ECAM/msg/linec3") == "b") {
me["ECAML3"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line3c") == "g") {
} else if (getprop("/ECAM/msg/linec3") == "g") {
me["ECAML3"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line3c") == "a") {
} else if (getprop("/ECAM/msg/linec3") == "a") {
me["ECAML3"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line3c") == "r") {
} else if (getprop("/ECAM/msg/linec3") == "r") {
me["ECAML3"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line4c") == "w") {
if (getprop("/ECAM/msg/linec4") == "w") {
me["ECAML4"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line4c") == "b") {
} else if (getprop("/ECAM/msg/linec4") == "b") {
me["ECAML4"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line4c") == "g") {
} else if (getprop("/ECAM/msg/linec4") == "g") {
me["ECAML4"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line4c") == "a") {
} else if (getprop("/ECAM/msg/linec4") == "a") {
me["ECAML4"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line4c") == "r") {
} else if (getprop("/ECAM/msg/linec4") == "r") {
me["ECAML4"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line5c") == "w") {
if (getprop("/ECAM/msg/linec5") == "w") {
me["ECAML5"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line5c") == "b") {
} else if (getprop("/ECAM/msg/linec5") == "b") {
me["ECAML5"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line5c") == "g") {
} else if (getprop("/ECAM/msg/linec5") == "g") {
me["ECAML5"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line5c") == "a") {
} else if (getprop("/ECAM/msg/linec5") == "a") {
me["ECAML5"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line5c") == "r") {
} else if (getprop("/ECAM/msg/linec5") == "r") {
me["ECAML5"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line6c") == "w") {
if (getprop("/ECAM/msg/linec6") == "w") {
me["ECAML6"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line6c") == "b") {
} else if (getprop("/ECAM/msg/linec6") == "b") {
me["ECAML6"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line6c") == "g") {
} else if (getprop("/ECAM/msg/linec6") == "g") {
me["ECAML6"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line6c") == "a") {
} else if (getprop("/ECAM/msg/linec6") == "a") {
me["ECAML6"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line6c") == "r") {
} else if (getprop("/ECAM/msg/linec6") == "r") {
me["ECAML6"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line7c") == "w") {
if (getprop("/ECAM/msg/linec7") == "w") {
me["ECAML7"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line7c") == "b") {
} else if (getprop("/ECAM/msg/linec7") == "b") {
me["ECAML7"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line7c") == "g") {
} else if (getprop("/ECAM/msg/linec7") == "g") {
me["ECAML7"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line7c") == "a") {
} else if (getprop("/ECAM/msg/linec7") == "a") {
me["ECAML7"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line7c") == "r") {
} else if (getprop("/ECAM/msg/linec7") == "r") {
me["ECAML7"].setColor(1,0,0);
}
if (getprop("/ECAM/msg/line8c") == "w") {
if (getprop("/ECAM/msg/linec8") == "w") {
me["ECAML8"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/msg/line8c") == "b") {
} else if (getprop("/ECAM/msg/linec8") == "b") {
me["ECAML8"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/msg/line8c") == "g") {
} else if (getprop("/ECAM/msg/linec8") == "g") {
me["ECAML8"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/msg/line8c") == "a") {
} else if (getprop("/ECAM/msg/linec8") == "a") {
me["ECAML8"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/msg/line8c") == "r") {
} else if (getprop("/ECAM/msg/linec8") == "r") {
me["ECAML8"].setColor(1,0,0);
}
@ -354,99 +354,99 @@ var canvas_upperECAM_base = {
me["ECAMR7"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line7")));
me["ECAMR8"].setText(sprintf("%s", getprop("/ECAM/rightmsg/line8")));
if (getprop("/ECAM/rightmsg/line1c") == "w") {
if (getprop("/ECAM/rightmsg/linec1") == "w") {
me["ECAMR1"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line1c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec1") == "b") {
me["ECAMR1"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line1c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec1") == "g") {
me["ECAMR1"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line1c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec1") == "a") {
me["ECAMR1"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line1c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec1") == "r") {
me["ECAMR1"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line2c") == "w") {
if (getprop("/ECAM/rightmsg/linec2") == "w") {
me["ECAMR2"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line2c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec2") == "b") {
me["ECAMR2"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line2c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec2") == "g") {
me["ECAMR2"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line2c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec2") == "a") {
me["ECAMR2"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line2c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec2") == "r") {
me["ECAMR2"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line3c") == "w") {
if (getprop("/ECAM/rightmsg/linec3") == "w") {
me["ECAMR3"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line3c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec3") == "b") {
me["ECAMR3"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line3c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec3") == "g") {
me["ECAMR3"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line3c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec3") == "a") {
me["ECAMR3"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line3c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec3") == "r") {
me["ECAMR3"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line4c") == "w") {
if (getprop("/ECAM/rightmsg/linec4") == "w") {
me["ECAMR4"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line4c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec4") == "b") {
me["ECAMR4"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line4c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec4") == "g") {
me["ECAMR4"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line4c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec4") == "a") {
me["ECAMR4"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line4c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec4") == "r") {
me["ECAMR4"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line5c") == "w") {
if (getprop("/ECAM/rightmsg/linec5") == "w") {
me["ECAMR5"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line5c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec5") == "b") {
me["ECAMR5"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line5c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec5") == "g") {
me["ECAMR5"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line5c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec5") == "a") {
me["ECAMR5"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line5c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec5") == "r") {
me["ECAMR5"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line6c") == "w") {
if (getprop("/ECAM/rightmsg/linec6") == "w") {
me["ECAMR6"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line6c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec6") == "b") {
me["ECAMR6"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line6c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec6") == "g") {
me["ECAMR6"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line6c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec6") == "a") {
me["ECAMR6"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line6c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec6") == "r") {
me["ECAMR6"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line7c") == "w") {
if (getprop("/ECAM/rightmsg/linec7") == "w") {
me["ECAMR7"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line7c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec7") == "b") {
me["ECAMR7"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line7c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec7") == "g") {
me["ECAMR7"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line7c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec7") == "a") {
me["ECAMR7"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line7c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec7") == "r") {
me["ECAMR7"].setColor(1,0,0);
}
if (getprop("/ECAM/rightmsg/line8c") == "w") {
if (getprop("/ECAM/rightmsg/linec8") == "w") {
me["ECAMR8"].setColor(0.8078,0.8039,0.8078);
} else if (getprop("/ECAM/rightmsg/line8c") == "b") {
} else if (getprop("/ECAM/rightmsg/linec8") == "b") {
me["ECAMR8"].setColor(0.0901,0.6039,0.7176);
} else if (getprop("/ECAM/rightmsg/line8c") == "g") {
} else if (getprop("/ECAM/rightmsg/linec8") == "g") {
me["ECAMR8"].setColor(0.0509,0.7529,0.2941);
} else if (getprop("/ECAM/rightmsg/line8c") == "a") {
} else if (getprop("/ECAM/rightmsg/linec8") == "a") {
me["ECAMR8"].setColor(0.7333,0.3803,0);
} else if (getprop("/ECAM/rightmsg/line8c") == "r") {
} else if (getprop("/ECAM/rightmsg/linec8") == "r") {
me["ECAMR8"].setColor(1,0,0);
}

67
Nasal/ECAM-controller.nas
View file

@ -63,12 +63,16 @@ var right_line = nil;
var warning = {
msg: "",
active: 0,
new: func(msg,active) {
colour: "",
aural: "",
light: "",
new: func(msg,active,colour,aural,light) {
var t = {parents:[warning]};
t.msg = msg;
t.active = active;
t.colour = colour;
return t
@ -77,9 +81,12 @@ var warning = {
var line = 1;
while (getprop("/ECAM/msg/line" ~ line) != "") {
line = line + 1; # go to next line until empty line
}
}
# if (getprop("/ECAM/msg/line" ~ line) != me.msg)
if (getprop("/ECAM/msg/line" ~ line) == "" and me.active == 1) { # at empty line
setprop("/ECAM/msg/line" ~ (line), me.msg);
setprop("/ECAM/msg/line" ~ line, me.msg);
setprop("/ECAM/msg/linec" ~ line, me.colour);
}
},
};
@ -87,12 +94,16 @@ var warning = {
var memo = {
msg: "",
active: 0,
new: func(msg,active) {
colour: "",
aural: "",
light: "",
new: func(msg,active,colour,aural,light) {
var t = {parents:[memo]};
t.msg = msg;
t.active = active;
t.colour = colour;
return t
@ -102,17 +113,22 @@ var memo = {
while (getprop("/ECAM/rightmsg/line" ~ right_line) != "") {
right_line = right_line + 1; # go to next line until empty line
}
if (getprop("/ECAM/rightmsg/line" ~ right_line) == "" and me.active == 1) { # at empty line
setprop("/ECAM/rightmsg/line" ~ (right_line), me.msg);
setprop("/ECAM/rightmsg/line" ~ right_line, me.msg);
setprop("/ECAM/rightmsg/linec" ~ right_line, me.colour);
}
},
};
# messages logic and added to arrays
var warnings = std.Vector.new([var lg_not_dn = warning.new(msg: "L/G GEAR NOT DOWN", active: 0)]);
var warnings = std.Vector.new([
var lg_not_dn = warning.new(msg: "L/G GEAR NOT DOWN", active: 0, colour: "r")
]);
var memos = std.Vector.new([
var gnd_splrs = memo.new(msg: "GND SPLRS ARMED", active: 0),
var park_brk = memo.new(msg: "PARK BRK", active: 0)
var gnd_splrs = memo.new(msg: "GND SPLRS ARMED", active: 0, colour: "g"),
var park_brk = memo.new(msg: "PARK BRK", active: 0, colour: "g")
]);
@ -154,6 +170,25 @@ var ECAM_controller = {
messages_memo();
messages_right_memo();
# clear display momentarily
if (warnings.size() > 0) {
for(var n=1; n<8; n+=1) {
# if (!warnings.contains(getprop("/ECAM/msg/line" ~ (n)))) {
setprop("/ECAM/msg/line" ~ n, "");
#}
}
}
if (memos.size() > 0) {
for(var n=1; n<8; n+=1) {
# if (!memos.contains(getprop("/ECAM/rightmsg/line" ~ (n)))) {
setprop("/ECAM/rightmsg/line" ~ n, "");
# }
}
}
# write to ECAM
foreach (var i; warnings.vector) {
@ -163,21 +198,5 @@ var ECAM_controller = {
foreach (var m; memos.vector) {
m.write();
}
if (warnings.size() > 0) {
for(var n=1; n<warnings.size(); n+=1) {
if (!warnings.contains(getprop("/ECAM/msg/line" ~ (n)))) {
setprop("/ECAM/msg/line" ~ n, "");
}
}
}
if (memos.size() > 0) {
for(var n=1; n<memos.size(); n+=1) {
if (!memos.contains(getprop("/ECAM/rightmsg/line" ~ (n)))) {
setprop("/ECAM/rightmsg/line" ~ n, "");
}
}
}
},
};

32
Nasal/ECAM.nas
View file

@ -37,14 +37,14 @@ var ECAM = {
setprop("/ECAM/msg/line6", "");
setprop("/ECAM/msg/line7", "");
setprop("/ECAM/msg/line8", "");
setprop("/ECAM/msg/line1c", "w");
setprop("/ECAM/msg/line2c", "w");
setprop("/ECAM/msg/line3c", "w");
setprop("/ECAM/msg/line4c", "w");
setprop("/ECAM/msg/line5c", "w");
setprop("/ECAM/msg/line6c", "w");
setprop("/ECAM/msg/line7c", "w");
setprop("/ECAM/msg/line8c", "w");
setprop("/ECAM/msg/linec1", "w");
setprop("/ECAM/msg/linec2", "w");
setprop("/ECAM/msg/linec3", "w");
setprop("/ECAM/msg/linec4", "w");
setprop("/ECAM/msg/linec5", "w");
setprop("/ECAM/msg/linec6", "w");
setprop("/ECAM/msg/linec7", "w");
setprop("/ECAM/msg/linec8", "w");
setprop("/ECAM/rightmsg/line1", "");
setprop("/ECAM/rightmsg/line2", "");
setprop("/ECAM/rightmsg/line3", "");
@ -53,14 +53,14 @@ var ECAM = {
setprop("/ECAM/rightmsg/line6", "");
setprop("/ECAM/rightmsg/line7", "");
setprop("/ECAM/rightmsg/line8", "");
setprop("/ECAM/rightmsg/line1c", "w");
setprop("/ECAM/rightmsg/line2c", "w");
setprop("/ECAM/rightmsg/line3c", "w");
setprop("/ECAM/rightmsg/line4c", "w");
setprop("/ECAM/rightmsg/line5c", "w");
setprop("/ECAM/rightmsg/line6c", "w");
setprop("/ECAM/rightmsg/line7c", "w");
setprop("/ECAM/rightmsg/line8c", "w");
setprop("/ECAM/rightmsg/linec1", "w");
setprop("/ECAM/rightmsg/linec2", "w");
setprop("/ECAM/rightmsg/linec3", "w");
setprop("/ECAM/rightmsg/linec4", "w");
setprop("/ECAM/rightmsg/linec5", "w");
setprop("/ECAM/rightmsg/linec6", "w");
setprop("/ECAM/rightmsg/linec7", "w");
setprop("/ECAM/rightmsg/linec8", "w");
},
loop: func() {
stateL = getprop("/engines/engine[0]/state");