diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 81539cef..5e02a9d4 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -12,6 +12,9 @@ var lowerECAM_fctl = nil; var lowerECAM_display = nil; var page = "eng"; var oat = getprop("/environment/temperature-degc"); +var blue_psi = 0; +var green_psi = 0; +var yellow_psi = 0; setprop("/systems/electrical/extra/apu-load", 0); setprop("/systems/electrical/extra/apu-volts", 0); setprop("/systems/electrical/extra/apu-hz", 0); @@ -339,9 +342,9 @@ var canvas_lowerECAM_fctl = { "ailLscale","ailRscale","path4249","path4249-3","path4249-3-6-7","path4249-3-6-7-5","path4249-3-6"]; }, update: func() { - var blue_psi = getprop("/systems/hydraulic/blue-psi"); - var green_psi = getprop("/systems/hydraulic/green-psi"); - var yellow_psi = getprop("/systems/hydraulic/yellow-psi"); + blue_psi = getprop("/systems/hydraulic/blue-psi"); + green_psi = getprop("/systems/hydraulic/green-psi"); + yellow_psi = getprop("/systems/hydraulic/yellow-psi"); # Pitch Trim me["PT"].setText(sprintf("%2.1f", getprop("/ECAM/Lower/elevator-trim-deg"))); @@ -400,7 +403,7 @@ var canvas_lowerECAM_fctl = { } # Spoilers - if (getprop("/controls/flight/spoiler-l1") < 0.083) { + if (getprop("/controls/flight/spoiler-l1") < 0.033) { me["spoiler1Lex"].hide(); me["spoiler1Lrt"].show(); } else { @@ -408,7 +411,7 @@ var canvas_lowerECAM_fctl = { me["spoiler1Lex"].show(); } - if (getprop("/controls/flight/spoiler-l2") < 0.083) { + if (getprop("/controls/flight/spoiler-l2") < 0.033) { me["spoiler2Lex"].hide(); me["spoiler2Lrt"].show(); } else { @@ -416,7 +419,7 @@ var canvas_lowerECAM_fctl = { me["spoiler2Lex"].show(); } - if (getprop("/controls/flight/spoiler-l3") < 0.083) { + if (getprop("/controls/flight/spoiler-l3") < 0.033) { me["spoiler3Lex"].hide(); me["spoiler3Lrt"].show(); } else { @@ -424,7 +427,7 @@ var canvas_lowerECAM_fctl = { me["spoiler3Lex"].show(); } - if (getprop("/controls/flight/spoiler-l4") < 0.083) { + if (getprop("/controls/flight/spoiler-l4") < 0.033) { me["spoiler4Lex"].hide(); me["spoiler4Lrt"].show(); } else { @@ -432,7 +435,7 @@ var canvas_lowerECAM_fctl = { me["spoiler4Lex"].show(); } - if (getprop("/controls/flight/spoiler-l5") < 0.083) { + if (getprop("/controls/flight/spoiler-l5") < 0.033) { me["spoiler5Lex"].hide(); me["spoiler5Lrt"].show(); } else { @@ -440,7 +443,7 @@ var canvas_lowerECAM_fctl = { me["spoiler5Lex"].show(); } - if (getprop("/controls/flight/spoiler-r1") < 0.083) { + if (getprop("/controls/flight/spoiler-r1") < 0.033) { me["spoiler1Rex"].hide(); me["spoiler1Rrt"].show(); } else { @@ -448,7 +451,7 @@ var canvas_lowerECAM_fctl = { me["spoiler1Rex"].show(); } - if (getprop("/controls/flight/spoiler-r2")<0.083) { + if (getprop("/controls/flight/spoiler-r2") < 0.033) { me["spoiler2Rex"].hide(); me["spoiler2Rrt"].show(); } else { @@ -456,7 +459,7 @@ var canvas_lowerECAM_fctl = { me["spoiler2Rex"].show(); } - if (getprop("/controls/flight/spoiler-r3") < 0.083) { + if (getprop("/controls/flight/spoiler-r3") < 0.033) { me["spoiler3Rex"].hide(); me["spoiler3Rrt"].show(); } else { @@ -464,7 +467,7 @@ var canvas_lowerECAM_fctl = { me["spoiler3Rex"].show(); } - if (getprop("/controls/flight/spoiler-r4") < 0.083) { + if (getprop("/controls/flight/spoiler-r4") < 0.033) { me["spoiler4Rex"].hide(); me["spoiler4Rrt"].show(); } else { @@ -472,7 +475,7 @@ var canvas_lowerECAM_fctl = { me["spoiler4Rex"].show(); } - if (getprop("/controls/flight/spoiler-r5") < 0.083) { + if (getprop("/controls/flight/spoiler-r5") < 0.033) { me["spoiler5Rex"].hide(); me["spoiler5Rrt"].show(); } else { @@ -481,10 +484,10 @@ var canvas_lowerECAM_fctl = { } # Spoiler Fail - if (getprop("/controls/flight/spoiler-l1-failed")) { + if (getprop("/controls/flight/spoiler-l1-failed") or green_psi < 1500) { me["spoiler1Lex"].setColor(1,0.6,0); me["spoiler1Lrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-l1") < 0.083) { + if (getprop("/controls/flight/spoiler-l1") < 0.033) { me["spoiler1Lf"].show(); } else { me["spoiler1Lf"].hide(); @@ -495,10 +498,10 @@ var canvas_lowerECAM_fctl = { me["spoiler1Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l2-failed")) { + if (getprop("/controls/flight/spoiler-l2-failed") or yellow_psi < 1500) { me["spoiler2Lex"].setColor(1,0.6,0); me["spoiler2Lrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-l2") < 0.083) { + if (getprop("/controls/flight/spoiler-l2") < 0.033) { me["spoiler2Lf"].show(); } else { me["spoiler2Lf"].hide(); @@ -509,10 +512,10 @@ var canvas_lowerECAM_fctl = { me["spoiler2Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l3-failed")) { + if (getprop("/controls/flight/spoiler-l3-failed") or blue_psi < 1500) { me["spoiler3Lex"].setColor(1,0.6,0); me["spoiler3Lrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-l3") < 0.083) { + if (getprop("/controls/flight/spoiler-l3") < 0.033) { me["spoiler3Lf"].show(); } else { me["spoiler3Lf"].hide(); @@ -523,10 +526,10 @@ var canvas_lowerECAM_fctl = { me["spoiler3Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l4-failed")) { + if (getprop("/controls/flight/spoiler-l4-failed") or yellow_psi < 1500) { me["spoiler4Lex"].setColor(1,0.6,0); me["spoiler4Lrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-l4") < 0.083) { + if (getprop("/controls/flight/spoiler-l4") < 0.033) { me["spoiler4Lf"].show(); } else { me["spoiler4Lf"].hide(); @@ -537,10 +540,10 @@ var canvas_lowerECAM_fctl = { me["spoiler4Lf"].hide(); } - if (getprop("/controls/flight/spoiler-l5-failed")) { + if (getprop("/controls/flight/spoiler-l5-failed") or green_psi < 1500) { me["spoiler5Lex"].setColor(1,0.6,0); me["spoiler5Lrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-l5") < 0.083) { + if (getprop("/controls/flight/spoiler-l5") < 0.033) { me["spoiler5Lf"].show(); } else { me["spoiler5Lf"].hide(); @@ -551,10 +554,10 @@ var canvas_lowerECAM_fctl = { me["spoiler5Lf"].hide(); } - if (getprop("/controls/flight/spoiler-r1-failed")) { + if (getprop("/controls/flight/spoiler-r1-failed") or green_psi < 1500) { me["spoiler1Rex"].setColor(1,0.6,0); me["spoiler1Rrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-r1") < 0.083) { + if (getprop("/controls/flight/spoiler-r1") < 0.033) { me["spoiler1Rf"].show(); } else { me["spoiler1Rf"].hide(); @@ -565,10 +568,10 @@ var canvas_lowerECAM_fctl = { me["spoiler1Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r2-failed")) { + if (getprop("/controls/flight/spoiler-r2-failed") or yellow_psi < 1500) { me["spoiler2Rex"].setColor(1,0.6,0); me["spoiler2Rrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-r2") < 0.083) { + if (getprop("/controls/flight/spoiler-r2") < 0.033) { me["spoiler2Rf"].show(); } else { me["spoiler2Rf"].hide(); @@ -579,10 +582,10 @@ var canvas_lowerECAM_fctl = { me["spoiler2Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r3-failed")) { + if (getprop("/controls/flight/spoiler-r3-failed") or blue_psi < 1500) { me["spoiler3Rex"].setColor(1,0.6,0); me["spoiler3Rrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-r3") < 0.083) { + if (getprop("/controls/flight/spoiler-r3") < 0.033) { me["spoiler3Rf"].show(); } else { me["spoiler3Rf"].hide(); @@ -593,10 +596,10 @@ var canvas_lowerECAM_fctl = { me["spoiler3Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r4-failed")) { + if (getprop("/controls/flight/spoiler-r4-failed") or yellow_psi < 1500) { me["spoiler4Rex"].setColor(1,0.6,0); me["spoiler4Rrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-r4") < 0.083) { + if (getprop("/controls/flight/spoiler-r4") < 0.033) { me["spoiler4Rf"].show(); } else { me["spoiler4Rf"].hide(); @@ -607,10 +610,10 @@ var canvas_lowerECAM_fctl = { me["spoiler4Rf"].hide(); } - if (getprop("/controls/flight/spoiler-r5-failed")) { + if (getprop("/controls/flight/spoiler-r5-failed") or green_psi < 1500) { me["spoiler5Rex"].setColor(1,0.6,0); me["spoiler5Rrt"].setColor(1,0.6,0); - if (getprop("/controls/flight/spoiler-r5") < 0.083) { + if (getprop("/controls/flight/spoiler-r5") < 0.033) { me["spoiler5Rf"].show(); } else { me["spoiler5Rf"].hide(); diff --git a/Models/Instruments/Lower-ECAM/res/fctl.svg b/Models/Instruments/Lower-ECAM/res/fctl.svg index 90d4b39b..062c0594 100644 --- a/Models/Instruments/Lower-ECAM/res/fctl.svg +++ b/Models/Instruments/Lower-ECAM/res/fctl.svg @@ -41,9 +41,9 @@ inkscape:window-height="1030" id="namedview371" showgrid="true" - inkscape:zoom="0.70710678" - inkscape:cx="301.03521" - inkscape:cy="1155.6813" + inkscape:zoom="1" + inkscape:cx="871.58709" + inkscape:cy="1066.7536" inkscape:window-x="1592" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -1119,128 +1119,6 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" inkscape:label="#path4545" /> - 1 - 1 - 2 - 2 - 3 - 3 - 4 - 4 - 5 - 5 ELAC + 1 + 2 + 3 + 4 + 5 + 1 + 2 + 3 + 4 + 5 diff --git a/revision.txt b/revision.txt index e45bf767..8c122704 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -2103 \ No newline at end of file +2105 \ No newline at end of file