fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
Jonathan Redpath 2022-05-07 17:57:58 +01:00
commit b1b051211c
5 changed files with 54 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
A320-main.xml
View file

@ -4776,9 +4776,10 @@
<file>Aircraft/A320-family/AircraftConfig/acconfig.nas</file> <file>Aircraft/A320-family/AircraftConfig/acconfig.nas</file>
</acconfig> </acconfig>
<effects> <effects>
<file>Aircraft/A320-family/Nasal/Effects/icing.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file> <file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file> <file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/icing.nas</file> <file>Aircraft/A320-family/Nasal/Effects/tyresmoke.nas</file>
</effects> </effects>
<systems> <systems>
<file>Aircraft/A320-family/Nasal/Systems/APU.nas</file> <file>Aircraft/A320-family/Nasal/Systems/APU.nas</file>
@ -4796,7 +4797,6 @@
<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file> <file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file> <file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
<file>Aircraft/A320-family/Nasal/Panels/clock.nas</file> <file>Aircraft/A320-family/Nasal/Panels/clock.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
</systems> </systems>
<ecam> <ecam>
<file>Aircraft/A320-family/Nasal/ECAM/SystemDisplay.nas</file> <file>Aircraft/A320-family/Nasal/ECAM/SystemDisplay.nas</file>

4
Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas
View file

