fly/A320-family
1
0
Fork 0
Code Activity

Hide all FAC warnings on PFD when FAC1+2 failed, replace with SPD LIM red alert

Browse source
This commit is contained in:
legoboyvdlp R 2020-10-10 20:20:24 +01:00
parent 0829f51377
commit b02cc4e61f
2 changed files with 324 additions and 292 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Models/Instruments/PFD/PFD.nas
View file

@ -1210,7 +1210,13 @@ var canvas_PFD_1 = {
}
me["ASI_scale"].setTranslation(0, me.ASI * 6.6);
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
me["ASI_max"].show();
} else {
me["ASI_max"].hide();
}
if (!fmgc.FMGCInternal.takeoffState and fmgc.FMGCInternal.phase >= 1 and !wow1.getValue() and !wow2.getValue()) {
me.FMGC_vls = fmgc.FMGCInternal.vls_min;
@ -1245,16 +1251,24 @@ var canvas_PFD_1 = {
} else {
me.ALPHAvsw = me.FMGC_vsw - 30 - me.ASI;
}
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
me["VLS_min"].show();
if (getprop("/it-fbw/law") == 0) {
me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
if (getprop("/it-fbw/law") == 0) {
me["ALPHA_PROT"].show();
me["ALPHA_MAX"].show();
me["ALPHA_SW"].hide();
} else {
me["ALPHA_PROT"].hide();
me["ALPHA_MAX"].hide();
me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
me["ALPHA_SW"].show();
}
} else {
me["VLS_min"].hide();
me["ALPHA_PROT"].hide();
me["ALPHA_MAX"].hide();
me["ALPHA_SW"].show();
@ -1411,6 +1425,7 @@ var canvas_PFD_1 = {
}
}
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
if (flap_config.getValue() == '1') {
me["F_target"].hide();
me["clean_speed"].hide();
@ -1427,7 +1442,7 @@ var canvas_PFD_1 = {
me.SPDstrgtdiff = tgt_S - ind_spd;
if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42) {
if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["S_target"].show();
me["S_target"].setTranslation(0, me.Strgt * -6.6);
} else {
@ -1461,7 +1476,7 @@ var canvas_PFD_1 = {
me.SPDftrgtdiff = tgt_F - ind_spd;
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["F_target"].show();
me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
} else {
@ -1495,7 +1510,7 @@ var canvas_PFD_1 = {
me.SPDftrgtdiff = tgt_F - ind_spd;
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["F_target"].show();
me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
} else {
@ -1546,10 +1561,11 @@ var canvas_PFD_1 = {
me["flap_max"].hide();
}
}
if (gear_agl.getValue() < 400) {
} else {
me["S_target"].hide();
me["F_target"].hide();
me["clean_speed"].hide();
me["flap_max"].hide();
}
me.ASItrend = dmc.DMController.DMCs[0].outputs[6].getValue() - me.ASI;
@ -1949,7 +1965,13 @@ var canvas_PFD_2 = {
}
me["ASI_scale"].setTranslation(0, me.ASI * 6.6);
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
me["ASI_max"].setTranslation(0, me.ASImax * -6.6);
me["ASI_max"].show();
} else {
me["ASI_max"].hide();
}
if (!fmgc.FMGCInternal.takeoffState and fmgc.FMGCInternal.phase >= 1 and !wow1.getValue() and !wow2.getValue()) {
me.FMGC_vls = fmgc.FMGCInternal.vls_min;
@ -1984,20 +2006,28 @@ var canvas_PFD_2 = {
} else {
me.ALPHAvsw = me.FMGC_vsw - 30 - me.ASI;
}
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
me["VLS_min"].setTranslation(0, me.VLSmin * -6.6);
me["VLS_min"].show();
if (getprop("/it-fbw/law") == 0) {
me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6);
me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6);
me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
if (getprop("/it-fbw/law") == 0) {
me["ALPHA_PROT"].show();
me["ALPHA_MAX"].show();
me["ALPHA_SW"].hide();
} else {
me["ALPHA_PROT"].hide();
me["ALPHA_MAX"].hide();
me["ALPHA_SW"].setTranslation(0, me.ALPHAvsw * -6.6);
me["ALPHA_SW"].show();
}
} else {
me["VLS_min"].hide();
me["ALPHA_PROT"].hide();
me["ALPHA_MAX"].hide();
me["ALPHA_SW"].hide();
}
}
tgt_ias = at_tgt_ias.getValue();
@ -2150,6 +2180,7 @@ var canvas_PFD_2 = {
}
}
if (fbw.FBW.Computers.fac1.getValue() or fbw.FBW.Computers.fac2.getValue()) {
if (flap_config.getValue() == '1') {
me["F_target"].hide();
me["clean_speed"].hide();
@ -2166,7 +2197,7 @@ var canvas_PFD_2 = {
me.SPDstrgtdiff = tgt_S - ind_spd;
if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42) {
if (me.SPDstrgtdiff >= -42 and me.SPDstrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["S_target"].show();
me["S_target"].setTranslation(0, me.Strgt * -6.6);
} else {
@ -2200,7 +2231,7 @@ var canvas_PFD_2 = {
me.SPDftrgtdiff = tgt_F - ind_spd;
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["F_target"].show();
me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
} else {
@ -2234,7 +2265,7 @@ var canvas_PFD_2 = {
me.SPDftrgtdiff = tgt_F - ind_spd;
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42) {
if (me.SPDftrgtdiff >= -42 and me.SPDftrgtdiff <= 42 and gear_agl.getValue() >= 400) {
me["F_target"].show();
me["F_target"].setTranslation(0, me.Ftrgt * -6.6);
} else {
@ -2285,10 +2316,11 @@ var canvas_PFD_2 = {
me["flap_max"].hide();
}
}
if (gear_agl.getValue() < 400) {
} else {
me["S_target"].hide();
me["F_target"].hide();
me["clean_speed"].hide();
me["flap_max"].hide();
}
me.ASItrend = dmc.DMController.DMCs[1].outputs[6].getValue() - me.ASI;

30
Models/Instruments/PFD/res/pfd.svg
View file

@ -8,7 +8,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="pfd.svg"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
id="svg2"
version="1.1"
viewBox="0 0 1024 1024"
@ -39,15 +39,15 @@
showguides="true"
inkscape:current-layer="svg2"
inkscape:window-maximized="1"
inkscape:window-y="23"
inkscape:window-x="0"
inkscape:cy="886.5494"
inkscape:cx="916.44902"
inkscape:window-y="-8"
inkscape:window-x="-8"
inkscape:cy="403.87968"
inkscape:cx="219.11987"
inkscape:zoom="2.1546825"
showgrid="true"
id="namedview371"
inkscape:window-height="1035"
inkscape:window-width="1920"
inkscape:window-height="705"
inkscape:window-width="1366"
inkscape:pageshadow="2"
inkscape:pageopacity="1"
guidetolerance="10"
@ -6659,18 +6659,18 @@
<text
inkscape:label="#text1607"
id="spdLimError"
y="749.95782"
x="143.42143"
y="742.30011"
x="135.06754"
style="font-style:normal;font-weight:normal;font-size:30.00000191px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:41.99999875px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
y="749.95782"
x="143.42143"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
y="742.30011"
x="135.06754"
id="tspan1605-4"
sodipodi:role="line">SPD</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:41.99999875px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
y="787.45782"
x="143.42143"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:0.5;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75"
y="779.80011"
x="135.06754"
sodipodi:role="line"
id="tspan1860">LIM</tspan></text>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 368 KiB