diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas
index 4b931bca..23445844 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas
@@ -84,6 +84,12 @@ var canvas_lowerECAMPageCruise =
} else {
obj["deltaPSI"].setText(sprintf("%2.1f", val));
}
+
+ if (val < -0.4 or val > 8.5) {
+ obj["deltaPSI"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["deltaPSI"].setColor(0.0509,0.7529,0.2941);
+ }
}),
props.UpdateManager.FromHashValue("pressVS", 25, func(val) {
if (val > 9950) {
@@ -93,6 +99,32 @@ var canvas_lowerECAMPageCruise =
} else {
obj["CABVS"].setText(sprintf("%-4.0f", math.round(val,50)));
}
+
+ if (val >= 25) {
+ obj["VS-Arrow-UP"].show();
+ obj["VS-Arrow-DN"].hide();
+ } elsif (val <= -25) {
+ obj["VS-Arrow-UP"].hide();
+ obj["VS-Arrow-DN"].show();
+ } else {
+ obj["VS-Arrow-UP"].hide();
+ obj["VS-Arrow-DN"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashValue("pressAlt", 25, func(val) {
+ if (val > 32750) {
+ obj["CABALT"].setText(sprintf("%5.0f", 32750));
+ } else if (val < -9950) {
+ obj["CABALT"].setText(sprintf("%5.0f", -9950));
+ } else {
+ obj["CABALT"].setText(sprintf("%5.0f", math.round(val,50)));
+ }
+
+ if (val > 9550) {
+ obj["CABALT"].setColor(1,0,0);
+ } else {
+ obj["CABALT"].setColor(0.0509,0.7529,0.2941);
+ }
}),
props.UpdateManager.FromHashValue("condTempCockpit", 0.5, func(val) {
obj["CKPT-TEMP"].setText(sprintf("%2.0f",val));
@@ -142,7 +174,7 @@ var canvas_lowerECAMPageCruise =
return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit"];
},
getKeys: func() {
- return["Oil1","Oil2","FUsed1","FUsed2","FUsed","VIB1N1","VIB1N2","VIB2N1","VIB2N2","deltaPSI","LDGELEV-AUTO","LDGELEV","CABVS","CABALT","VS-Arrow-UP","VS-Arrow-DN","CKPT-TEMP","FWD-TEMP","AFT-TEMP","Fused-weight-unit"];
+ return["Oil1","Oil2","OilUnit","FUsed1","FUsed2","FUsed","VIB1N1","VIB1N2","VIB2N1","VIB2N2","deltaPSI","LDGELEV-AUTO","LDGELEV","CABVS","CABALT","VS-Arrow-UP","VS-Arrow-DN","CKPT-TEMP","FWD-TEMP","AFT-TEMP","Fused-weight-unit"];
},
updateBottom: func(notification) {
foreach(var update_item_bottom; me.updateItemsBottom)
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas
index e29125f1..931d2a65 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-fctl.nas
@@ -23,6 +23,447 @@ var canvas_lowerECAMPageFctl =
# init
obj.update_items = [
+ props.UpdateManager.FromHashList(["green","elac1","elac2","sec2"], nil, func(val) {
+ if (val.green >= 1450) {
+ if (val.elac2 or val.sec2) {
+ obj["elevLgreen"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elevLgreen"].setColor(0.7333,0.3803,0);
+ }
+
+ if (val.elac2) {
+ obj["ailLgreen"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailLgreen"].setColor(0.7333,0.3803,0);
+ }
+ if (val.elac1) {
+ obj["ailRgreen"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailRgreen"].setColor(0.7333,0.3803,0);
+ }
+ obj["ruddergreen"].setColor(0.0509,0.7529,0.2941);
+ obj["PTgreen"].setColor(0.0509,0.7529,0.2941);
+ obj["spdbrkgreen"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailLgreen"].setColor(0.7333,0.3803,0);
+ obj["ailRgreen"].setColor(0.7333,0.3803,0);
+ obj["elevLgreen"].setColor(0.7333,0.3803,0);
+ obj["ruddergreen"].setColor(0.7333,0.3803,0);
+ obj["PTgreen"].setColor(0.7333,0.3803,0);
+ obj["spdbrkgreen"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashList(["yellow","elac2","sec2"], nil, func(val) {
+ if (val.yellow >= 1450) {
+ if (val.elac2 or val.sec2) {
+ obj["elevRyellow"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elevRyellow"].setColor(0.7333,0.3803,0);
+ }
+ obj["rudderyellow"].setColor(0.0509,0.7529,0.2941);
+ obj["PTyellow"].setColor(0.0509,0.7529,0.2941);
+ obj["spdbrkyellow"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elevRyellow"].setColor(0.7333,0.3803,0);
+ obj["rudderyellow"].setColor(0.7333,0.3803,0);
+ obj["PTyellow"].setColor(0.7333,0.3803,0);
+ obj["spdbrkyellow"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashList(["blue","elac1","elac2","sec1"], nil, func(val) {
+ if (val.blue >= 1500) {
+ if (val.elac1) {
+ obj["ailLblue"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailLblue"].setColor(0.7333,0.3803,0);
+ }
+ if (val.elac1 or val.sec1) {
+ obj["elevLblue"].setColor(0.0509,0.7529,0.2941);
+ obj["elevRblue"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elevLblue"].setColor(0.7333,0.3803,0);
+ obj["elevRblue"].setColor(0.7333,0.3803,0);
+ }
+ if (val.elac2) {
+ obj["ailRblue"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailRblue"].setColor(0.7333,0.3803,0);
+ }
+ obj["rudderblue"].setColor(0.0509,0.7529,0.2941);
+ obj["spdbrkblue"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["ailLblue"].setColor(0.7333,0.3803,0);
+ obj["ailRblue"].setColor(0.7333,0.3803,0);
+ obj["elevLblue"].setColor(0.7333,0.3803,0);
+ obj["elevRblue"].setColor(0.7333,0.3803,0);
+ obj["rudderblue"].setColor(0.7333,0.3803,0);
+ obj["spdbrkblue"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashValue("fctlAilL", 0.001, func(val) {
+ obj["ailL"].setTranslation(0, val * 100);
+ }),
+ props.UpdateManager.FromHashValue("fctlAilR", 0.001, func(val) {
+ obj["ailR"].setTranslation(0, val * -100);
+ }),
+ props.UpdateManager.FromHashList(["blue","green","elac1","elac2"], nil, func(val) {
+ if ((val.blue < 1500 or !val.elac1) and (val.green < 1500 or !val.elac2)) {
+ obj["ailL"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["ailL"].setColor(0.0509,0.7529,0.2941);
+ }
+ if ((val.green < 1500 or !val.elac1) and (val.blue < 1500 or !val.elac2)) {
+ obj["ailR"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["ailR"].setColor(0.0509,0.7529,0.2941);
+ }
+ }),
+ props.UpdateManager.FromHashValue("fctlElevL", 0.001, func(val) {
+ obj["elevL"].setTranslation(0, val * 100);
+ }),
+ props.UpdateManager.FromHashValue("fctlElevR", 0.001, func(val) {
+ obj["elevR"].setTranslation(0, val * 100);
+ }),
+ props.UpdateManager.FromHashList(["blue","green","yellow","elac1","elac2","sec1","sec2"], nil, func(val) {
+ if ((val.blue < 1500 or (!val.elac1 and !val.sec1)) and (val.green < 1500 or (!val.elac2 and !val.sec2))) {
+ obj["elevL"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["elevL"].setColor(0.0509,0.7529,0.2941);
+ }
+
+ if ((val.blue < 1500 or (!val.elac1 and !val.sec1)) and (val.yellow < 1500 or (!val.elac2 and !val.sec2))) {
+ obj["elevR"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["elevR"].setColor(0.0509,0.7529,0.2941);
+ }
+ }),
+ props.UpdateManager.FromHashValue("fctlElevTrim", 0.01, func(val) {
+ obj["PT"].setText(sprintf("%2.1f", val));
+ if (val >= 0.09) {
+ obj["PTupdn"].setText("UP");
+ obj["PTupdn"].show();
+ } elsif (val <= -0.09) {
+ obj["PTupdn"].setText("DN");
+ obj["PTupdn"].show();
+ } else {
+ obj["PTupdn"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashValue("elac1", nil, func(val) {
+ if (val) {
+ obj["elac1"].setColor(0.0509,0.7529,0.2941);
+ obj["path4249"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elac1"].setColor(0.7333,0.3803,0);
+ obj["path4249"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashValue("elac2", nil, func(val) {
+ if (val) {
+ obj["elac2"].setColor(0.0509,0.7529,0.2941);
+ obj["path4249-3"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["elac2"].setColor(0.7333,0.3803,0);
+ obj["path4249-3"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashValue("sec1", nil, func(val) {
+ if (val) {
+ obj["sec1"].setColor(0.0509,0.7529,0.2941);
+ obj["path4249-3-6-7"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["sec1"].setColor(0.7333,0.3803,0);
+ obj["path4249-3-6-7"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashValue("sec2", nil, func(val) {
+ if (val) {
+ obj["sec2"].setColor(0.0509,0.7529,0.2941);
+ obj["path4249-3-6-7-5"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["sec2"].setColor(0.7333,0.3803,0);
+ obj["path4249-3-6-7-5"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashValue("sec3", nil, func(val) {
+ if (val) {
+ obj["sec3"].setColor(0.0509,0.7529,0.2941);
+ obj["path4249-3-6"].setColor(0.0509,0.7529,0.2941);
+ } else {
+ obj["sec3"].setColor(0.7333,0.3803,0);
+ obj["path4249-3-6"].setColor(0.7333,0.3803,0);
+ }
+ }),
+ props.UpdateManager.FromHashList(["blue","yellow","green"], 25, func(val) {
+ if (val.green < 1500 and val.yellow < 1500) {
+ obj["PT"].setColor(0.7333,0.3803,0);
+ obj["PTupdn"].setColor(0.7333,0.3803,0);
+ obj["PTcc"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["PT"].setColor(0.0509,0.7529,0.2941);
+ obj["PTupdn"].setColor(0.0509,0.7529,0.2941);
+ obj["PTcc"].setColor(0.0901,0.6039,0.7176);
+ }
+
+ if (val.blue < 1500 and val.yellow < 1500 and val.green < 1500) {
+ obj["rudder"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["rudder"].setColor(0.0509,0.7529,0.2941);
+ }
+ }),
+ props.UpdateManager.FromHashValue("fctlRudder", 0.001, func(val) {
+ obj["rudder"].setRotation(val * -0.024);
+ }),
+ props.UpdateManager.FromHashValue("fctlRudderTrim", 0.01, func(val) {
+ obj["rudderTrimInd"].setRotation(val * -0.024);
+ }),
+ props.UpdateManager.FromHashValue("fctlTHSJam", nil, func(val) {
+ if (val) {
+ obj["pitchTrimStatus"].setColor(0.7333,0.3803,0);
+ } else {
+ obj["pitchTrimStatus"].setColor(0.8078,0.8039,0.8078);
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerL1", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler1Lex"].hide();
+ obj["spoiler1Lrt"].show();
+ } else {
+ obj["spoiler1Lrt"].hide();
+ obj["spoiler1Lex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerL2", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler2Lex"].hide();
+ obj["spoiler2Lrt"].show();
+ } else {
+ obj["spoiler2Lrt"].hide();
+ obj["spoiler2Lex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerL3", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler3Lex"].hide();
+ obj["spoiler3Lrt"].show();
+ } else {
+ obj["spoiler3Lrt"].hide();
+ obj["spoiler3Lex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerL4", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler4Lex"].hide();
+ obj["spoiler4Lrt"].show();
+ } else {
+ obj["spoiler4Lrt"].hide();
+ obj["spoiler4Lex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerL5", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler5Lex"].hide();
+ obj["spoiler5Lrt"].show();
+ } else {
+ obj["spoiler5Lrt"].hide();
+ obj["spoiler5Lex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerR1", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler1Rex"].hide();
+ obj["spoiler1Rrt"].show();
+ } else {
+ obj["spoiler1Rrt"].hide();
+ obj["spoiler1Rex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerR2", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler2Rex"].hide();
+ obj["spoiler2Rrt"].show();
+ } else {
+ obj["spoiler2Rrt"].hide();
+ obj["spoiler2Rex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerR3", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler3Rex"].hide();
+ obj["spoiler3Rrt"].show();
+ } else {
+ obj["spoiler3Rrt"].hide();
+ obj["spoiler3Rex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerR4", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler4Rex"].hide();
+ obj["spoiler4Rrt"].show();
+ } else {
+ obj["spoiler4Rrt"].hide();
+ obj["spoiler4Rex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashValue("spoilerR5", 0.5, func(val) {
+ if (val < 1.5) {
+ obj["spoiler5Rex"].hide();
+ obj["spoiler5Rrt"].show();
+ } else {
+ obj["spoiler5Rrt"].hide();
+ obj["spoiler5Rex"].show();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerL1Failure","spoilerL1","green"], nil, func(val) {
+ if (val.spoilerL1Failure or val.green < 1500) {
+ obj["spoiler1Lex"].setColor(0.7333,0.3803,0);
+ obj["spoiler1Lrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerL1 < 1.5) {
+ obj["spoiler1Lf"].show();
+ } else {
+ obj["spoiler1Lf"].hide();
+ }
+ } else {
+ obj["spoiler1Lex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler1Lrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler1Lf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerL2Failure","spoilerL2","yellow"], nil, func(val) {
+ if (val.spoilerL2Failure or val.yellow < 1500) {
+ obj["spoiler2Lex"].setColor(0.7333,0.3803,0);
+ obj["spoiler2Lrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerL2 < 1.5) {
+ obj["spoiler2Lf"].show();
+ } else {
+ obj["spoiler2Lf"].hide();
+ }
+ } else {
+ obj["spoiler2Lex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler2Lrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler2Lf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerL3Failure","spoilerL3","blue"], nil, func(val) {
+ if (val.spoilerL3Failure or val.blue < 1500) {
+ obj["spoiler3Lex"].setColor(0.7333,0.3803,0);
+ obj["spoiler3Lrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerL3 < 1.5) {
+ obj["spoiler3Lf"].show();
+ } else {
+ obj["spoiler3Lf"].hide();
+ }
+ } else {
+ obj["spoiler3Lex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler3Lrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler3Lf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerL4Failure","spoilerL4","yellow"], nil, func(val) {
+ if (val.spoilerL4Failure or val.yellow < 1500) {
+ obj["spoiler4Lex"].setColor(0.7333,0.3803,0);
+ obj["spoiler4Lrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerL4 < 1.5) {
+ obj["spoiler4Lf"].show();
+ } else {
+ obj["spoiler4Lf"].hide();
+ }
+ } else {
+ obj["spoiler4Lex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler4Lrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler4Lf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerL5Failure","spoilerL5","green"], nil, func(val) {
+ if (val.spoilerL5Failure or val.green < 1500) {
+ obj["spoiler5Lex"].setColor(0.7333,0.3803,0);
+ obj["spoiler5Lrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerL5 < 1.5) {
+ obj["spoiler5Lf"].show();
+ } else {
+ obj["spoiler5Lf"].hide();
+ }
+ } else {
+ obj["spoiler5Lex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler5Lrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler5Lf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerR1Failure","spoilerR1","green"], nil, func(val) {
+ if (val.spoilerR1Failure or val.green < 1500) {
+ obj["spoiler1Rex"].setColor(0.7333,0.3803,0);
+ obj["spoiler1Rrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerR1 < 1.5) {
+ obj["spoiler1Rf"].show();
+ } else {
+ obj["spoiler1Rf"].hide();
+ }
+ } else {
+ obj["spoiler1Rex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler1Rrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler1Rf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerR2Failure","spoilerR2","yellow"], nil, func(val) {
+ if (val.spoilerR2Failure or val.yellow < 1500) {
+ obj["spoiler2Rex"].setColor(0.7333,0.3803,0);
+ obj["spoiler2Rrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerR2 < 1.5) {
+ obj["spoiler2Rf"].show();
+ } else {
+ obj["spoiler2Rf"].hide();
+ }
+ } else {
+ obj["spoiler2Rex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler2Rrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler2Rf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerR3Failure","spoilerR3","blue"], nil, func(val) {
+ if (val.spoilerR3Failure or val.blue < 1500) {
+ obj["spoiler3Rex"].setColor(0.7333,0.3803,0);
+ obj["spoiler3Rrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerR3 < 1.5) {
+ obj["spoiler3Rf"].show();
+ } else {
+ obj["spoiler3Rf"].hide();
+ }
+ } else {
+ obj["spoiler3Rex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler3Rrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler3Rf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerR4Failure","spoilerR4","yellow"], nil, func(val) {
+ if (val.spoilerR4Failure or val.yellow < 1500) {
+ obj["spoiler4Rex"].setColor(0.7333,0.3803,0);
+ obj["spoiler4Rrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerR4 < 1.5) {
+ obj["spoiler4Rf"].show();
+ } else {
+ obj["spoiler4Rf"].hide();
+ }
+ } else {
+ obj["spoiler4Rex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler4Rrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler4Rf"].hide();
+ }
+ }),
+ props.UpdateManager.FromHashList(["spoilerR5Failure","spoilerR5","green"], nil, func(val) {
+ if (val.spoilerR5Failure or val.green < 1500) {
+ obj["spoiler5Rex"].setColor(0.7333,0.3803,0);
+ obj["spoiler5Rrt"].setColor(0.7333,0.3803,0);
+ if (val.spoilerR5 < 1.5) {
+ obj["spoiler5Rf"].show();
+ } else {
+ obj["spoiler5Rf"].hide();
+ }
+ } else {
+ obj["spoiler5Rex"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler5Rrt"].setColor(0.0509,0.7529,0.2941);
+ obj["spoiler5Rf"].hide();
+ }
+ }),
];
obj.displayedGForce = 0;
@@ -62,10 +503,11 @@ var canvas_lowerECAMPageFctl =
return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit"];
},
getKeys: func() {
- return["Bulk","BulkLine","BulkLbl","Exit1L","Exit1R","Cabin1Left","Cabin1LeftLbl","Cabin1LeftLine","Cabin1LeftSlide","Cabin1Right","Cabin1RightLbl","Cabin1RightLine","Cabin1RightSlide","Cabin2Left","Cabin2LeftLbl",
- "Cabin2LeftLine","Cabin2LeftSlide","Cabin2Right","Cabin2RightLbl","Cabin2RightLine","Cabin2RightSlide","Cabin3Left","Cabin3LeftLbl","Cabin3LeftLine","Cabin3LeftSlide","Cabin3Right","Cabin3RightLbl","Cabin3RightLine","Cabin3RightSlide","AvionicsLine1",
- "AvionicsLbl1","AvionicsLine2","AvionicsLbl2","Cargo1Line","Cargo1Lbl","Cargo1Door","Cargo2Line","Cargo2Lbl","Cargo2Door","ExitLSlide","ExitLLine","ExitLLbl","ExitRSlide","ExitRLine","ExitRLbl","Cabin4Left","Cabin4LeftLbl","Cabin4LeftLine",
- "Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR"];},
+ return["ailL","ailR","elevL","elevR","PTcc","PT","PTupdn","elac1","elac2","sec1","sec2","sec3","ailLblue","ailRblue","elevLblue","elevRblue","rudderblue","ailLgreen","ailRgreen","elevLgreen","ruddergreen","PTgreen",
+ "elevRyellow","rudderyellow","PTyellow","rudder","spdbrkblue","spdbrkgreen","spdbrkyellow","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex",
+ "spoiler1Lrt","spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf",
+ "spoiler5Lf","ailLscale","ailRscale","path4249","path4249-3","path4249-3-6-7","path4249-3-6-7-5","path4249-3-6","pitchTrimStatus","rudderTrimInd"];
+ },
updateBottom: func(notification) {
foreach(var update_item_bottom; me.updateItemsBottom)
{
@@ -140,6 +582,28 @@ var canvas_lowerECAMPageFctl =
};
var input = {
+ elac1: "/systems/fctl/elac1",
+ elac2: "/systems/fctl/elac2",
+ elac1Fail: "/systems/failures/fctl/elac1",
+ elac2Fail: "/systems/failures/fctl/elac2",
+ sec1: "/systems/fctl/sec1",
+ sec2: "/systems/fctl/sec2",
+ sec3: "/systems/fctl/sec3",
+ sec1Fail: "/systems/failures/fctl/sec1",
+ sec2Fail: "/systems/failures/fctl/sec2",
+ sec3Fail: "/systems/failures/fctl/sec3",
+ fac1: "/systems/fctl/fac1-healthy-signal",
+ fac2: "/systems/fctl/fac2-healthy-signal",
+ fac1Fail: "/systems/failures/fctl/fac1",
+ fac2Fail: "/systems/failures/fctl/fac2",
+ fctlAilL: "/ECAM/Lower/aileron-ind-left",
+ fctlAilR: "/ECAM/Lower/aileron-ind-right",
+ fctlElevL: "/ECAM/Lower/elevator-ind-left",
+ fctlElevR: "/ECAM/Lower/elevator-ind-right",
+ fctlElevTrim: "/ECAM/Lower/elevator-trim-deg",
+ fctlRudder: "/fdm/jsbsim/hydraulics/rudder/final-deg",
+ fctlRudderTrim: "/fdm/jsbsim/hydraulics/rudder/trim-deg",
+ fctlTHSJam: "/systems/failures/fctl/ths-jam",
};
foreach (var name; keys(input)) {
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas
index 251a7ddd..64dbbd05 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas
@@ -67,12 +67,12 @@ var oil_qt2 = props.globals.getNode("/ECAM/Lower/Oil-QT[1]", 1);
var oil_psi1 = props.globals.getNode("/ECAM/Lower/Oil-PSI[0]", 1);
var oil_psi2 = props.globals.getNode("/ECAM/Lower/Oil-PSI[1]", 1);
var bleedapu = props.globals.getNode("", 1);
-var aileron_ind_left = props.globals.getNode("/ECAM/Lower/aileron-ind-left", 1);
+var aileron_ind_left = props.globals.getNode("", 1);
var aileron_ind_right = props.globals.getNode("/ECAM/Lower/aileron-ind-right", 1);
-var elevator_ind_left = props.globals.getNode("/ECAM/Lower/elevator-ind-left", 1);
+var elevator_ind_left = props.globals.getNode("", 1);
var elevator_ind_right = props.globals.getNode("/ECAM/Lower/elevator-ind-right", 1);
-var elevator_trim_deg = props.globals.getNode("/ECAM/Lower/elevator-trim-deg", 1);
-var final_deg = props.globals.getNode("/fdm/jsbsim/hydraulics/rudder/final-deg", 1);
+var elevator_trim_deg = props.globals.getNode("", 1);
+var final_deg = props.globals.getNode("", 1);
var temperature_degc = props.globals.getNode("/environment/temperature-degc", 1);
var tank3_content_lbs = props.globals.getNode("/fdm/jsbsim/propulsion/tank[2]/contents-lbs", 1);
var ir2_knob = props.globals.getNode("/controls/adirs/ir[1]/knob", 1);
@@ -1487,318 +1487,16 @@ var canvas_lowerECAM_eng = {
},
};
-var canvas_lowerECAM_fctl = {
- new: func(canvas_group, file) {
- var m = {parents: [canvas_lowerECAM_fctl, canvas_lowerECAM_base]};
- m.init(canvas_group, file);
-
- return m;
- },
- getKeys: func() {
- return["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit","ailL","ailR","elevL","elevR","PTcc","PT","PTupdn","elac1","elac2","sec1","sec2","sec3","ailLblue","ailRblue","elevLblue","elevRblue","rudderblue","ailLgreen","ailRgreen","elevLgreen","ruddergreen","PTgreen",
- "elevRyellow","rudderyellow","PTyellow","rudder","spdbrkblue","spdbrkgreen","spdbrkyellow","spoiler1Rex","spoiler1Rrt","spoiler2Rex","spoiler2Rrt","spoiler3Rex","spoiler3Rrt","spoiler4Rex","spoiler4Rrt","spoiler5Rex","spoiler5Rrt","spoiler1Lex",
- "spoiler1Lrt","spoiler2Lex","spoiler2Lrt","spoiler3Lex","spoiler3Lrt","spoiler4Lex","spoiler4Lrt","spoiler5Lex","spoiler5Lrt","spoiler1Rf","spoiler2Rf","spoiler3Rf","spoiler4Rf","spoiler5Rf","spoiler1Lf","spoiler2Lf","spoiler3Lf","spoiler4Lf",
- "spoiler5Lf","ailLscale","ailRscale","path4249","path4249-3","path4249-3-6-7","path4249-3-6-7-5","path4249-3-6","text4343"];
- },
- update: func() {
- blue_psi = systems.HYD.Psi.blue.getValue();
- green_psi = systems.HYD.Psi.green.getValue();
- yellow_psi = systems.HYD.Psi.yellow.getValue();
- elac1Node = fbw.FBW.Computers.elac1.getValue();
- elac2Node = fbw.FBW.Computers.elac2.getValue();
- sec1Node = fbw.FBW.Computers.sec1.getValue();
- sec2Node = fbw.FBW.Computers.sec2.getValue();
-
- # Pitch Trim
- me["PT"].setText(sprintf("%2.1f", math.round(elevator_trim_deg.getValue(), 0.1)));
-
- if (math.round(elevator_trim_deg.getValue(), 0.1) >= 0) {
- me["PTupdn"].setText(sprintf("UP"));
- } else if (math.round(elevator_trim_deg.getValue(), 0.1) < 0) {
- me["PTupdn"].setText(sprintf("DN"));
- }
-
- if (green_psi < 1500 and yellow_psi < 1500) {
- me["PT"].setColor(0.7333,0.3803,0);
- me["PTupdn"].setColor(0.7333,0.3803,0);
- me["PTcc"].setColor(0.7333,0.3803,0);
- } else {
- me["PT"].setColor(0.0509,0.7529,0.2941);
- me["PTupdn"].setColor(0.0509,0.7529,0.2941);
- me["PTcc"].setColor(0.0509,0.7529,0.2941);
- }
- if (fbw.FBW.Failures.ths.getBoolValue()) {
- me["text4343"].setColor(0.7333,0.3803,0);
- } else {
- me["text4343"].setColor(0.8078,0.8039,0.8078);
- }
-
- # Ailerons
- me["ailL"].setTranslation(0, aileron_ind_left.getValue() * 100);
- me["ailR"].setTranslation(0, aileron_ind_right.getValue() * (-100));
-
- if ((blue_psi < 1500 or !elac1Node) and (green_psi < 1500 or !elac2Node)) {
- me["ailL"].setColor(0.7333,0.3803,0);
- } else {
- me["ailL"].setColor(0.0509,0.7529,0.2941);
- }
- if ((green_psi < 1500 or !elac1Node) and (blue_psi < 1500 or !elac2Node)) {
- me["ailR"].setColor(0.7333,0.3803,0);
- } else {
- me["ailR"].setColor(0.0509,0.7529,0.2941);
- }
# Elevators
- me["elevL"].setTranslation(0, elevator_ind_left.getValue() * 100);
- me["elevR"].setTranslation(0, elevator_ind_right.getValue() * 100);
-
- if ((blue_psi < 1500 or (!elac1Node and !sec1Node)) and (green_psi < 1500 or (!elac2Node and !sec2Node))) {
- me["elevL"].setColor(0.7333,0.3803,0);
- } else {
- me["elevL"].setColor(0.0509,0.7529,0.2941);
- }
-
- if ((blue_psi < 1500 or (!elac1Node and !sec1Node)) and (yellow_psi < 1500 or (!elac2Node and !sec2Node))) {
- me["elevR"].setColor(0.7333,0.3803,0);
- } else {
- me["elevR"].setColor(0.0509,0.7529,0.2941);
- }
-
- # Rudder
- me["rudder"].setRotation(final_deg.getValue() * -0.024);
-
- if (blue_psi < 1500 and yellow_psi < 1500 and green_psi < 1500) {
- me["rudder"].setColor(0.7333,0.3803,0);
- } else {
- me["rudder"].setColor(0.0509,0.7529,0.2941);
- }
-
- # Spoilers
- if (spoiler_L1.getValue() < 1.5) {
-
- } else {
-
- }
-
- if (spoiler_L2.getValue() < 1.5) {
- me["spoiler2Lex"].hide();
- me["spoiler2Lrt"].show();
- } else {
- me["spoiler2Lrt"].hide();
- me["spoiler2Lex"].show();
- }
-
- if (spoiler_L3.getValue() < 1.5) {
- me["spoiler3Lex"].hide();
- me["spoiler3Lrt"].show();
- } else {
- me["spoiler3Lrt"].hide();
- me["spoiler3Lex"].show();
- }
-
- if (spoiler_L4.getValue() < 1.5) {
- me["spoiler4Lex"].hide();
- me["spoiler4Lrt"].show();
- } else {
- me["spoiler4Lrt"].hide();
- me["spoiler4Lex"].show();
- }
-
- if (spoiler_L5.getValue() < 1.5) {
- me["spoiler5Lex"].hide();
- me["spoiler5Lrt"].show();
- } else {
- me["spoiler5Lrt"].hide();
- me["spoiler5Lex"].show();
- }
-
- if (spoiler_R1.getValue() < 1.5) {
- me["spoiler1Rex"].hide();
- me["spoiler1Rrt"].show();
- } else {
- me["spoiler1Rrt"].hide();
- me["spoiler1Rex"].show();
- }
-
- if (spoiler_R2.getValue() < 1.5) {
- me["spoiler2Rex"].hide();
- me["spoiler2Rrt"].show();
- } else {
- me["spoiler2Rrt"].hide();
- me["spoiler2Rex"].show();
- }
-
- if (spoiler_R3.getValue() < 1.5) {
- me["spoiler3Rex"].hide();
- me["spoiler3Rrt"].show();
- } else {
- me["spoiler3Rrt"].hide();
- me["spoiler3Rex"].show();
- }
-
- if (spoiler_R4.getValue() < 1.5) {
- me["spoiler4Rex"].hide();
- me["spoiler4Rrt"].show();
- } else {
- me["spoiler4Rrt"].hide();
- me["spoiler4Rex"].show();
- }
-
- if (spoiler_R5.getValue() < 1.5) {
- me["spoiler5Rex"].hide();
- me["spoiler5Rrt"].show();
- } else {
- me["spoiler5Rrt"].hide();
- me["spoiler5Rex"].show();
- }
-
- # Spoiler Fail
- if (fbw.FBW.Failures.spoilerl1.getValue() or green_psi < 1500) {
- me["spoiler1Lex"].setColor(0.7333,0.3803,0);
- me["spoiler1Lrt"].setColor(0.7333,0.3803,0);
- if (spoiler_L1.getValue() < 1.5) {
- me["spoiler1Lf"].show();
- } else {
- me["spoiler1Lf"].hide();
- }
- } else {
- me["spoiler1Lex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler1Lrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler1Lf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerl2.getValue() or yellow_psi < 1500) {
- me["spoiler2Lex"].setColor(0.7333,0.3803,0);
- me["spoiler2Lrt"].setColor(0.7333,0.3803,0);
- if (spoiler_L2.getValue() < 1.5) {
- me["spoiler2Lf"].show();
- } else {
- me["spoiler2Lf"].hide();
- }
- } else {
- me["spoiler2Lex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler2Lrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler2Lf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerl3.getValue() or blue_psi < 1500) {
- me["spoiler3Lex"].setColor(0.7333,0.3803,0);
- me["spoiler3Lrt"].setColor(0.7333,0.3803,0);
- if (spoiler_L3.getValue() < 1.5) {
- me["spoiler3Lf"].show();
- } else {
- me["spoiler3Lf"].hide();
- }
- } else {
- me["spoiler3Lex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler3Lrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler3Lf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerl4.getValue() or yellow_psi < 1500) {
- me["spoiler4Lex"].setColor(0.7333,0.3803,0);
- me["spoiler4Lrt"].setColor(0.7333,0.3803,0);
- if (spoiler_L4.getValue() < 1.5) {
- me["spoiler4Lf"].show();
- } else {
- me["spoiler4Lf"].hide();
- }
- } else {
- me["spoiler4Lex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler4Lrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler4Lf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerl5.getValue() or green_psi < 1500) {
- me["spoiler5Lex"].setColor(0.7333,0.3803,0);
- me["spoiler5Lrt"].setColor(0.7333,0.3803,0);
- if (spoiler_L5.getValue() < 1.5) {
- me["spoiler5Lf"].show();
- } else {
- me["spoiler5Lf"].hide();
- }
- } else {
- me["spoiler5Lex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler5Lrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler5Lf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerr1.getValue() or green_psi < 1500) {
- me["spoiler1Rex"].setColor(0.7333,0.3803,0);
- me["spoiler1Rrt"].setColor(0.7333,0.3803,0);
- if (spoiler_R1.getValue() < 1.5) {
- me["spoiler1Rf"].show();
- } else {
- me["spoiler1Rf"].hide();
- }
- } else {
- me["spoiler1Rex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler1Rrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler1Rf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerr2.getValue() or yellow_psi < 1500) {
- me["spoiler2Rex"].setColor(0.7333,0.3803,0);
- me["spoiler2Rrt"].setColor(0.7333,0.3803,0);
- if (spoiler_R2.getValue() < 1.5) {
- me["spoiler2Rf"].show();
- } else {
- me["spoiler2Rf"].hide();
- }
- } else {
- me["spoiler2Rex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler2Rrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler2Rf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerr3.getValue() or blue_psi < 1500) {
- me["spoiler3Rex"].setColor(0.7333,0.3803,0);
- me["spoiler3Rrt"].setColor(0.7333,0.3803,0);
- if (spoiler_R3.getValue() < 1.5) {
- me["spoiler3Rf"].show();
- } else {
- me["spoiler3Rf"].hide();
- }
- } else {
- me["spoiler3Rex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler3Rrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler3Rf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerr4.getValue() or yellow_psi < 1500) {
- me["spoiler4Rex"].setColor(0.7333,0.3803,0);
- me["spoiler4Rrt"].setColor(0.7333,0.3803,0);
- if (spoiler_R4.getValue() < 1.5) {
- me["spoiler4Rf"].show();
- } else {
- me["spoiler4Rf"].hide();
- }
- } else {
- me["spoiler4Rex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler4Rrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler4Rf"].hide();
- }
-
- if (fbw.FBW.Failures.spoilerr5.getValue() or green_psi < 1500) {
- me["spoiler5Rex"].setColor(0.7333,0.3803,0);
- me["spoiler5Rrt"].setColor(0.7333,0.3803,0);
- if (spoiler_R5.getValue() < 1.5) {
- me["spoiler5Rf"].show();
- } else {
- me["spoiler5Rf"].hide();
- }
- } else {
- me["spoiler5Rex"].setColor(0.0509,0.7529,0.2941);
- me["spoiler5Rrt"].setColor(0.0509,0.7529,0.2941);
- me["spoiler5Rf"].hide();
- }
+
# Flight Computers
if (elac1Node) {
me["elac1"].setColor(0.0509,0.7529,0.2941);
- me["path4249"].setColor(0.0509,0.7529,0.2941);
+ me.setColor(0.0509,0.7529,0.2941);
} else if (!elac1Node or fbw.FBW.Failures.elac1.getValue()) {
me["elac1"].setColor(0.7333,0.3803,0);
me["path4249"].setColor(0.7333,0.3803,0);
@@ -1806,7 +1504,7 @@ var canvas_lowerECAM_fctl = {
if (elac2Node) {
me["elac2"].setColor(0.0509,0.7529,0.2941);
- me["path4249-3"].setColor(0.0509,0.7529,0.2941);
+ me.setColor(0.0509,0.7529,0.2941);
} else if (!elac2Node or fbw.FBW.Failures.elac2.getValue()) {
me["elac2"].setColor(0.7333,0.3803,0);
me["path4249-3"].setColor(0.7333,0.3803,0);
@@ -1837,79 +1535,8 @@ var canvas_lowerECAM_fctl = {
}
# Hydraulic Indicators
- if (blue_psi >= 1500) {
- if (elac1Node) {
- me["ailLblue"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailLblue"].setColor(0.7333,0.3803,0);
- }
- if (elac1Node or sec1Node) {
- me["elevLblue"].setColor(0.0509,0.7529,0.2941);
- me["elevRblue"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["elevLblue"].setColor(0.7333,0.3803,0);
- me["elevRblue"].setColor(0.7333,0.3803,0);
- }
- if (elac2Node) {
- me["ailRblue"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailRblue"].setColor(0.7333,0.3803,0);
- }
- me["rudderblue"].setColor(0.0509,0.7529,0.2941);
- me["spdbrkblue"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailLblue"].setColor(0.7333,0.3803,0);
- me["ailRblue"].setColor(0.7333,0.3803,0);
- me["elevLblue"].setColor(0.7333,0.3803,0);
- me["elevRblue"].setColor(0.7333,0.3803,0);
- me["rudderblue"].setColor(0.7333,0.3803,0);
- me["spdbrkblue"].setColor(0.7333,0.3803,0);
- }
+
- if (green_psi >= 1500) {
- if (elac2Node or sec2Node) {
- me["elevLgreen"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["elevLgreen"].setColor(0.7333,0.3803,0);
- }
-
- if (elac2Node) {
- me["ailLgreen"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailLgreen"].setColor(0.7333,0.3803,0);
- }
- if (elac1Node) {
- me["ailRgreen"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailRgreen"].setColor(0.7333,0.3803,0);
- }
- me["ruddergreen"].setColor(0.0509,0.7529,0.2941);
- me["PTgreen"].setColor(0.0509,0.7529,0.2941);
- me["spdbrkgreen"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["ailLgreen"].setColor(0.7333,0.3803,0);
- me["ailRgreen"].setColor(0.7333,0.3803,0);
- me["elevLgreen"].setColor(0.7333,0.3803,0);
- me["ruddergreen"].setColor(0.7333,0.3803,0);
- me["PTgreen"].setColor(0.7333,0.3803,0);
- me["spdbrkgreen"].setColor(0.7333,0.3803,0);
- }
-
- if (yellow_psi >= 1500) {
- if (elac2Node or sec2Node) {
- me["elevRyellow"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["elevRyellow"].setColor(0.7333,0.3803,0);
- }
- me["rudderyellow"].setColor(0.0509,0.7529,0.2941);
- me["PTyellow"].setColor(0.0509,0.7529,0.2941);
- me["spdbrkyellow"].setColor(0.0509,0.7529,0.2941);
- } else {
- me["elevRyellow"].setColor(0.7333,0.3803,0);
- me["rudderyellow"].setColor(0.7333,0.3803,0);
- me["PTyellow"].setColor(0.7333,0.3803,0);
- me["spdbrkyellow"].setColor(0.7333,0.3803,0);
- }
me.updateBottomStatus();
},
diff --git a/Models/Instruments/Lower-ECAM/res/crz.svg b/Models/Instruments/Lower-ECAM/res/crz.svg
index 6b0f58fe..bfc066bb 100644
--- a/Models/Instruments/Lower-ECAM/res/crz.svg
+++ b/Models/Instruments/Lower-ECAM/res/crz.svg
@@ -41,9 +41,9 @@
inkscape:window-height="705"
id="namedview371"
showgrid="true"
- inkscape:zoom="0.35355339"
- inkscape:cx="242.38307"
- inkscape:cy="680.25272"
+ inkscape:zoom="1"
+ inkscape:cx="470.5927"
+ inkscape:cy="1012.5262"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@@ -337,14 +337,14 @@
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:-1.60000002px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:4.02423px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="399.71744"
- y="631.84998"
+ y="628.96643"
id="ELEC-IDG-2-num-label"
inkscape:label="#text5149"
transform="scale(0.96119963,1.0403666)">P
+ transform="matrix(-0.55570012,0,0,0.85384443,799.83103,551.6097)" />
N1
0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#0dc04b;stroke-width:1px">500
REGUL LO PR
1300
1650
@@ -37,14 +37,14 @@
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1030"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
id="namedview371"
- showgrid="true"
- inkscape:zoom="1"
- inkscape:cx="683.58709"
- inkscape:cy="286.7536"
- inkscape:window-x="1592"
+ showgrid="false"
+ inkscape:zoom="1.28"
+ inkscape:cx="608.14718"
+ inkscape:cy="323.45523"
+ inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
@@ -81,8 +81,7 @@
style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="500.75214"
y="977.31793"
- id="text6232"
- sodipodi:linespacing="0%">120000
°C
G.LOAD 0.6
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">G.LOAD 0.6
-
DN
°
+ style="font-size:32px;line-height:1.25;fill:#179ab7;fill-opacity:1;">°
AIL
L
AIL
R
+ y="408.59415" />
G
- B
+ y="408.1442" />
B
+ y="408.1442" />
G
L
R
+ y="408.69415" />
B
+ y="664.86768" />
B
+ y="664.86139" />
G
+ y="663.84418" />
B
+ y="663.84418" />
Y
ELEV
ELEV
5
+
diff --git a/Nasal/FBW/it-fbw.nas b/Nasal/FBW/it-fbw.nas
index 48b5f427..ad04e827 100644
--- a/Nasal/FBW/it-fbw.nas
+++ b/Nasal/FBW/it-fbw.nas
@@ -67,7 +67,7 @@ var FBW = {
rtlu1: props.globals.getNode("/systems/failures/fctl/rtlu-1"),
rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"),
rtlu2: props.globals.getNode("/systems/failures/fctl/rtlu-2"),
- ths: props.globals.getNode("/systems/failures/fctl/ths-jam"),
+ ths: props.globals.getNode(""),
spoilerl1: props.globals.getNode(""),
spoilerl2: props.globals.getNode("/systems/failures/spoilers/spoiler-l2"),
spoilerl3: props.globals.getNode("/systems/failures/spoilers/spoiler-l3"),