@ -25,9 +25,9 @@ var canvas_lowerECAMPageCruise =
obj.update_items = [ obj.update_items = [
props.UpdateManager.FromHashList(["engOil1", "acconfigUnits"], 0.005, func(val) { props.UpdateManager.FromHashList(["engOil1", "acconfigUnits"], 0.005, func(val) {
if (val.acconfigUnits) { if (val.acconfigUnits) {
obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQt1 * QT2LTR * 10, 5)), 0, 99.5)); obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOil1 * QT2LTR * 10, 5)), 0, 99.5));
} else { } else {
obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQt1 * 10, 5)), 0, 99.5)); obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOil1 * 10, 5)), 0, 99.5));
} }
}), }),
props.UpdateManager.FromHashList(["engOil2", "acconfigUnits"], 0.005, func(val) { props.UpdateManager.FromHashList(["engOil2", "acconfigUnits"], 0.005, func(val) {

22
Models/Instruments/Lower-ECAM/Lower-ECAM-eng.nas
View file

@ -40,6 +40,8 @@ var canvas_lowerECAMPageEng =
} else { } else {
obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQT1 * 10, 5)), 0, 99.5)); obj.quantity[0] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQT1 * 10, 5)), 0, 99.5));
} }
obj["OilQT1"].setText(sprintf("%s", left(obj.quantity[0], (size(obj.quantity[0]) == 4 ? 2 : 1))));
obj["OilQT1-decimal"].setText(sprintf("%s", right(obj.quantity[0], 1)));
obj["OilQT1-needle"].setRotation(math.clamp(val.engOilQT1, 0, 27) * 6.66 * D2R); obj["OilQT1-needle"].setRotation(math.clamp(val.engOilQT1, 0, 27) * 6.66 * D2R);
}), }),
props.UpdateManager.FromHashList(["engOilQT2","acconfigUnits"], 0.005, func(val) { props.UpdateManager.FromHashList(["engOilQT2","acconfigUnits"], 0.005, func(val) {
@ -48,6 +50,8 @@ var canvas_lowerECAMPageEng =
} else { } else {
obj.quantity[1] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQT2 * 10, 5)), 0, 99.5)); obj.quantity[1] = sprintf("%2.1f", math.clamp((0.1 * math.round(val.engOilQT2 * 10, 5)), 0, 99.5));
} }
obj["OilQT2"].setText(sprintf("%s", left(obj.quantity[1], (size(obj.quantity[1]) == 4 ? 2 : 1))));
obj["OilQT2-decimal"].setText(sprintf("%s", right(obj.quantity[1], 1)));
obj["OilQT2-needle"].setRotation(math.clamp(val.engOilQT2, 0, 27) * 6.66 * D2R); obj["OilQT2-needle"].setRotation(math.clamp(val.engOilQT2, 0, 27) * 6.66 * D2R);
}), }),
props.UpdateManager.FromHashValue("engOilPsi1", 0.25, func(val) { props.UpdateManager.FromHashValue("engOilPsi1", 0.25, func(val) {
@ -134,7 +138,7 @@ var canvas_lowerECAMPageEng =
getKeys: func() { getKeys: func() {
return["OilQT1-needle","OilQT2-needle","OilQT1","OilQT2","OilQT1-decimal","OilQT2-decimal","OilPSI1-needle","OilPSI2-needle","OilPSI1","OilPSI2", return["OilQT1-needle","OilQT2-needle","OilQT1","OilQT2","OilQT1-decimal","OilQT2-decimal","OilPSI1-needle","OilPSI2-needle","OilPSI1","OilPSI2",
"FUEL-used-1","FUEL-used-2", "Fused-weight-unit","Fused-oil-unit","FUEL-clog-1","FUEL-clog-2","OIL-clog-1","OIL-clog-2","OilTemp1","OilTemp2", "FUEL-used-1","FUEL-used-2", "Fused-weight-unit","Fused-oil-unit","FUEL-clog-1","FUEL-clog-2","OIL-clog-1","OIL-clog-2","OilTemp1","OilTemp2",
"VIB-N1-1","VIB-N1-2","VIB-N2-1","VIB-N2-2","OilQT1-decimalpt","OilQT2-decimalpt"]; "VIB-N1-1","VIB-N1-2","VIB-N2-1","VIB-N2-2","OilQT1-decimalpt","OilQT2-decimalpt","OilQT1-XX","OilQT2-XX"];
}, },
updateBottom: func(notification) { updateBottom: func(notification) {
if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) { if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) {
@ -187,9 +191,8 @@ var canvas_lowerECAMPageEng =
} }
if (notification.dc1 >= 25) { if (notification.dc1 >= 25) {
me["OilQT1"].setColor(0.0509,0.7529,0.2941); me["OilQT1-XX"].hide();
me["OilQT1"].setText(sprintf("%s", left(me.quantity[0], (size(me.quantity[0]) == 4 ? 2 : 1)))); me["OilQT1"].show();
me["OilQT1-decimal"].setText(sprintf("%s", right(me.quantity[0], 1)));
me["OilPSI1"].setText(sprintf("%s", math.clamp(math.round(me.pressure[0], 2), 0, 998))); me["OilPSI1"].setText(sprintf("%s", math.clamp(math.round(me.pressure[0], 2), 0, 998)));
if (me.pressure[0] >= 13) { if (me.pressure[0] >= 13) {
@ -203,6 +206,8 @@ var canvas_lowerECAMPageEng =
me["OilQT1-needle"].show(); me["OilQT1-needle"].show();
me["OilPSI1-needle"].show(); me["OilPSI1-needle"].show();
} else { } else {
me["OilQT1"].hide();
me["OilQT1-XX"].show();
me["OilQT1"].setColor(0.7333,0.3803,0); me["OilQT1"].setColor(0.7333,0.3803,0);
me["OilPSI1"].setColor(0.7333,0.3803,0); me["OilPSI1"].setColor(0.7333,0.3803,0);
me["OilQT1"].setText(" XX"); me["OilQT1"].setText(" XX");
@ -215,9 +220,8 @@ var canvas_lowerECAMPageEng =
} }
if (notification.dc2 >= 25) { if (notification.dc2 >= 25) {
me["OilQT2"].setColor(0.0509,0.7529,0.2941); me["OilQT2-XX"].hide();
me["OilQT2"].setText(sprintf("%s", left(me.quantity[1], (size(me.quantity[1]) == 4 ? 2 : 1)))); me["OilQT2"].show();
me["OilQT2-decimal"].setText(sprintf("%s", right(me.quantity[1], 1)));
me["OilPSI2"].setText(sprintf("%s", math.clamp(math.round(me.pressure[0], 2), 0, 998))); me["OilPSI2"].setText(sprintf("%s", math.clamp(math.round(me.pressure[0], 2), 0, 998)));
if (me.pressure[1] >= 13) { if (me.pressure[1] >= 13) {
@ -231,9 +235,9 @@ var canvas_lowerECAMPageEng =
me["OilQT2-needle"].show(); me["OilQT2-needle"].show();
me["OilPSI2-needle"].show(); me["OilPSI2-needle"].show();
} else { } else {
me["OilQT2"].setColor(0.7333,0.3803,0); me["OilQT2"].hide();
me["OilQT2-XX"].show();
me["OilPSI2"].setColor(0.7333,0.3803,0); me["OilPSI2"].setColor(0.7333,0.3803,0);
me["OilQT2"].setText(" XX");
me["OilPSI2"].setText("XX"); me["OilPSI2"].setText("XX");
me["OilQT2-decimalpt"].hide(); me["OilQT2-decimalpt"].hide();

52
Models/Instruments/Lower-ECAM/res/eng.svg
View file

@ -40,9 +40,9 @@
inkscape:window-height="974" inkscape:window-height="974"
id="namedview371" id="namedview371"
showgrid="true" showgrid="true"
inkscape:zoom="2" inkscape:zoom="2.8284271"
inkscape:cx="930" inkscape:cx="372.64527"
inkscape:cy="390.5" inkscape:cy="402.69731"
inkscape:window-x="-11" inkscape:window-x="-11"
inkscape:window-y="-11" inkscape:window-y="-11"
inkscape:window-maximized="1" inkscape:window-maximized="1"
@ -496,19 +496,19 @@
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4328" id="path4328"
d="m 312.4476,261.18529 0,9.47635" d="m 312.4476,261.18529 v 9.47635"
style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path <path
inkscape:transform-center-x="74.153195" inkscape:transform-center-x="74.153195"
style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 233.55623,340.27736 9.47635,0" d="m 233.55623,340.27736 h 9.47635"
id="path4336" id="path4336"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<path <path
inkscape:transform-center-x="-74.153195" inkscape:transform-center-x="-74.153195"
style="fill:none;stroke:#ffffff;stroke-width:3.46754003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:3.46754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 391.33897,340.34361 -9.47635,0" d="m 391.33897,340.34361 h -9.47635"
id="path4338" id="path4338"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
@ -533,8 +533,8 @@
inkscape:label="#g4340" inkscape:label="#g4340"
id="OilQT2-scaletick"> id="OilQT2-scaletick">
<path <path
style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 312.4476,261.18529 0,9.47635" d="m 312.4476,261.18529 v 9.47635"
id="path4224" id="path4224"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
@ -543,15 +543,15 @@
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4226" id="path4226"
d="m 233.55623,340.27736 9.47635,0" d="m 233.55623,340.27736 h 9.47635"
style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:transform-center-x="74.153195" /> inkscape:transform-center-x="74.153195" />
<path <path
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4229" id="path4229"
d="m 391.33897,340.34361 -9.47635,0" d="m 391.33897,340.34361 h -9.47635"
style="fill:none;stroke:#ffffff;stroke-width:3.46754003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:3.46754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:transform-center-x="-74.153195" /> inkscape:transform-center-x="-74.153195" />
</g> </g>
<path <path
@ -805,4 +805,26 @@
x="745.15948" x="745.15948"
id="tspan997" id="tspan997"
sodipodi:role="line">22</tspan></text> sodipodi:role="line">22</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="693.62469"
y="305.87512"
id="OilQT2-XX"><tspan
sodipodi:role="line"
id="tspan2983"
style="font-size:40px;fill:#bb6100;fill-opacity:1;stroke-width:0.75px"
x="693.62469"
y="305.87512">XX</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="275.57779"
y="305.87521"
id="OilQT1-XX"><tspan
sodipodi:role="line"
id="tspan8538"
style="font-size:40px;fill:#bb6100;fill-opacity:1;stroke-width:0.75px"
x="275.57779"
y="305.87521">XX</tspan></text>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
Nasal/Systems/tyresmoke.nas → Nasal/Effects/tyresmoke.nas
View file