From 7164240d75ae6010da2d06cbfb097fd5a6ee7a83 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 26 Nov 2017 15:52:09 -0500 Subject: [PATCH] A32X: New IAE Upper ECAM --- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 50 +- .../Instruments/Upper-ECAM/res/iae-eis2.svg | 2807 ++++++++++------- Systems/upper-ecam.xml | 91 +- revision.txt | 2 +- 4 files changed, 1657 insertions(+), 1293 deletions(-) diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index e897e30e..a94dd568 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -267,8 +267,8 @@ var canvas_upperECAM_cfm_eis2 = { getKeys: func() { return ["N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-box","N11-scale","N11-scale2","N11-scaletick","N11-scalenum","N11-XX","N11-XX2","N11-XX-box","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick", "EGT1-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal","N12-box","N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N12-XX2","N12-XX-box","EGT2-needle","EGT2", - "EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX", - "FOB-LBS","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","FlapTxt","FlapDots","N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1","REV1-box","REV2","REV2-box"]; + "EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","FlapTxt","FlapDots","N1Lim-mode","N1Lim", + "N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1","REV1-box","REV2","REV2-box"]; }, update: func() { # N1 @@ -293,8 +293,8 @@ var canvas_upperECAM_cfm_eis2 = { me["N11-decimal"].show(); me["N11-decpnt"].show(); me["N11-needle"].show(); - me["N11-scaletick"].show(); me["N11-ylim"].show(); + me["N11-scaletick"].show(); me["N11-scalenum"].show(); me["N11-box"].show(); me["N11-XX"].hide(); @@ -307,8 +307,8 @@ var canvas_upperECAM_cfm_eis2 = { me["N11-decimal"].hide(); me["N11-decpnt"].hide(); me["N11-needle"].hide(); - me["N11-scaletick"].hide(); me["N11-ylim"].hide(); + me["N11-scaletick"].hide(); me["N11-scalenum"].hide(); me["N11-box"].hide(); me["N11-XX"].show(); @@ -329,8 +329,8 @@ var canvas_upperECAM_cfm_eis2 = { me["N12-decimal"].show(); me["N12-decpnt"].show(); me["N12-needle"].show(); - me["N12-scaletick"].show(); me["N12-ylim"].show(); + me["N12-scaletick"].show(); me["N12-scalenum"].show(); me["N12-box"].show(); me["N12-XX"].hide(); @@ -343,8 +343,8 @@ var canvas_upperECAM_cfm_eis2 = { me["N12-decimal"].hide(); me["N12-decpnt"].hide(); me["N12-needle"].hide(); - me["N12-scaletick"].hide(); me["N12-ylim"].hide(); + me["N12-scaletick"].hide(); me["N12-scalenum"].hide(); me["N12-box"].hide(); me["N12-XX"].show(); @@ -486,15 +486,18 @@ var canvas_upperECAM_iae_eis2 = { return m; }, getKeys: func() { - return ["EPR1-needle","EPR1-thr","EPR1-ylim","EPR1","EPR1-box","EPR1-scale","EPR1-scalenum","EPR1-XX","EPR1-XX2","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick","EGT1-XX","N11-needle","N11-thr","N11-ylim","N11","N11-decpnt", - "N11-decimal","N11-scale","N11-scale2","N11-scalenum","N11-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","EPR2-needle","EPR2-thr","EPR2-ylim","EPR2","EPR2-box","EPR2-scale","EPR2-scalenum","EPR2-XX","EPR2-XX2","EGT2-needle","EGT2", - "EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal","N12-scale","N12-scale2","N12-scalenum","N12-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX", - "FOB-LBS","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","FlapTxt","FlapDots","EPRLim-mode","EPRLim","EPRLim-XX","EPRLim-XX2","REV1","REV1-box","REV2","REV2-box"]; + return ["EPR1-needle","EPR1-thr","EPR1-ylim","EPR1","EPR1-decpnt","EPR1-decimal","EPR1-box","EPR1-scale","EPR1-scaletick","EPR1-scalenum","EPR1-XX","EPR1-XX2","EGT1-needle","EGT1","EGT1-scale","EGT1-box","EGT1-scale2","EGT1-scaletick","EGT1-XX", + "N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-scale","N11-scale2","N11-scaletick","N11-scalenum","N11-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","EPR2-needle","EPR2-thr","EPR2-ylim","EPR2","EPR2-decpnt", + "EPR2-decimal","EPR2-box","EPR2-scale","EPR2-scaletick","EPR2-scalenum","EPR2-XX","EPR2-XX2","EGT2-needle","EGT2","EGT2-scale","EGT2-scale2","EGT2-box","EGT2-scaletick","EGT2-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal", + "N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","FlapTxt","FlapDots","EPRLim-mode","EPRLim", + "EPRLim-decpnt","EPRLim-decimal","EPRLim-XX","EPRLim-XX2","REV1","REV1-box","REV2","REV2-box"]; }, update: func() { # EPR - me["EPR1"].setText(sprintf("%1.3f", getprop("/engines/engine[0]/epr-actual"))); - me["EPR2"].setText(sprintf("%1.3f", getprop("/engines/engine[1]/epr-actual"))); + me["EPR1"].setText(sprintf("%1.0f", math.floor(getprop("/engines/engine[0]/epr-actual")))); + me["EPR1-decimal"].setText(sprintf("%03d", (getprop("/engines/engine[0]/epr-actual") - int(getprop("/engines/engine[0]/epr-actual"))) * 1000)); + me["EPR2"].setText(sprintf("%1.0f", math.floor(getprop("/engines/engine[1]/epr-actual")))); + me["EPR2-decimal"].setText(sprintf("%03d", (getprop("/engines/engine[1]/epr-actual") - int(getprop("/engines/engine[1]/epr-actual"))) * 1000)); me["EPR1-needle"].setRotation((getprop("/ECAM/Upper/EPR[0]") + 90) * D2R); me["EPR1-thr"].setRotation((getprop("/ECAM/Upper/EPRthr[0]") + 90) * D2R); @@ -506,8 +509,11 @@ var canvas_upperECAM_iae_eis2 = { if (getprop("/systems/fadec/eng1/epr") == 1) { me["EPR1-scale"].setColor(0.8078,0.8039,0.8078); me["EPR1"].show(); + me["EPR1-decpnt"].show(); + me["EPR1-decimal"].show(); me["EPR1-needle"].show(); me["EPR1-ylim"].show(); + me["EPR1-scaletick"].show(); me["EPR1-scalenum"].show(); me["EPR1-box"].show(); me["EPR1-XX"].hide(); @@ -515,8 +521,11 @@ var canvas_upperECAM_iae_eis2 = { } else { me["EPR1-scale"].setColor(0.7333,0.3803,0); me["EPR1"].hide(); + me["EPR1-decpnt"].hide(); + me["EPR1-decimal"].hide(); me["EPR1-needle"].hide(); me["EPR1-ylim"].hide(); + me["EPR1-scaletick"].hide(); me["EPR1-scalenum"].hide(); me["EPR1-box"].hide(); me["EPR1-XX"].show(); @@ -532,8 +541,11 @@ var canvas_upperECAM_iae_eis2 = { if (getprop("/systems/fadec/eng2/epr") == 1) { me["EPR2-scale"].setColor(0.8078,0.8039,0.8078); me["EPR2"].show(); + me["EPR2-decpnt"].show(); + me["EPR2-decimal"].show(); me["EPR2-needle"].show(); me["EPR2-ylim"].show(); + me["EPR2-scaletick"].show(); me["EPR2-scalenum"].show(); me["EPR2-box"].show(); me["EPR2-XX"].hide(); @@ -541,8 +553,11 @@ var canvas_upperECAM_iae_eis2 = { } else { me["EPR2-scale"].setColor(0.7333,0.3803,0); me["EPR2"].hide(); + me["EPR2-decpnt"].hide(); + me["EPR2-decimal"].hide(); me["EPR2-needle"].hide(); me["EPR2-ylim"].hide(); + me["EPR2-scaletick"].hide(); me["EPR2-scalenum"].hide(); me["EPR2-box"].hide(); me["EPR2-XX"].show(); @@ -620,6 +635,7 @@ var canvas_upperECAM_iae_eis2 = { me["N11-decimal"].show(); me["N11-decpnt"].show(); me["N11-needle"].show(); + me["N11-scaletick"].show(); me["N11-scalenum"].show(); me["N11-XX"].hide(); } else { @@ -629,6 +645,7 @@ var canvas_upperECAM_iae_eis2 = { me["N11-decimal"].hide(); me["N11-decpnt"].hide(); me["N11-needle"].hide(); + me["N11-scaletick"].hide(); me["N11-scalenum"].hide(); me["N11-XX"].show(); } @@ -640,6 +657,7 @@ var canvas_upperECAM_iae_eis2 = { me["N12-decimal"].show(); me["N12-decpnt"].show(); me["N12-needle"].show(); + me["N12-scaletick"].show(); me["N12-scalenum"].show(); me["N12-XX"].hide(); } else { @@ -649,6 +667,7 @@ var canvas_upperECAM_iae_eis2 = { me["N12-decimal"].hide(); me["N12-decpnt"].hide(); me["N12-needle"].hide(); + me["N12-scaletick"].hide(); me["N12-scalenum"].hide(); me["N12-XX"].show(); } @@ -721,16 +740,21 @@ var canvas_upperECAM_iae_eis2 = { # EPR Limit me["EPRLim-mode"].setText(sprintf("%s", getprop("/controls/engines/thrust-limit"))); - me["EPRLim"].setText(sprintf("%1.3f", getprop("/controls/engines/epr-limit"))); + me["EPRLim"].setText(sprintf("%1.0f", math.floor(getprop("/controls/engines/epr-limit")))); + me["EPRLim-decimal"].setText(sprintf("%03d", (getprop("/controls/engines/epr-limit") - int(getprop("/controls/engines/epr-limit"))) * 1000)); if (getprop("/systems/fadec/powered1") == 1 or getprop("/systems/fadec/powered2") == 1) { me["EPRLim-mode"].show(); me["EPRLim"].show(); + me["EPRLim-decpnt"].show(); + me["EPRLim-decimal"].show(); me["EPRLim-XX"].hide(); me["EPRLim-XX2"].hide(); } else { me["EPRLim-mode"].hide(); me["EPRLim"].hide(); + me["EPRLim-decpnt"].hide(); + me["EPRLim-decimal"].hide(); me["EPRLim-XX"].show(); me["EPRLim-XX2"].show(); } diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg index 5f909e86..9674b16b 100644 --- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg +++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg @@ -12,7 +12,7 @@ viewBox="0 0 1024 1024" version="1.1" id="svg2" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.91 r13725" sodipodi:docname="iae-eis2.svg"> @@ -40,10 +40,10 @@ inkscape:window-width="1920" inkscape:window-height="1030" id="namedview371" - showgrid="true" - inkscape:zoom="0.7071068" - inkscape:cx="878.30853" - inkscape:cy="1077.3416" + showgrid="false" + inkscape:zoom="3.0622118" + inkscape:cx="1105.0255" + inkscape:cy="1220.4997" inkscape:window-x="1592" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -54,1229 +54,82 @@ type="xygrid" id="grid5153" /> - - - - EPR - EGT - °C - N1 - % - % - N2 - % - N2 - FF - LBS/H - FF - LBS/H - FOB : - LBS - - - - - - - - - - - 1 - 1.2 - 1.4 - 1.6 - - 1.000 -   - - - - - - - - - - - - - 4 - 10 - - - 000 - 00 - 00000 0 - 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.71494293px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1" + y="84.634453" + x="907.75818" + id="tspan4464" + sodipodi:role="line">1 - 0 - XX - XX - XX - XX - XX - 0000000 - LINE 1 - LINE 2 - LINE 3 - LINE 4 - LINE 5 - LINE 6 - LINE 7 - LINE 8 + transform="matrix(0,1,-1,0,0,0)" + y="-649.10144" + x="719.36029" + height="8.496521" + width="255.78604" + id="rect4285" + style="fill:#666666;fill-opacity:1" /> + + - - XX - TOGA - 1.000 - XX - XX - - - + id="path4447" + style="fill:none;fill-rule:evenodd;stroke:#575757;stroke-width:5.19999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 718.11442,596.89138 11.4047,16.81213 m -36.4425,-17.34853 -10.5797,15.51213 m 11.1047,-15.46213 24.4703,0.46213 m -35.5703,14.98787 47.0582,1.94289" + inkscape:connector-curvature="0" /> 1+F - 00000 - XX - 00 - - 0 - XX - - - - - - - - - - 1 - 1.2 - 1.4 - 1.6 - - 1.000 - - - - - - - - - - - - - 4 - 10 - - - 000 - 00 - - 0 - XX - XX - XX - - - XX - - - - - REV - - REV + inkscape:label="#g4344" + transform="translate(-12.155904,31.48427)"> @@ -1284,11 +137,11 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4351" - d="m 545.30001,615.15001 9.50347,-2.225 -1.075,3.72508 -9.90347,2.525 z" + d="m 545.30001,617.95001 9.50347,-2.225 -1.075,3.72508 -9.90347,2.525 z" style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> @@ -1296,11 +149,11 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4355" - d="m 851.34655,600.69907 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z" + d="m 867.18574,600.69907 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z" style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> @@ -1308,29 +161,1545 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4359" - d="m 942.90745,624.35524 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z" + d="m 958.74664,624.35524 -9.50347,-2.225 1.075,3.72508 9.90347,2.525 z" style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecdce;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> S F +   LBS + LINE 1 + LINE 2 + FOB : + 000000 + LBS/H + FF + N2 + % + EGT + °C + N1 + % + 0000 + XX + 0000 + XX + + 00 + 0 + XX + + 00 + 0 + XX + TOGA + XX + 000 + XX + 000 + + XX + + + 1 + + 1 + 1.2 + 1.4 + 1.6 + + + + + + + + + + + + 000 + + + XX + + + + + + + + + + LINE 3 + LINE 4 + LINE 5 + LINE 6 + LINE 7 + LINE 8 + N2 + % + LBS/H + FF + EPR + + + + 4 + 10 + + + + + + + + + + + + + + 00 + 0 + XX + + XX + REV + 000 + + XX + + + 1 + + 1 + 1.2 + 1.4 + 1.6 + + + + + + + + + + + + 000 + + + XX + + + + + + + + + + + + + + + + + + + + + 4 + 10 + + + + + + 00 + 0 + XX + + XX + REV diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml index 052df43b..a85df83b 100644 --- a/Systems/upper-ecam.xml +++ b/Systems/upper-ecam.xml @@ -22,11 +22,11 @@ /engines/engine[0]/epr-actual - 0.980-134 + 0.970-1391.000-125 - 1.200 -50 + 1.200 -551.400 16 - 1.600 82 + 1.600 871.650 98
 @@ -49,11 +49,11 @@ /engines/engine[0]/epr-cmd - 0.980-134 + 0.970-1391.000-125 - 1.200 -50 + 1.200 -551.400 16 - 1.600 82 + 1.600 871.650 98
 @@ -76,11 +76,11 @@ /engines/engine[1]/epr-actual - 0.980-134 + 0.970-1391.000-125 - 1.200 -50 + 1.200 -551.400 16 - 1.600 82 + 1.600 871.650 98
 @@ -103,11 +103,11 @@ /engines/engine[1]/epr-cmd - 0.980-134 + 0.970-1391.000-125 - 1.200 -50 + 1.200 -551.400 16 - 1.600 82 + 1.600 871.650 98
 @@ -130,11 +130,11 @@ /systems/thrust/epr/toga-lim - 0.980-134 + 0.970-1391.000-125 - 1.200 -50 + 1.200 -551.400 16 - 1.600 82 + 1.600 871.650 98
 @@ -252,10 +252,10 @@ /engines/engine[0]/n1-actual - 22.4-107 - 40.0 -61 - 100.0 65 - 110.0 90 + 22.4-108.0 + 40.0 -67.5 + 100.0 67.5 + 110.0 90.0
 @@ -293,10 +293,10 @@ /engines/engine[0]/n1-actual-cmd - 22.4-107 - 40.0 -61 - 100.0 65 - 110.0 90 + 22.4-108.0 + 40.0 -67.5 + 100.0 67.5 + 110.0 90.0
 @@ -334,10 +334,10 @@ /engines/engine[1]/n1-actual - 22.4-107 - 40.0 -61 - 100.0 65 - 110.0 90 + 22.4-108.0 + 40.0 -67.5 + 100.0 67.5 + 110.0 90.0
 @@ -375,10 +375,10 @@ /engines/engine[1]/n1-actual-cmd - 22.4-107 - 40.0 -61 - 100.0 65 - 110.0 90 + 22.4-108.0 + 40.0 -67.5 + 100.0 67.5 + 110.0 90.0
 @@ -390,35 +390,6 @@ gain 1 - - - /options/EIS2 - - /options/eng - CFM - - - - - - /systems/thrust/n1/toga-lim - 19.7-131 - 50.0 -64 - 100.0 48 - 110.0 65 -
- - - - - - /options/EIS2 - - /options/eng - CFM - - - /systems/thrust/n1/toga-lim diff --git a/revision.txt b/revision.txt index 70626b2f..b98d0ae2 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4033 \ No newline at end of file +4034 \ No newline at end of file