fly/A320-family
1
0
Fork 0
Code Activity

Merge branch '3D' into 3D-flightdeck

Browse source
This commit is contained in:
Jonathan Redpath 2022-03-08 14:10:46 +00:00
commit 4d9538b6fc
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -212,12 +212,6 @@ var canvas_upperECAM = {
props.UpdateManager.FromHashValue("N1thr_2", 0.01, func(val) {
obj["N12-thr"].setRotation((val + 90) * D2R);
}),
props.UpdateManager.FromHashList(["reverser_1","eng1_n1","eng1_epr","N1_mode_1"], nil, func(val) {
obj.updateFadecN1Power1(val);
}),
props.UpdateManager.FromHashList(["reverser_2","eng2_n1","eng2_epr","N1_mode_2"], nil, func(val) {
obj.updateFadecN1Power2(val);
}),
];
obj.update_items_fadec_powered_epr = [
@ -249,6 +243,15 @@ var canvas_upperECAM = {
}),
];
obj.update_items_fadec_powered = [
props.UpdateManager.FromHashList(["reverser_1","eng1_n1","eng1_epr","N1_mode_1"], nil, func(val) {
obj.updateFadecN1Power1(val);
}),
props.UpdateManager.FromHashList(["reverser_2","eng2_n1","eng2_epr","N1_mode_2"], nil, func(val) {
obj.updateFadecN1Power2(val);
}),
];
obj.update_items_fadec_powered_n2 = [
props.UpdateManager.FromHashValue("N2_actual_1", 0.025, func(val) {
obj["N21"].setText(sprintf("%s", math.floor(val + 0.05)));
@ -612,6 +615,13 @@ var canvas_upperECAM = {
me.updateFF2();
}
if (notification.eng1_n1 or notification.eng2_n1 or notification.eng1_epr or notification.eng2_epr) {
foreach(var update_item; me.update_items_fadec_powered)
{
update_item.update(notification);
}
}
if (notification.eng1_n1 or notification.eng2_n1) {
foreach(var update_item; me.update_items_fadec_powered_n1)
{
@ -942,6 +952,7 @@ var canvas_upperECAM = {
}
}
} else {
# This is for CFM only -- the IAE show / hiding is done via an emesary node. Potentially they can be merged.
if (val.reverser_1 < 0.01 and val.eng1_n1 == 1) {
me["N11-thr"].show();
} else {