From 7c55522ac6167e08f80d3c7bad904d104c605026 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Wed, 6 Jun 2018 21:46:41 +0100
Subject: [PATCH 1/3] Convert to std.vector, add debug functions, extend
system, note that it is not displaying on the ECAM yet
---
Nasal/ECAM-controller.nas | 104 +++++++++++++-------------------------
Nasal/libraries.nas | 6 ++-
2 files changed, 39 insertions(+), 71 deletions(-)
diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas
index fed32959..3d8d022d 100644
--- a/Nasal/ECAM-controller.nas
+++ b/Nasal/ECAM-controller.nas
@@ -60,12 +60,12 @@ var ewd_msg_two = ewd.initNode("msg/priority_2"," ","STRING");
var ewd_msg_one = ewd.initNode("msg/priority_1"," ","STRING");
var ewd_msg_zero = ewd.initNode("msg/priority_0"," ","STRING");
var ewd_msg_memo = ewd.initNode("msg/memo"," ","STRING");
-var msgs_priority_3 = [];
-var msgs_priority_2 = [];
-var msgs_priority_1 = [];
-var msgs_priority_0 = [];
-var msgs_memo = [];
-var active_messages = [];
+var msgs_priority_3 = std.Vector.new();
+var msgs_priority_2 = std.Vector.new();
+var msgs_priority_1 = std.Vector.new();
+var msgs_priority_0 = std.Vector.new();
+var msgs_memo = std.Vector.new();
+var active_messages = std.Vector.new();
var num_lines = 6;
var msg = nil;
var spacer = nil;
@@ -75,8 +75,8 @@ var line = nil;
var messages_priority_3 = func {
if (getprop("/controls/flight/flap-pos") > 2 and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and getprop("/FMGC/status/phase") == 5) {
- append(msgs_priority_3,"L/G GEAR NOT DOWN");
- append(active_messages,"L/G GEAR NOT DOWN");
+ msgs_priority_3.append("L/G GEAR NOT DOWN");
+ active_messages.append("L/G GEAR NOT DOWN");
}
}
var messages_priority_2 = func {}
@@ -84,71 +84,23 @@ var messages_priority_1 = func {}
var messages_priority_0 = func {}
var messages_memo = func {
if (getprop("controls/flight/speedbrake-arm") == 1) {
- append(msgs_memo,"GND SPLRS ARMED");
- append(active_messages,"GND SPLRS ARMED");
- }
+ msgs_memo.append("GND SPLRS ARMED");
+ active_messages.append("GND SPLRS ARMED");
+ }
}
-# messages sent to property tree
-
-var update_ewd = func(msgs_priority_3,msgs_priority_2,msgs_priority_1,msgs_priority_0,msgs_memo) {
- msg = "";
- spacer = "";
- line = 0;
- for(var i=0; i<size(msgs_priority_3); i+=1)
- {
- msg = msg ~ msgs_priority_3[i] ~ "\n";
- spacer = spacer ~ "\n";
- line+=1;
- }
- ewd_msg_three.setValue(msg);
- msg = spacer;
- for(var i=0; i<size(msgs_priority_2); i+=1)
- {
- msg = msg ~ msgs_priority_2[i] ~ "\n";
- spacer = spacer ~ "\n";
- line+=1;
- }
- ewd_msg_two.setValue(msg);
- msg = spacer;
- for(var i=0; i<size(msgs_priority_1); i+=1)
- {
- msg = msg ~ msgs_priority_1[i] ~ "\n";
- spacer = spacer ~ "\n";
- line+=1;
- }
- ewd_msg_one.setValue(msg);
- msg = spacer;
- for(var i=0; i<size(msgs_priority_0); i+=1)
- {
- msg = msg ~ msgs_priority_0[i] ~ "\n";
- spacer = spacer ~ "\n";
- line+=1;
- }
- ewd_msg_zero.setValue(msg);
- while (line+size(msgs_memo) < num_lines) {
- line+=1;
- spacer = spacer ~ "\n";
- }
- msg = spacer;
- for(var i=0; i<size(msgs_memo); i+=1)
- {
- msg = msg ~ msgs_memo[i] ~ "\n";
- }
- ewd_msg_memo.setValue(msg);
-}
# Finally the controller
var ECAM_controller = {
loop: func() {
# cleans up arrays
- msgs_priority_3 = [];
- msgs_priority_2 = [];
- msgs_priority_1 = [];
- msgs_priority_0 = [];
- msgs_memo = [];
- active_messages = [];
+ msgs_priority_3.clear();
+ msgs_priority_2.clear();
+ msgs_priority_1.clear();
+ msgs_priority_0.clear();
+ msgs_memo.clear();
+ active_messages.clear();
# check active messages
# config_warnings();
@@ -158,12 +110,24 @@ var ECAM_controller = {
messages_priority_0();
messages_memo();
- # update property tree with active messages
- update_ewd(msgs_priority_3,msgs_priority_2,msgs_priority_1,msgs_priority_0,msgs_memo);
-
# write to ECAM
- foreach(var ewd_messages; active_messages) {
- setprop("/ECAM/msg/line1", ewd_messages);
+ foreach(var ewd_messages; active_messages.vector) {
+ var i = 1;
+ var x = getprop("/ECAM/msg/line[" ~ i ~ "]");
+ print("Variable i is:" ~ i);
+ if (x == "") {
+ setprop("/ECAM/msg/line[" ~ i ~ "]", ewd_messages);
+ } else {
+ i = i + 1;
+ print("Variable i is:" ~ i);
+ }
}
+
+ # debug
+
+ foreach(var debug; active_messages.vector) {
+ print(debug);
+ }
+
},
};
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index b0f08cae..02fd373e 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -186,6 +186,7 @@ var systemsInit = func {
libraries.CVR.start();
icing.icingInit();
lightsLoop.start();
+ ecamLoop.start();
var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/IDG-A32X/Systems/autopilot-dlg.xml");
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
@@ -197,6 +198,10 @@ setlistener("/sim/signals/fdm-initialized", func {
systemsInit();
});
+var ecamLoop = maketimer(0.5, func {
+ ecam.ECAM_controller.loop();
+});
+
var systemsLoop = maketimer(0.1, func {
systems.ELEC.loop();
systems.PNEU.loop();
@@ -204,7 +209,6 @@ var systemsLoop = maketimer(0.1, func {
systems.FUEL.loop();
systems.ADIRS.loop();
libraries.ECAM.loop();
- ecam.ECAM_controller.loop();
fadec.fadecLoop();
if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/switches/cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) {
From e69ae365c2a2ea7cc8f6069103ce91eb439617b3 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Fri, 8 Jun 2018 17:08:17 +0100
Subject: [PATCH 2/3] messages show on ECAM now, but wrong
---
Nasal/ECAM-controller.nas | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas
index 3d8d022d..016147f1 100644
--- a/Nasal/ECAM-controller.nas
+++ b/Nasal/ECAM-controller.nas
@@ -113,12 +113,13 @@ var ECAM_controller = {
# write to ECAM
foreach(var ewd_messages; active_messages.vector) {
var i = 1;
- var x = getprop("/ECAM/msg/line[" ~ i ~ "]");
+ var x = getprop("/ECAM/msg/line" ~ i);
print("Variable i is:" ~ i);
if (x == "") {
- setprop("/ECAM/msg/line[" ~ i ~ "]", ewd_messages);
+ setprop("/ECAM/msg/line" ~ i, ewd_messages);
} else {
i = i + 1;
+ setprop("/ECAM/msg/line" ~ i, ewd_messages);
print("Variable i is:" ~ i);
}
}
From 6669becaff9c6462b09eb48c416a66754e82e6ba Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Sat, 9 Jun 2018 21:15:00 +0100
Subject: [PATCH 3/3] Switch to forindex() (thanks pinto) and messages cleared
when vector is empty
---
Nasal/ECAM-controller.nas | 27 +++++++++++++--------------
Nasal/ECAM.nas | 2 +-
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas
index 016147f1..62854e16 100644
--- a/Nasal/ECAM-controller.nas
+++ b/Nasal/ECAM-controller.nas
@@ -77,6 +77,8 @@ var messages_priority_3 = func {
if (getprop("/controls/flight/flap-pos") > 2 and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and getprop("/FMGC/status/phase") == 5) {
msgs_priority_3.append("L/G GEAR NOT DOWN");
active_messages.append("L/G GEAR NOT DOWN");
+ } else if (active_messages.contains("L/G GEAR NOT DOWN")) {
+ active_messages.remove("L/G GEAR NOT DOWN");
}
}
var messages_priority_2 = func {}
@@ -86,6 +88,8 @@ var messages_memo = func {
if (getprop("controls/flight/speedbrake-arm") == 1) {
msgs_memo.append("GND SPLRS ARMED");
active_messages.append("GND SPLRS ARMED");
+ } else if (active_messages.contains("GND SPLRS ARMED")) {
+ active_messages.remove("GND SPLRS ARMED");
}
}
@@ -111,24 +115,19 @@ var ECAM_controller = {
messages_memo();
# write to ECAM
- foreach(var ewd_messages; active_messages.vector) {
- var i = 1;
- var x = getprop("/ECAM/msg/line" ~ i);
- print("Variable i is:" ~ i);
- if (x == "") {
- setprop("/ECAM/msg/line" ~ i, ewd_messages);
+
+ forindex ( var i; active_messages.vector ) {
+ var line = 1;
+ if (getprop("/ECAM/msg/line" ~ line) == "") {
+ setprop("/ECAM/msg/line" ~ line, active_messages.vector[i]);
} else {
- i = i + 1;
- setprop("/ECAM/msg/line" ~ i, ewd_messages);
- print("Variable i is:" ~ i);
+ setprop("/ECAM/msg/line" ~ (line + 1), active_messages.vector[i]);
}
}
- # debug
-
- foreach(var debug; active_messages.vector) {
- print(debug);
+ if (active_messages.size() == 0) {
+ setprop("/ECAM/msg/line1", "");
+ setprop("/ECAM/msg/line2", "");
}
-
},
};
diff --git a/Nasal/ECAM.nas b/Nasal/ECAM.nas
index bbc7d84e..6a03b542 100644
--- a/Nasal/ECAM.nas
+++ b/Nasal/ECAM.nas
@@ -80,7 +80,7 @@ var ECAM = {
setprop("/ECAM/ldg-memo-enable", 0);
}
- if (size(ecam.active_messages) > 0) {
+ if (ecam.active_messages.size() > 0) {
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");