From 30497a8cf22b2d0e6102e653b30725af90c40fdb Mon Sep 17 00:00:00 2001 From: Matthew Maring <56924612+hayden2000@users.noreply.github.com> Date: Sun, 12 Apr 2020 13:37:15 -0400 Subject: [PATCH] Fix bugs with approach, protection bars fully work, go-around still buggy --- Models/Instruments/MCDU/MCDU.nas | 12 +- Models/Instruments/PFD/PFD.nas | 40 +- Models/Instruments/PFD/res/pfd.svg | 10878 ++++++++++++++------------- Nasal/FMGC/FMGC.nas | 61 +- 4 files changed, 5512 insertions(+), 5479 deletions(-) diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 48e04db1..68cd5902 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1687,9 +1687,9 @@ var canvas_MCDU_base = { } else { me["Simple_L1"].setText("SELECTED"); if (getprop("it-autoflight/input/kts-mach")) { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-mach")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-mach")))); } else { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-kts")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-kts")))); } me.fontLeft(0, 0, 0, default, 0, 0); } @@ -1830,9 +1830,9 @@ var canvas_MCDU_base = { } else { me["Simple_L1"].setText("SELECTED"); if (getprop("it-autoflight/input/kts-mach")) { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-mach")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-mach")))); } else { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-kts")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-kts")))); } me.fontLeft(0, 0, 0, default, 0, 0); } @@ -1980,9 +1980,9 @@ var canvas_MCDU_base = { } else { me["Simple_L1"].setText("SELECTED"); if (getprop("it-autoflight/input/kts-mach")) { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-mach")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-mach")))); } else { - me["Simple_L4"].setText(sprintf(" %3.0f", num(getprop("it-autoflight/input/spd-kts")))); + me["Simple_L4"].setText(sprintf(" %d", int(getprop("it-autoflight/input/spd-kts")))); } me.fontLeft(0, 0, 0, default, 0, 0); } diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 6410cfa6..6b4dd03a 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -215,7 +215,7 @@ var canvas_PFD_base = { getKeys: func() { return ["FMA_man","FMA_manmode","FMA_flxmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_ctr_msg","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr", "FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1", - "FMA_Middle2","ALPHA_MAX","ALPHA_PROT","ALPHA_SW","VLS_min","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank", + "FMA_Middle2","ALPHA_MAX","ALPHA_PROT","ALPHA_SW","ALPHA_clip","VLS_min","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank", "AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber", "ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP","ALT_digit_DN","ALT_error","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","QNH","QNH_setting", "QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale","HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","HDG_error","HDG_group","HDG_frame", @@ -1106,6 +1106,10 @@ var canvas_PFD_1 = { me["ASI_error"].hide(); me["ASI_frame"].setColor(1,1,1); me["ASI_group"].show(); + me["VLS_min"].hide(); + me["ALPHA_PROT"].hide(); + me["ALPHA_MAX"].hide(); + me["ALPHA_SW"].hide(); if (ind_spd <= 30) { me.ASI = 0; @@ -1136,7 +1140,7 @@ var canvas_PFD_1 = { } else { me.VLSmin = me.FMGC_vls - 30 - me.ASI; } - me.FMGC_prot = getprop("FMGC/internal/computed-speeds/vls_min") * 0.95; + me.FMGC_prot = getprop("FMGC/internal/computed-speeds/alpha_prot"); if (me.FMGC_prot <= 30) { me.ALPHAprot = 0 - me.ASI; } else if (me.FMGC_prot >= 420) { @@ -1144,7 +1148,7 @@ var canvas_PFD_1 = { } else { me.ALPHAprot = me.FMGC_prot - 30 - me.ASI; } - me.FMGC_max = getprop("FMGC/internal/computed-speeds/vls_min") * 0.90; + me.FMGC_max = getprop("FMGC/internal/computed-speeds/alpha_max"); if (me.FMGC_max <= 30) { me.ALPHAmax = 0 - me.ASI; } else if (me.FMGC_max >= 420) { @@ -1154,8 +1158,8 @@ var canvas_PFD_1 = { } me["VLS_min"].setTranslation(0, me.VLSmin * -6.6); me["VLS_min"].show(); - me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6); #CHANGE LATER - me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6); #CHANGE LATER + me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6); + me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6); if (getprop("it-fbw/law") == 0) { me["ALPHA_PROT"].show(); me["ALPHA_MAX"].show(); @@ -1165,15 +1169,10 @@ var canvas_PFD_1 = { me["ALPHA_MAX"].hide(); me["ALPHA_SW"].show(); } - } else { - me["VLS_min"].hide(); - me["ALPHA_PROT"].hide(); - me["ALPHA_MAX"].hide(); - me["ALPHA_SW"].hide(); } if (managed_spd.getValue() == 1) { - if (FMGCphase.getValue() == 5) { + if (getprop("FMGC/internal/decel") == 1) { vapp = getprop("FMGC/internal/computed-speeds/vapp"); tgt_ias = vapp; tgt_kts = vapp; @@ -1809,6 +1808,10 @@ var canvas_PFD_2 = { me["ASI_error"].hide(); me["ASI_frame"].setColor(1,1,1); me["ASI_group"].show(); + me["VLS_min"].hide(); + me["ALPHA_PROT"].hide(); + me["ALPHA_MAX"].hide(); + me["ALPHA_SW"].hide(); if (ind_spd <= 30) { me.ASI = 0; @@ -1839,7 +1842,7 @@ var canvas_PFD_2 = { } else { me.VLSmin = me.FMGC_vls - 30 - me.ASI; } - me.FMGC_prot = getprop("FMGC/internal/computed-speeds/vls_min") * 0.95; + me.FMGC_prot = getprop("FMGC/internal/computed-speeds/alpha_prot"); if (me.FMGC_prot <= 30) { me.ALPHAprot = 0 - me.ASI; } else if (me.FMGC_prot >= 420) { @@ -1847,7 +1850,7 @@ var canvas_PFD_2 = { } else { me.ALPHAprot = me.FMGC_prot - 30 - me.ASI; } - me.FMGC_max = getprop("FMGC/internal/computed-speeds/vls_min") * 0.90; + me.FMGC_max = getprop("FMGC/internal/computed-speeds/alpha_max"); if (me.FMGC_max <= 30) { me.ALPHAmax = 0 - me.ASI; } else if (me.FMGC_max >= 420) { @@ -1857,8 +1860,8 @@ var canvas_PFD_2 = { } me["VLS_min"].setTranslation(0, me.VLSmin * -6.6); me["VLS_min"].show(); - me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6); #CHANGE LATER - me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6); #CHANGE LATER + me["ALPHA_PROT"].setTranslation(0, me.ALPHAprot * -6.6); + me["ALPHA_MAX"].setTranslation(0, me.ALPHAmax * -6.6); if (getprop("it-fbw/law") == 0) { me["ALPHA_PROT"].show(); me["ALPHA_MAX"].show(); @@ -1868,15 +1871,10 @@ var canvas_PFD_2 = { me["ALPHA_MAX"].hide(); me["ALPHA_SW"].show(); } - } else { - me["VLS_min"].hide(); - me["ALPHA_PROT"].hide(); - me["ALPHA_MAX"].hide(); - me["ALPHA_SW"].hide(); } if (managed_spd.getValue() == 1) { - if (FMGCphase.getValue() == 5) { + if (getprop("FMGC/internal/decel") == 1) { vapp = getprop("FMGC/internal/computed-speeds/vapp"); tgt_ias = vapp; tgt_kts = vapp; diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index 0bc400d0..beba23db 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -7,13 +7,13 @@ 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" + sodipodi:docname="pfd.svg" inkscape:version="1.0beta2 (2b71d25, 2019-12-03)" - sodipodi:docname="pfd.svg"> + id="svg2" + version="1.1" + viewBox="0 0 1024 1024" + height="1024pt" + width="1024pt"> @@ -29,58 +29,50 @@ + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + units="pt" + inkscape:snap-global="false" + showguides="true" + inkscape:current-layer="svg2" + inkscape:window-maximized="0" + inkscape:window-y="23" + inkscape:window-x="0" + inkscape:cy="734.01649" + inkscape:cx="185.41537" + inkscape:zoom="6.1585842" + showgrid="true" + id="namedview371" + inkscape:window-height="1035" + inkscape:window-width="1920" + inkscape:pageshadow="2" + inkscape:pageopacity="1" + guidetolerance="10" + gridtolerance="10" + objecttolerance="20" + borderopacity="1" + bordercolor="#666666" + pagecolor="#000000"> + id="grid5153" + type="xygrid" /> - + + inkscape:label="#g4891" + id="AI_group"> + inkscape:label="#g5497"> + inkscape:label="#g5492" + id="AI_background"> + + - - + x="-195.39726" + height="1102.3193" + width="1287.3096" + id="AI_sky" + style="opacity:1;fill:#368acd;fill-opacity:1;stroke:none;stroke-width:2.58922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + inkscape:label="#g5341" + id="AI_scale"> + id="AI_sky_scale" + inkscape:label="#g4851"> + id="path4684" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,521.5684 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5071" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,462.4348 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5075" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,373.7344 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,314.60083 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5119" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,285.034 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5133" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,225.9004 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5137" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,137.2 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,78.066427 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5151" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,48.499597 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5165" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-10.634 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5169" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,-99.334403 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,-158.46797 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5183" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-188.0348 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5197" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-247.1684 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5201" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,-335.8688 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,-395.00237 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5215" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-424.5692 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4505" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + id="AI_ground_scale" + inkscape:label="#g4813"> + d="m 433.99987,639.8352 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,669.402 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4509" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,728.5356 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,758.1028 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + - + + id="path4527" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,876.37 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,905.9368 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4533" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,965.0704 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,994.63724 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,1024.204 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4569" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,1083.3376 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4575" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1172.038 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4579" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1231.1716 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,1260.7384 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4601" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="M 393.624,1319.872 H 502.88512" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4607" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1408.5724 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4611" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1467.706 h 28.50952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,1497.2728 h 55.30952" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4633" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> - - + + + id="AI_scale_num" + inkscape:label="#g4737"> - 10 + inkscape:label="#g4699" + id="AI_sky_num"> 10 - 20 10 + 20 - 30 20 + 30 - 40 30 + 40 - 50 40 + 50 - 60 50 + 60 - 70 60 + 70 - 80 70 + 80 - 90 80 + 90 + 90 - 10 + inkscape:label="#g4661" + id="AI_ground_num"> 10 - 20 10 + 20 - 30 20 + 30 - 40 30 + 40 - 50 40 + 50 - 60 50 + 60 - 70 60 + 70 - 80 70 + 80 - 90 80 + 90 + 90 + id="AI_pitch_lim"> + d="m 370.5312,154.3476 h 21.6616" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + id="g4951" + transform="translate(133.78495)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 370.53103,162.42242 h 21.66136" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="g4964" + transform="matrix(0.9999956,0,0,0.9999865,26.97857,532.2047)"> - - - - + + + + - X + id="AI_pitch_lim_X"> X - X X + X + X + inkscape:label="#g4918"> - - - - - - - - - - - - - + + + + + + + + + + + + + - + + id="AI_bankindex" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" + inkscape:label="#rect902" /> + height="12.775722" + width="12.257594" + id="rect4756" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.73024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + - + x="509.36719" + height="263.53848" + width="7.5999999" + id="FD_pitch" + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.8775;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="rotate(90)" /> + transform="translate(-0.38165298)"> + d="m 452.50015,509.31081 h 29.04648" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + transform="matrix(-1,0,0,1,897.27706,0)" + id="g4806"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 452.49998,480.26394 v 29.04648" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + transform="matrix(1,0,0,-1,0,1026.344)" + id="g4812"> - - - - + + + + + width="15.997281" + height="16.491779" + x="440.25876" + y="504.91953" + inkscape:label="#rect4741" /> - - - - - + id="g4844" + transform="matrix(1.0666667,0,0,1.066636,4.919636,-0.50381959)"> - + + + + + + + id="path894" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + inkscape:transform-center-y="-246.1722"> - + + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="AI_slipskid" + d="m 418.32961,292.18309 59.8472,-3e-5 -8.6432,-14.52797 h -42.5608 z" + style="fill:none;fill-opacity:1;stroke:#c9cc15;stroke-width:3.99994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + - + d="m 288.584,252.95092 13.8416,-7.96852" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="g4374" + transform="matrix(-1,0,0,1,896.78566,0)"> + - + id="path4380" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + transform="translate(0,0.59999999)"> - + transform="translate(0,19.596045)" + id="g4545"> + - + transform="matrix(-1,0,0,1,896.51521,20.196045)" + id="g4876"> + + id="path4880" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + inkscape:label="#g4886" + id="AI_bank_lim_X"> X + X - X + id="tspan4884" + sodipodi:role="line">X + id="g3954" + transform="matrix(-1,0,0,1,896.72324,0)"> + - + d="m 354.9152,234.0368 -14.5632,5.4816" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="g3968" + transform="rotate(10.25,446.41327,507.51354)"> - + + transform="matrix(-0.98404072,0.17794355,0.17794355,0.98404072,799.64735,-71.336811)" + id="g3978"> + d="m 340.35189,239.5184 5.62182,14.20878" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path3984" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 354.9152,234.0368 -14.5632,5.4816" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + inkscape:label="#g4612" + transform="translate(0,-1.4)"> 0000 + x="511.25748" + y="680.72845" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.657577">0000 + transform="translate(2.8403413,1.952603)"> + transform="translate(0.97071068)" + id="g4630"> - - - - - - - - + id="g4634" + transform="matrix(-1,0,0,1,894.37964,0)"> + + + + + + + + - + - - - - - - - - - - + id="rect4416" + width="469.54089" + height="64.058205" + x="213.5808" + y="945.01337" /> - - + inkscape:label="#g4848" + id="HDG_frame"> + + + + + + + + + + + + - 1 + id="g5112" + transform="matrix(1.0666667,0,0,1.066636,0.28284271,-0.50381959)"> 2 + y="569.32635" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.7717px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.657577">1 6 - - - - - - - - - - - 6 - 2 1 + id="tspan5102" + x="1019.0017" + y="687.27924" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.7717px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.657577">6 + id="g5092" + transform="matrix(1.0666667,0,0,-1.066636,0.28284271,1026.1924)"> + + 6 + 2 + 1 + + + + + + + + + + - + id="VS_pointer" + width="6.5950012" + height="361.44022" + x="509.69724" + y="-1060.3188" + inkscape:label="#rect4954" + inkscape:transform-center-x="170.07916" /> + transform="translate(0,65.936427)"> + height="45.6008" + width="45.6008" + id="rect4626" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> 00 + x="1147.7107" + y="405.05588" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.657577">00 - + + id="ALT_scale"> + id="path4911" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> 000 + x="1604.5295" + id="tspan4915" + sodipodi:role="line">000 + d="m 1479.2996,1007.4057 9.3792,-7.97457 -9.3788,-7.9742" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 1579.3052,512.65602 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> 000 + x="1604.5295" + y="501.10501" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000 + id="path4943" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + d="m 1579.3052,950.77126 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4947" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,853.43414 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4951" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,756.09702 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4955" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,658.7599 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4959" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,561.42278 -11.3041,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - 000 - - - - - - - - - - - 000 - 000 + + + + + + + + + + 000 + + 000 + - TOGA + x="59.092628" + height="84.381813" + width="102.47213" + id="FMA_man_box" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.39996576;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> MAN - + y="74.429817" + x="125.31013" + id="tspan4307" + sodipodi:role="line">TOGA MAN PITCH TRIM ONLY + style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.657577" + x="125.84993" + y="33.759209" + id="FMA_man" + transform="scale(0.87678236,1.1405339)">MAN ALT - G/S - CLB + id="tspan4614" + x="505.48523" + y="115.0584" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.657577">MAN PITCH TRIM ONLY + LOC + y="34.986706" + x="370.20218" + id="tspan4244" + sodipodi:role="line">ALT G/S + CLB + LOC + NAV + x="629.22266" + y="74.709473" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.657577">NAV - - + + + id="LOC_scale"> + height="41.291069" + width="7.7972813" + id="rect4858" + style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:3.91476655;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - + + id="circle4876" + inkscape:connector-curvature="0" + sodipodi:nodetypes="zzzzz" /> + id="g4527" + transform="translate(1.8616028,0)"> - + + id="circle4880" + inkscape:connector-curvature="0" + sodipodi:nodetypes="zzzzz" /> + y="1019.8428" + x="-517.64343" + height="33.21196" + width="33.21196" + id="LOC_pointer" + style="fill:none;fill-opacity:1;stroke:#b055be;stroke-width:4.0350337;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:label="#g4828" + id="ALT_group2"> + width="7.7970567" + height="49.153526" + x="509.50464" + y="-747.05353" + transform="matrix(0,1,-1,0,0,0)" /> STD + + + + + + 000 + + FL 000 + FL 000 + + QNH + STD - - - - - - 000 - - FL 000 - FL 000 - - QNH - 1013 + id="tspan977" + sodipodi:role="line">1013 + id="GS_scale"> + x="509.50464" + height="49.153526" + width="7.7970567" + id="rect4898" + style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="g4531" + transform="translate(0,-1.0792028)"> - + + id="circle4929" + inkscape:connector-curvature="0" + sodipodi:nodetypes="zzzzz" /> - + + id="circle4933" + inkscape:connector-curvature="0" + sodipodi:nodetypes="zzzzz" /> + width="33.211578" + height="33.211578" + x="949.0885" + y="-368.9328" + transform="matrix(0.54714118,0.83704034,-0.54714118,0.83704034,0,0)" + inkscape:label="#rect4872" /> + x="768.71039" + height="59.519768" + width="89.289597" + id="ALT_mask" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + x="858.00543" + height="90.122147" + width="48.851151" + id="ALT_tens_clip" + style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:label="#g5167" + id="ALT_frame"> - + id="path4984" + d="m 856.91323,236.93596 0,241.91039" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + + inkscape:label="#g5379" + id="ALT_group"> + inkscape:label="#g5173" + id="ALT_box"> - + d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583" + style="fill:#000000;fill-opacity:1;stroke:#ffff00;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + 40402020000080806060404020200000808060 + x="898.703" + sodipodi:role="line" + id="tspan4302">60 00 + x="890.99316" + y="506.23941" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.8348px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">00 - - + + AP 1+2 - 1 FD 2 - A/THR - CAT 3 + x="1080.6229" + id="tspan4268" + sodipodi:role="line">AP 1+2 DUAL + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce;fill-opacity:1;stroke-width:0.657577">1 FD 2 A/THR + CAT 3 + DUAL + NO DH + x="874.48682" + y="115.05846" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce;fill-opacity:1;stroke-width:0.657577">NO DH - + - + + SPEED + + SPEED + x="505.48523" + id="tspan4354" + sodipodi:role="line">FLARE - - FLARE - - DH 250 + x="826.09802" + id="tspan4301" + sodipodi:role="line">DH - +40 + style="display:inline;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:4.15275;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" + id="VLS_min" + width="11.001064" + height="2089.313" + x="128.00137" + y="512.43707" + inkscape:label="VLS_min" /> LVR CLB + id="tspan4305" + x="922.034" + y="115.05846" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.657577">250 - - - 00 - - 00 - - - - - 00 - 00 - 00 - - - - - - 00 - - - 00 - - - + style="display:inline" + transform="translate(427.35786,2333.3875)" + inkscape:label="#g4996" + id="ALPHA_SW"> - - - - - + style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" + id="rect750" + width="18.482525" + height="22.800125" + x="-300.81439" + y="290.33853" /> - 000 - 000 + y="270.33838" + x="-300.81363" + height="18.800058" + width="18.482372" + id="rect752" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + y="792.24689" + x="116.0377" + height="275.7869" + width="44.40099" + id="ASI_trend_down_clip-2" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.784333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + +40 + LVR CLB + inkscape:label="#g4853" + id="HDG_group"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 140 - 160 - 120 - 100 - 080 - 060 - 040 - 180 - 200 - 220 - 240 - 260 - 280 - 300 - 320 - 340 - 360 - 380 - 400 - 420 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="HDG_scale" + inkscape:label="#g4743" + transform="translate(-104.78479,0)"> + + 00 + id="path4691" + d="m 651.08597,944.75532 0,22.36203" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + 00 + + + + + 00 + 00 + 00 + + + + + + 00 + + + 00 + + + - - - + id="CRS_pointer" + inkscape:label="#g5019" + transform="matrix(1.0666667,0,0,1.066636,7.9500002,2.8086774)"> + + + + + 000 + 000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="ASI_scale" + inkscape:label="#g3847" + transform="translate(0.69023445)"> + + 140 + 160 + 120 + 100 + 080 + 060 + 040 + 180 + 200 + 220 + 240 + 260 + 280 + 300 + 320 + 340 + 360 + 380 + 400 + 420 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sodipodi:nodetypes="cc" /> + + + + id="path930" + d="M 92.069682,481.26097 H 134.83566" + style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + + id="ASI_trend_up"> - 000 + + + + + . - 000 - 000 + . . + x="95.148567" + id="tspan4686" + sodipodi:role="line">000 000 + . - - SPD - + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75" + y="220.32645" + x="80.506668" + id="tspan4696" + sodipodi:role="line">. + inkscape:label="#g4779" + id="ASI_error"> + SPD + + + + - + d="M 13.167811,790.62913 H 154.46853" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - ATT - ALT VATT + /S + id="tspan4386-4-0" + x="851.70166" + y="505.93329" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.75">ALT V/S + HDG + x="522.40784" + y="950.08264" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ff0000;fill-opacity:1;stroke-width:0.75">HDG MACH - ILS - ILS - 000.00 - 0.0 - NM - - - 000 - - - - 000 - + id="tspan1605" + sodipodi:role="line">MACH MM + y="856.17841" + x="663.17761" + id="tspan773" + sodipodi:role="line">ILS ILS + 000.00 + 0.0 + OM + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#179ab7;fill-opacity:1;stroke-width:0.75" + y="1014.0706" + x="116.45473" + id="tspan780-3" + sodipodi:role="line">NM + + + 000 + + + + 000 + MM + OM + IM + x="680.1095" + id="tspan773-9-9" + sodipodi:role="line">IM + inkscape:label="#g5173" + id="ALT_box_flash"> - + d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583" + style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + 000 + x="143.095" + y="263.52979" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000 - - 1 - - - + transform="translate(0,132.03033)" + id="v1_group"> + id="path4458-3" + d="m 105.87037,380.78738 h 34.99469" + style="fill:#179ab7;fill-opacity:1;stroke:#179ab7;stroke-width:3.20025;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> S - - - - F - - - - + id="tspan4690-5-6" + x="155.31981" + y="378.22144" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">1 + id="vr_speed" + d="m 130.43188,519.13081 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#179ab7;stroke-width:2.39997;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + S + + + + F + + + + + + + + inkscape:label="#g5173"> + id="alt-box-group" + inkscape:label="alt-box-group"> - + d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583" + style="fill:none;fill-opacity:1;stroke:#bb6100;stroke-width:3.20031476;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + FLX + x="61.095329" + y="74.429939" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.657577">FLX diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas index 223da81c..0e4aa862 100644 --- a/Nasal/FMGC/FMGC.nas +++ b/Nasal/FMGC/FMGC.nas @@ -246,30 +246,32 @@ var masterFMGC = maketimer(0.2, func { setprop("systems/pressurization/mode", "DE"); } - if (aglalt < 7200 and (phase == "4" or mode == "G/S" or mode == "LAND" or mode == "FLARE")) { + if (!wowl and !wowr and aglalt < 7200 and (phase == "4" or mode == "G/S" or mode == "LAND" or mode == "FLARE")) { setprop("FMGC/status/phase", 5); } if (getprop("autopilot/route-manager/route/num") > 0 and getprop("autopilot/route-manager/active") == 1 and getprop("autopilot/route-manager/distance-remaining-nm") <= 15) { setprop("FMGC/internal/decel", 1); - setprop("FMGC/status/phase", 5); } else if (getprop("FMGC/internal/decel") == 1 and (phase == 0 or phase == 6)) { setprop("FMGC/internal/decel", 0); } - if (phase == "5" and state1 == "TOGA" and state2 == "TOGA") { + #handle go-around + if ((phase == "5" or phase == "7") and state1 == "TOGA" and state2 == "TOGA") { setprop("FMGC/status/phase", 6); - # set speed to green dot here setprop("systems/pressurization/mode", "TO"); setprop("it-autoflight/input/toga", 1); } - #handle go-around if (phase == "6" and alt >= reduc_agl_ft) { setprop("FMGC/status/phase", 2); } - if (wowl and wowr and gs <= 40 and (phase == "2" or phase == "3" or phase == "4" or phase == "5" or phase == "6") and ap1 == 0 and ap2 == 0) { + if (wowl and wowr and (phase == "2" or phase == "3" or phase == "4" or phase == "5" or phase == "6")) { + setprop("FMGC/status/phase", 7); + } + + if (wowl and wowr and gs <= 40 and phase == "7" and ap1 == 0 and ap2 == 0) { reset_FMGC(); } @@ -321,6 +323,15 @@ var masterFMGC = maketimer(0.2, func { } } + aoa_prot = 15; + aoa_max = 17.5; + aoa_0 = -5; + aoa = getprop("systems/navigation/adr/output/aoa-1"); + cas = getprop("systems/navigation/adr/output/cas-1"); + + alpha_prot = cas * math.sqrt((aoa - aoa_0)/(aoa_prot - aoa_0)); + alpha_max = cas * math.sqrt((aoa - aoa_0)/(aoa_max - aoa_0)); + # predicted to speeds clean_to = 2 * tow * 0.45359237 + 85; if (altitude > 20000) { @@ -374,6 +385,8 @@ var masterFMGC = maketimer(0.2, func { setprop("FMGC/internal/computed-speeds/flap3", flap3); setprop("FMGC/internal/computed-speeds/vls", vls); setprop("FMGC/internal/computed-speeds/vapp", vapp); + setprop("FMGC/internal/computed-speeds/alpha_prot", alpha_prot); + setprop("FMGC/internal/computed-speeds/alpha_max", alpha_max); setprop("FMGC/internal/computed-speeds/vs1g_clean_to", vs1g_clean_to); setprop("FMGC/internal/computed-speeds/vs1g_conf_2_to", vs1g_conf_2_to); @@ -393,18 +406,30 @@ var masterFMGC = maketimer(0.2, func { setprop("FMGC/internal/computed-speeds/vls_appr", vls_appr); setprop("FMGC/internal/computed-speeds/vapp_appr", vapp_appr); - if (flap == 0) { # 0 - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_clean * 1.23); - } else if (flap == 1) { # 1 - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_1 * 1.23); - } else if (flap == 2) { # 1+F - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_1f * 1.23); - } else if (flap == 3) { # 2 - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_2 * 1.23); - } else if (flap == 4) { # 3 - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_3 * 1.23);; - } else if (flap == 5) { # FULL - setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_full * 1.23); + # Need info on these, also correct for height at altitude... + # https://www.pprune.org/archive/index.php/t-587639.html + if (getprop("FMGC/status/to-state") == 1) { + if (flap == 0) { # 0 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_clean * 1.28); + } else if (flap == 1) { # 1 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_1 * 1.23); + } else { # 1+F + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_clean * 1.13); + } + } else { + if (flap == 0) { # 0 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_clean * 1.23); + } else if (flap == 1) { # 1 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_1 * 1.23); + } else if (flap == 2) { # 1+F + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_1f * 1.23); + } else if (flap == 3) { # 2 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_2 * 1.23); + } else if (flap == 4) { # 3 + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_3 * 1.23);; + } else if (flap == 5) { # FULL + setprop("FMGC/internal/computed-speeds/vls_min", vs1g_conf_full * 1.23); + } } if (flap == 0) { # 0