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

System: Cleanup

Browse source
This commit is contained in:
Joshua Davidson 2018-11-11 13:44:59 -05:00
parent 6c5ce66852
commit 8587d55369
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Nasal/ECAM-controller.nas
View file

@ -73,7 +73,6 @@ var warning = {
light: "", light: "",
noRepeat: 0, noRepeat: 0,
new: func(msg,active,colour,aural,light,noRepeat) { new: func(msg,active,colour,aural,light,noRepeat) {
var t = {parents:[warning]}; var t = {parents:[warning]};
t.msg = msg; t.msg = msg;
@ -84,7 +83,6 @@ var warning = {
t.noRepeat = noRepeat; t.noRepeat = noRepeat;
return t return t
}, },
write: func() { write: func() {
var line = 1; var line = 1;
@ -120,7 +118,6 @@ var memo = {
active: 0, active: 0,
colour: "", colour: "",
new: func(msg,active,colour) { new: func(msg,active,colour) {
var t = {parents:[memo]}; var t = {parents:[memo]};
t.msg = msg; t.msg = msg;
@ -128,7 +125,6 @@ var memo = {
t.colour = colour; t.colour = colour;
return t return t
}, },
write: func() { write: func() {
var right_line = 1; var right_line = 1;
@ -260,8 +256,10 @@ var messages_priority_2 = func {
park_brk_on.noRepeat = 0; park_brk_on.noRepeat = 0;
} }
} }
var messages_priority_1 = func {} var messages_priority_1 = func {}
var messages_priority_0 = func {} var messages_priority_0 = func {}
var messages_memo = func { var messages_memo = func {
if (getprop("/services/fuel-truck/enable") == 1 and getprop("/ECAM/left-msg") != "TO-MEMO" and getprop("/ECAM/left-msg") != "LDG-MEMO") { if (getprop("/services/fuel-truck/enable") == 1 and getprop("/ECAM/left-msg") != "TO-MEMO" and getprop("/ECAM/left-msg") != "LDG-MEMO") {
refuelg.active = 1; refuelg.active = 1;
@ -305,6 +303,7 @@ var messages_memo = func {
fob_3T.active = 0; fob_3T.active = 0;
} }
} }
var messages_right_memo = func { var messages_right_memo = func {
if (getprop("/ECAM/warning-phase") >= 3 and getprop("/ECAM/warning-phase") <= 5) { if (getprop("/ECAM/warning-phase") >= 3 and getprop("/ECAM/warning-phase") <= 5) {
to_inhibit.active = 1; to_inhibit.active = 1;
@ -440,7 +439,6 @@ var messages_right_memo = func {
var ECAM_controller = { var ECAM_controller = {
loop: func() { loop: func() {
# check active messages # check active messages
# config_warnings(); # config_warnings();
messages_priority_3(); messages_priority_3();
@ -453,13 +451,13 @@ var ECAM_controller = {
# clear display momentarily # clear display momentarily
if (warnings.size() > 0) { if (warnings.size() > 0) {
for(var n=1; n<8; n+=1) { for(var n = 1; n < 8; n += 1) {
setprop("/ECAM/msg/line" ~ n, ""); setprop("/ECAM/msg/line" ~ n, "");
} }
} }
if (memos.size() > 0) { if (memos.size() > 0) {
for(var n=1; n<8; n+=1) { for(var n = 1; n < 8; n += 1) {
setprop("/ECAM/rightmsg/line" ~ n, ""); setprop("/ECAM/rightmsg/line" ~ n, "");
} }
} }

1
Nasal/ECAM.nas
View file

@ -329,7 +329,6 @@ var LowerECAM = {
} }
setprop("/ECAM/Lower/page", "apu"); setprop("/ECAM/Lower/page", "apu");
} else if (((getprop("/engines/engine[0]/n2-actual") >= 59 or getprop("/engines/engine[1]/n2-actual") >= 59) and getprop("/gear/gear[1]/wow") == 1) or (getprop("/instrumentation/altimeter/indicated-altitude-ft") <= 16000 } else if (((getprop("/engines/engine[0]/n2-actual") >= 59 or getprop("/engines/engine[1]/n2-actual") >= 59) and getprop("/gear/gear[1]/wow") == 1) or (getprop("/instrumentation/altimeter/indicated-altitude-ft") <= 16000
and getprop("/controls/gear/gear-down") == 1 and getprop("/gear/gear[1]/wow") == 0)) { and getprop("/controls/gear/gear-down") == 1 and getprop("/gear/gear[1]/wow") == 0)) {
setprop("/ECAM/Lower/page", "wheel"); setprop("/ECAM/Lower/page", "wheel");

2
revision.txt
View file

@ -1 +1 @@
4699 4700