fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A32X: New CFM Upper ECAM

Browse source
This commit is contained in:
Joshua Davidson 2017-11-26 11:33:25 -05:00
parent a3682a6dac
commit 99c78b9d3b
7 changed files with 1290 additions and 3678 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,9 +265,9 @@ var canvas_upperECAM_cfm_eis2 = {
return m;
},
getKeys: func() {
return ["N11-needle","N11-thr","N11-ylim","N11","N11-decpnt","N11-decimal","N11-box","N11-scale","N11-scale2","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-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",
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"];
},
update: func() {
@ -293,6 +293,7 @@ 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-scalenum"].show();
me["N11-box"].show();
@ -306,6 +307,7 @@ 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-scalenum"].hide();
me["N11-box"].hide();
@ -327,6 +329,7 @@ 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-scalenum"].show();
me["N12-box"].show();
@ -340,6 +343,7 @@ 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-scalenum"].hide();
me["N12-box"].hide();

1211
Models/Instruments/Upper-ECAM/res/cfm-eis1.svg
View file

File diff suppressed because it is too large Load diff
Side by side

Before

Width:  |  Height:  |  Size: 78 KiB

2224
Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
View file

File diff suppressed because it is too large Load diff
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 79 KiB

83
Models/Instruments/Upper-ECAM/res/ecam-curve.svg Normal file
View file

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1024pt"
height="1024pt"
viewBox="0 0 1024 1024"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="cfm-eis2 - Copy.svg">
<metadata
id="metadata375">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs373" />
<sodipodi:namedview
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1"
objecttolerance="20"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1030"
id="namedview371"
showgrid="false"
inkscape:zoom="1"
inkscape:cx="531.71827"
inkscape:cy="888.89266"
inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
showguides="false"
inkscape:snap-global="false">
<inkscape:grid
type="xygrid"
id="grid5153" />
</sodipodi:namedview>
<circle
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cecdce;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
id="N11-scale"
inkscape:label="#path4519"
d="M 257.22857,207.07578 A 86.911873,86.911873 0 0 1 228.21016,118.5673 86.911873,86.911873 0 0 1 295.94364,54.629882 86.911873,86.911873 0 0 1 382.6333,88.699228"
sodipodi:type="arc"
sodipodi:start="2.2592576"
sodipodi:end="5.6523678"
sodipodi:ry="86.911873"
sodipodi:rx="86.911873"
sodipodi:cy="139.9603"
sodipodi:cx="312.448"
sodipodi:open="true" />
<circle
sodipodi:cx="312.4476"
sodipodi:cy="341.59766"
sodipodi:rx="82.481667"
sodipodi:ry="82.481773"
sodipodi:end="6.0448538"
sodipodi:start="3.1415927"
sodipodi:type="arc"
d="m 229.96593,341.59765 a 82.481667,82.481773 0 0 1 72.67593,-81.89682 82.481667,82.481773 0 0 1 89.95592,62.4244"
inkscape:label="#path4519"
id="EGT1-scale"
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cecdce;stroke-width:4.15280008;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
sodipodi:open="true" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

1398
Models/Instruments/Upper-ECAM/res/iae-eis1.svg
View file

File diff suppressed because it is too large Load diff
Side by side

Before

Width:  |  Height:  |  Size: 90 KiB

40
Systems/upper-ecam.xml
View file

@ -235,10 +235,10 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual</property>
<entry><ind> 19.7</ind><dep>-134</dep></entry>
<entry><ind> 50.0</ind><dep> -58</dep></entry>
<entry><ind>100.0</ind><dep> 42</dep></entry>
<entry><ind>110.0</ind><dep> 59</dep></entry>
<entry><ind> 19.7</ind><dep>-131</dep></entry>
<entry><ind> 50.0</ind><dep> -64</dep></entry>
<entry><ind>100.0</ind><dep> 48</dep></entry>
<entry><ind>110.0</ind><dep> 65</dep></entry>
</table>
</expression>
</input>
@ -276,10 +276,10 @@
<expression>
<table>
<property>/engines/engine[0]/n1-actual-cmd</property>
<entry><ind> 19.7</ind><dep>-134</dep></entry>
<entry><ind> 50.0</ind><dep> -58</dep></entry>
<entry><ind>100.0</ind><dep> 42</dep></entry>
<entry><ind>110.0</ind><dep> 59</dep></entry>
<entry><ind> 19.7</ind><dep>-131</dep></entry>
<entry><ind> 50.0</ind><dep> -64</dep></entry>
<entry><ind>100.0</ind><dep> 48</dep></entry>
<entry><ind>110.0</ind><dep> 65</dep></entry>
</table>
</expression>
</input>
@ -317,10 +317,10 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual</property>
<entry><ind> 19.7</ind><dep>-134</dep></entry>
<entry><ind> 50.0</ind><dep> -58</dep></entry>
<entry><ind>100.0</ind><dep> 42</dep></entry>
<entry><ind>110.0</ind><dep> 59</dep></entry>
<entry><ind> 19.7</ind><dep>-131</dep></entry>
<entry><ind> 50.0</ind><dep> -64</dep></entry>
<entry><ind>100.0</ind><dep> 48</dep></entry>
<entry><ind>110.0</ind><dep> 65</dep></entry>
</table>
</expression>
</input>
@ -358,10 +358,10 @@
<expression>
<table>
<property>/engines/engine[1]/n1-actual-cmd</property>
<entry><ind> 19.7</ind><dep>-134</dep></entry>
<entry><ind> 50.0</ind><dep> -58</dep></entry>
<entry><ind>100.0</ind><dep> 42</dep></entry>
<entry><ind>110.0</ind><dep> 59</dep></entry>
<entry><ind> 19.7</ind><dep>-131</dep></entry>
<entry><ind> 50.0</ind><dep> -64</dep></entry>
<entry><ind>100.0</ind><dep> 48</dep></entry>
<entry><ind>110.0</ind><dep> 65</dep></entry>
</table>
</expression>
</input>
@ -402,10 +402,10 @@
<expression>
<table>
<property>/systems/thrust/n1/toga-lim</property>
<entry><ind> 19.7</ind><dep>-116</dep></entry>
<entry><ind> 50.0</ind><dep> -45</dep></entry>
<entry><ind>100.0</ind><dep> 69</dep></entry>
<entry><ind>110.0</ind><dep> 90</dep></entry>
<entry><ind> 19.7</ind><dep>-131</dep></entry>
<entry><ind> 50.0</ind><dep> -64</dep></entry>
<entry><ind>100.0</ind><dep> 48</dep></entry>
<entry><ind>110.0</ind><dep> 65</dep></entry>
</table>
</expression>
</input>

2
revision.txt
View file

@ -1 +1 @@
4032
4033