Improve crossbleed on ECAM even more; APU EGT now reflected in temeprature
This commit is contained in:
parent
7f5c407ce0
commit
bd4e51d2bf
3 changed files with 121 additions and 68 deletions
|
@ -739,13 +739,14 @@ var canvas_lowerECAM_bleed = {
|
||||||
return m;
|
return m;
|
||||||
},
|
},
|
||||||
getKeys: func() {
|
getKeys: func() {
|
||||||
return ["TAT","SAT","GW","UTCh","UTCm","GW-weight-unit", "BLEED-XFEED", "BLEED-Ram-Air", "BLEED-APU", "BLEED-HP-Valve-1","BLEED-APU-LINES",
|
return ["TAT","SAT","GW","UTCh","UTCm","GW-weight-unit", "BLEED-XFEED", "BLEED-Ram-Air", "BLEED-APU", "BLEED-HP-Valve-1",
|
||||||
"BLEED-ENG-1", "BLEED-HP-Valve-2", "BLEED-ENG-2", "BLEED-Precooler-1-Inlet-Press", "BLEED-Precooler-1-Outlet-Temp","BLEED-XFEEDLines",
|
"BLEED-APU-LINES","BLEED-ENG-1", "BLEED-HP-Valve-2", "BLEED-ENG-2", "BLEED-Precooler-1-Inlet-Press", "BLEED-Precooler-1-Outlet-Temp",
|
||||||
"BLEED-Precooler-2-Inlet-Press", "BLEED-Precooler-2-Outlet-Temp", "BLEED-ENG-1-label", "BLEED-ENG-2-label",
|
"BLEED-Precooler-2-Inlet-Press", "BLEED-Precooler-2-Outlet-Temp", "BLEED-ENG-1-label", "BLEED-ENG-2-label",
|
||||||
"BLEED-GND", "BLEED-Pack-1-Flow-Valve", "BLEED-Pack-2-Flow-Valve", "BLEED-Pack-1-Out-Temp",
|
"BLEED-GND", "BLEED-Pack-1-Flow-Valve", "BLEED-Pack-2-Flow-Valve", "BLEED-Pack-1-Out-Temp","BLEED-APU-connectionTop",
|
||||||
"BLEED-Pack-1-Comp-Out-Temp", "BLEED-Pack-1-Packflow-needel", "BLEED-Pack-1-Bypass-needel", "BLEED-Pack-2-Out-Temp",
|
"BLEED-Pack-1-Comp-Out-Temp", "BLEED-Pack-1-Packflow-needel", "BLEED-Pack-1-Bypass-needel", "BLEED-Pack-2-Out-Temp",
|
||||||
"BLEED-Pack-2-Bypass-needel", "BLEED-Pack-2-Comp-Out-Temp", "BLEED-Pack-2-Packflow-needel", "BLEED-Anti-Ice-Left",
|
"BLEED-Pack-2-Bypass-needel", "BLEED-Pack-2-Comp-Out-Temp", "BLEED-Pack-2-Packflow-needel", "BLEED-Anti-Ice-Left",
|
||||||
"BLEED-Anti-Ice-Right", "BLEED-HP-2-connection", "BLEED-HP-1-connection", "BLEED-ANTI-ICE-ARROW-LEFT", "BLEED-ANTI-ICE-ARROW-RIGHT"];
|
"BLEED-Anti-Ice-Right", "BLEED-HP-2-connection", "BLEED-HP-1-connection", "BLEED-ANTI-ICE-ARROW-LEFT", "BLEED-ANTI-ICE-ARROW-RIGHT",
|
||||||
|
"BLEED-xbleedLeft","BLEED-xbleedCenter","BLEED-xbleedRight"];
|
||||||
},
|
},
|
||||||
update: func() {
|
update: func() {
|
||||||
# X BLEED
|
# X BLEED
|
||||||
|
@ -766,10 +767,12 @@ var canvas_lowerECAM_bleed = {
|
||||||
me["BLEED-XFEED"].setRotation(45 * D2R);
|
me["BLEED-XFEED"].setRotation(45 * D2R);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xbleedstate != 0) {
|
if (xbleedstate == 1) {
|
||||||
me["BLEED-XFEEDLines"].show();
|
me["BLEED-xbleedCenter"].show();
|
||||||
|
me["BLEED-xbleedRight"].show();
|
||||||
} else {
|
} else {
|
||||||
me["BLEED-XFEEDLines"].hide();
|
me["BLEED-xbleedCenter"].hide();
|
||||||
|
me["BLEED-xbleedRight"].hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
# HP valve 1
|
# HP valve 1
|
||||||
|
@ -824,8 +827,16 @@ var canvas_lowerECAM_bleed = {
|
||||||
me["BLEED-APU-LINES"].show();
|
me["BLEED-APU-LINES"].show();
|
||||||
if (apu_valve_state2 == 1) {
|
if (apu_valve_state2 == 1) {
|
||||||
me["BLEED-APU"].setRotation(0);
|
me["BLEED-APU"].setRotation(0);
|
||||||
|
me["BLEED-APU-connectionTop"].show();
|
||||||
|
me["BLEED-xbleedLeft"].show();
|
||||||
} else {
|
} else {
|
||||||
me["BLEED-APU"].setRotation(90 * D2R);
|
me["BLEED-APU"].setRotation(90 * D2R);
|
||||||
|
me["BLEED-APU-connectionTop"].hide();
|
||||||
|
if (xbleed.getValue() != 1) {
|
||||||
|
me["BLEED-xbleedLeft"].hide();
|
||||||
|
} else {
|
||||||
|
me["BLEED-xbleedLeft"].show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (apuBleedNotOn.getValue() != 1) {
|
if (apuBleedNotOn.getValue() != 1) {
|
||||||
me["BLEED-APU"].setColor(0.0509,0.7529,0.2941);
|
me["BLEED-APU"].setColor(0.0509,0.7529,0.2941);
|
||||||
|
@ -833,7 +844,13 @@ var canvas_lowerECAM_bleed = {
|
||||||
me["BLEED-APU"].setColor(0.7333,0.3803,0);
|
me["BLEED-APU"].setColor(0.7333,0.3803,0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (xbleed.getValue() != 1) {
|
||||||
|
me["BLEED-xbleedLeft"].hide();
|
||||||
|
} else {
|
||||||
|
me["BLEED-xbleedLeft"].show();
|
||||||
|
}
|
||||||
me["BLEED-APU-LINES"].hide();
|
me["BLEED-APU-LINES"].hide();
|
||||||
|
me["BLEED-APU-connectionTop"].hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
# ENG BLEED valve 2
|
# ENG BLEED valve 2
|
||||||
|
|
|
@ -42,8 +42,8 @@
|
||||||
id="namedview371"
|
id="namedview371"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
inkscape:zoom="0.73868665"
|
inkscape:zoom="0.73868665"
|
||||||
inkscape:cx="546.41121"
|
inkscape:cx="667.77011"
|
||||||
inkscape:cy="680.16775"
|
inkscape:cy="792.63918"
|
||||||
inkscape:window-x="-8"
|
inkscape:window-x="-8"
|
||||||
inkscape:window-y="-8"
|
inkscape:window-y="-8"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
|
@ -292,27 +292,28 @@
|
||||||
y="-817.5"
|
y="-817.5"
|
||||||
transform="rotate(90)"
|
transform="rotate(90)"
|
||||||
inkscape:label="#rect5105-6-4-5-0" />
|
inkscape:label="#rect5105-6-4-5-0" />
|
||||||
|
<g
|
||||||
|
id="BLEED-APU"
|
||||||
|
inkscape:label="#g3445"
|
||||||
|
transform="rotate(-90,880.67779,539.2177)" />
|
||||||
<g
|
<g
|
||||||
id="BLEED-APU-LINES"
|
id="BLEED-APU-LINES"
|
||||||
inkscape:label="#g4686">
|
inkscape:label="#g1035">
|
||||||
<g
|
<path
|
||||||
transform="rotate(-90,880.67779,539.2177)"
|
style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:4.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
inkscape:label="#g3445"
|
d="m 872.14551,172.28989 c 0,15.58192 -12.63164,28.21356 -28.21356,28.21356 -15.58192,0 -28.21356,-12.63164 -28.21356,-28.21356 0,-15.58192 12.63164,-28.21356 28.21356,-28.21356 15.58192,0 28.21356,12.63164 28.21356,28.21356 z"
|
||||||
id="BLEED-APU">
|
id="path5107-1-44-0"
|
||||||
<path
|
inkscape:connector-curvature="0"
|
||||||
style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:4.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
sodipodi:nodetypes="zzzzz"
|
||||||
d="m 872.14551,172.28989 c 0,15.58192 -12.63164,28.21356 -28.21356,28.21356 -15.58192,0 -28.21356,-12.63164 -28.21356,-28.21356 0,-15.58192 12.63164,-28.21356 28.21356,-28.21356 15.58192,0 28.21356,12.63164 28.21356,28.21356 z"
|
transform="rotate(-90,880.67777,539.21767)" />
|
||||||
id="path5107-1-44-0"
|
<rect
|
||||||
inkscape:connector-curvature="0"
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
sodipodi:nodetypes="zzzzz" />
|
id="rect5105-2-5-3-6"
|
||||||
<rect
|
width="53.195583"
|
||||||
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
height="5.1203089"
|
||||||
id="rect5105-2-5-3-6"
|
x="817.61298"
|
||||||
width="53.195583"
|
y="169.28328"
|
||||||
height="5.1203089"
|
transform="rotate(-90,880.67777,539.21767)" />
|
||||||
x="817.61298"
|
|
||||||
y="169.28328" />
|
|
||||||
</g>
|
|
||||||
<rect
|
<rect
|
||||||
y="602.28253"
|
y="602.28253"
|
||||||
x="510.74338"
|
x="510.74338"
|
||||||
|
@ -320,14 +321,6 @@
|
||||||
width="5.3955846"
|
width="5.3955846"
|
||||||
id="rect5105-6-4-5-1"
|
id="rect5105-6-4-5-1"
|
||||||
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.27201295;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.27201295;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
<rect
|
|
||||||
inkscape:label="#rect5105-6-4-5-3"
|
|
||||||
y="465.25"
|
|
||||||
x="510.46811"
|
|
||||||
height="83.83696"
|
|
||||||
width="5.3955846"
|
|
||||||
id="BLEED-APU-connection"
|
|
||||||
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.95566499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
|
||||||
</g>
|
</g>
|
||||||
<g
|
<g
|
||||||
id="BLEED-GND"
|
id="BLEED-GND"
|
||||||
|
@ -351,26 +344,32 @@
|
||||||
d="m 394.46275,504.39542 h 29.17835 v 0 L 409.59225,480.539 v 0 z"
|
d="m 394.46275,504.39542 h 29.17835 v 0 L 409.59225,480.539 v 0 z"
|
||||||
style="fill:none;stroke:#cecdce;stroke-width:2.87359571;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
style="fill:none;stroke:#cecdce;stroke-width:2.87359571;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
</g>
|
</g>
|
||||||
<g
|
<rect
|
||||||
id="BLEED-XFEEDLines"
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.91679168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
inkscape:label="#g1014">
|
id="BLEED-APU-connectionTop"
|
||||||
<rect
|
width="5.3955846"
|
||||||
transform="rotate(90)"
|
height="80.537186"
|
||||||
y="-581.08691"
|
x="510.46811"
|
||||||
x="463.6044"
|
y="465.25"
|
||||||
height="367.33694"
|
inkscape:label="#rect5105-6-4-5-3" />
|
||||||
width="5.3955846"
|
<rect
|
||||||
id="rect5105-5"
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:3.71239424;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:4.09363317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
id="BLEED-xbleedLeft"
|
||||||
<rect
|
width="5.3955846"
|
||||||
transform="rotate(90)"
|
height="302.10294"
|
||||||
y="-813.75"
|
x="463.6044"
|
||||||
x="464.18976"
|
y="-515.85291"
|
||||||
height="175.90536"
|
transform="rotate(90)"
|
||||||
width="4.7754087"
|
inkscape:label="#rect5105-5" />
|
||||||
id="rect5105-5-7"
|
<rect
|
||||||
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.66503072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.64573288;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
</g>
|
id="BLEED-xbleedRight"
|
||||||
|
width="4.7754087"
|
||||||
|
height="173.36708"
|
||||||
|
x="464.18976"
|
||||||
|
y="-813.75"
|
||||||
|
transform="rotate(90)"
|
||||||
|
inkscape:label="#rect5105-5-7" />
|
||||||
<g
|
<g
|
||||||
id="BLEED-Pack-1-Flow-Valve"
|
id="BLEED-Pack-1-Flow-Valve"
|
||||||
inkscape:label="#g3445"
|
inkscape:label="#g3445"
|
||||||
|
@ -1350,4 +1349,13 @@
|
||||||
x="560.88452"
|
x="560.88452"
|
||||||
y="976.25214"
|
y="976.25214"
|
||||||
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:center;text-anchor:middle;fill:#0dc04b">00</tspan></text>
|
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:center;text-anchor:middle;fill:#0dc04b">00</tspan></text>
|
||||||
|
<rect
|
||||||
|
transform="rotate(90)"
|
||||||
|
y="-580.51971"
|
||||||
|
x="463.6044"
|
||||||
|
height="64.666832"
|
||||||
|
width="5.3955846"
|
||||||
|
id="BLEED-xbleedCenter"
|
||||||
|
style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:1.71758175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
inkscape:label="#rect1024" />
|
||||||
</svg>
|
</svg>
|
||||||
|
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 73 KiB |
|
@ -648,12 +648,26 @@
|
||||||
<function>
|
<function>
|
||||||
<sum>
|
<sum>
|
||||||
<property>/environment/temperature-degc</property>
|
<property>/environment/temperature-degc</property>
|
||||||
<product>
|
<ifthen>
|
||||||
<property>/systems/pneumatics/valves/engine-1-prv-valve</property>
|
<nq>
|
||||||
<property>/systems/pneumatics/valves/engine-1-opv-valve</property>
|
<product>
|
||||||
<property>/engines/engine[0]/egt-actual</property>
|
<property>/systems/pneumatics/valves/engine-1-prv-valve</property>
|
||||||
<value>0.35</value>
|
<property>/systems/pneumatics/valves/engine-1-opv-valve</property>
|
||||||
</product>
|
</product>
|
||||||
|
<value>0</value>
|
||||||
|
</nq>
|
||||||
|
<product>
|
||||||
|
<property>/systems/pneumatics/valves/engine-1-prv-valve</property>
|
||||||
|
<property>/systems/pneumatics/valves/engine-1-opv-valve</property>
|
||||||
|
<property>/engines/engine[0]/egt-actual</property>
|
||||||
|
<value>0.35</value>
|
||||||
|
</product>
|
||||||
|
<product>
|
||||||
|
<property>/systems/pneumatics/valves/apu-bleed-valve</property>
|
||||||
|
<property>/systems/apu/egt-degC</property>
|
||||||
|
<value>0.40</value>
|
||||||
|
</product>
|
||||||
|
</ifthen>
|
||||||
</sum>
|
</sum>
|
||||||
</function>
|
</function>
|
||||||
</fcs_function>
|
</fcs_function>
|
||||||
|
@ -714,12 +728,26 @@
|
||||||
<function>
|
<function>
|
||||||
<sum>
|
<sum>
|
||||||
<property>/environment/temperature-degc</property>
|
<property>/environment/temperature-degc</property>
|
||||||
<product>
|
<ifthen>
|
||||||
<property>/systems/pneumatics/valves/engine-2-prv-valve</property>
|
<nq>
|
||||||
<property>/systems/pneumatics/valves/engine-2-opv-valve</property>
|
<product>
|
||||||
<property>/engines/engine[1]/egt-actual</property>
|
<property>/systems/pneumatics/valves/engine-2-prv-valve</property>
|
||||||
<value>0.35</value>
|
<property>/systems/pneumatics/valves/engine-2-opv-valve</property>
|
||||||
</product>
|
</product>
|
||||||
|
<value>0</value>
|
||||||
|
</nq>
|
||||||
|
<product>
|
||||||
|
<property>/systems/pneumatics/valves/engine-2-prv-valve</property>
|
||||||
|
<property>/systems/pneumatics/valves/engine-2-opv-valve</property>
|
||||||
|
<property>/engines/engine[1]/egt-actual</property>
|
||||||
|
<value>0.35</value>
|
||||||
|
</product>
|
||||||
|
<product>
|
||||||
|
<property>/systems/pneumatics/valves/apu-bleed-valve</property>
|
||||||
|
<property>/systems/apu/egt-degC</property>
|
||||||
|
<value>0.40</value>
|
||||||
|
</product>
|
||||||
|
</ifthen>
|
||||||
</sum>
|
</sum>
|
||||||
</function>
|
</function>
|
||||||
</fcs_function>
|
</fcs_function>
|
||||||
|
|
Loading…
Reference in a new issue