From 6152df861513ff0bedc9c9437c4bba7fbe21b754 Mon Sep 17 00:00:00 2001 From: hayden2000 Date: Sat, 8 Feb 2020 13:31:18 -0500 Subject: [PATCH 1/6] Add marker beacons, prepare for auto ils selection --- Models/Instruments/PFD/PFD.nas | 115 +- Models/Instruments/PFD/res/pfd.svg | 7904 ++++++++++++++-------------- Systems/instrumentation.xml | 10 +- 3 files changed, 4046 insertions(+), 3983 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 2dfbb30b..386ef749 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -197,7 +197,7 @@ var canvas_PFD_base = { "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_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", - "TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend", "ILS_HDG_R", "ILS_HDG_L", "ILS_right", "ILS_left"]; + "TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend", "ILS_HDG_R", "ILS_HDG_L", "ILS_right", "ILS_left", "outerMarker", "middleMarker", "innerMarker"]; }, updateDu1: func() { var elapsedtime_act = elapsedtime.getValue(); @@ -772,7 +772,6 @@ var canvas_PFD_base = { me["TRK_pointer"].setTranslation((track_diff.getValue() / 10) * 98.5416, 0); split_ils = split("/", ils_data1.getValue()); - #Secondary via RAD-NAV if (ap_ils_mode.getValue() == 1 and ils1_crs_set.getValue() == 1 and size(split_ils) == 2) { magnetic_hdg = ils_crs.getValue(); magnetic_hdg_dif = geo.normdeg180(magnetic_hdg - heading.getValue()); @@ -796,49 +795,30 @@ var canvas_PFD_base = { me["ILS_HDG_L"].hide(); me["CRS_pointer"].hide(); } - } else { - me["ILS_HDG_R"].hide(); - me["ILS_HDG_L"].hide(); - me["CRS_pointer"].hide(); - } - # Primary via MCDU, not implemented yet - # if (ap_ils_mode.getValue() == 1 and arrival_airport.getValue() != "" and size(split_ils) == 2) { -# var runways = airportinfo(airportinfo(arrival_airport.getValue()).id).runways; + #Approach selected and tuned, overwrite RAD NAV + } else if (0) { +# var runways = airportinfo(airportinfo(arrival_airport.getValue()).id).runways; # var runway_keys = sort(keys(runways), string.icmp); # foreach(var rwy; runway_keys) { # var r = runways[rwy]; # if (r.ils_frequency_mhz == split_ils[1]) { # magnetic_hdg = r.heading - getprop("environment/magnetic-variation-deg"); # magnetic_hdg_dif = geo.normdeg180(magnetic_hdg - heading.getValue()); -# if (magnetic_hdg_dif >= -23.62 and magnetic_hdg_dif <= 23.62) { -# me["CRS_pointer"].setTranslation((magnetic_hdg_dif / 10) * 98.5416, 0); -# me["ILS_HDG_R"].hide(); -# me["ILS_HDG_L"].hide(); -# me["CRS_pointer"].show(); -# } else if (magnetic_hdg_dif < -23.62 and magnetic_hdg_dif >= -180) { -# me["ILS_left"].setText(sprintf("%3.0f", int(magnetic_hdg))); -# me["ILS_HDG_L"].show(); -# me["ILS_HDG_R"].hide(); -# me["CRS_pointer"].hide(); -# } else if (magnetic_hdg_dif > 23.62 and magnetic_hdg_dif <= 180) { -# me["ILS_right"].setText(sprintf("%3.0f", int(magnetic_hdg))); -# me["ILS_HDG_R"].show(); -# me["ILS_HDG_L"].hide(); -# me["CRS_pointer"].hide(); -# } else { -# me["ILS_HDG_R"].hide(); -# me["ILS_HDG_L"].hide(); -# me["CRS_pointer"].hide(); -# } +# +# SET THE FMGC values here!!!!! +# course = r.heading; +# ils_frequency = r.ils_frequency_mhz; +# # break; # } # } -# } else { -# me["ILS_HDG_R"].hide(); -# me["ILS_HDG_L"].hide(); -# me["CRS_pointer"].hide(); -# } + + } else { + me["ILS_HDG_R"].hide(); + me["ILS_HDG_L"].hide(); + me["CRS_pointer"].hide(); + } # AI HDG me.AI_horizon_hdg_trans.setTranslation(me.middleOffset, horizon_pitch.getValue() * 11.825); @@ -950,12 +930,38 @@ var canvas_PFD_1 = { me["GS_pointer"].hide(); } + # Marker beacons/ILS warning if (ap_ils_mode.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { - me["ilsError"].show(); - } else { - me["ilsError"].hide(); - } - + me["ilsError"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (ap_ils_mode.getValue() == 1 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { + me["ilsError"].hide(); + if (getprop("instrumentation/marker-beacon/outer")) { + me["outerMarker"].show(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (getprop("instrumentation/marker-beacon/middle")) { + me["middleMarker"].show(); + me["outerMarker"].hide(); + me["innerMarker"].hide(); + } else if (getprop("instrumentation/marker-beacon/inner")) { + me["innerMarker"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + } else { + me["ilsError"].hide(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + me.updateCommon(); }, updateFast: func() { @@ -1275,10 +1281,31 @@ var canvas_PFD_2 = { } if (ap_ils_mode2.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { - me["ilsError"].show(); - } else { - me["ilsError"].hide(); - } + me["ilsError"].show(); + } else if (ap_ils_mode2.getValue() == 1) { + me["ilsError"].hide(); + + # Marker beacons + if (getprop("instrumentation/marker-beacon/outer")) { + me["outerMarker"].show(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (getprop("instrumentation/marker-beacon/middle")) { + me["middleMarker"].show(); + me["outerMarker"].hide(); + me["innerMarker"].hide(); + } else if (getprop("instrumentation/marker-beacon/inner")) { + me["innerMarker"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + } else { + me["ilsError"].hide(); + } me.updateCommon(); }, diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index b07b0de8..f225fba9 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" - sodipodi:docname="pfd.svg" - inkscape:version="1.0beta2 (2b71d25, 2019-12-03)" - id="svg2" - version="1.1" - viewBox="0 0 1024 1024" + width="1024pt" height="1024pt" - width="1024pt"> + viewBox="0 0 1024 1024" + version="1.1" + id="svg2" + inkscape:version="1.0beta2 (2b71d25, 2019-12-03)" + sodipodi:docname="pfd.svg"> @@ -29,50 +29,42 @@ + borderopacity="1" + objecttolerance="20" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="755" + id="namedview371" + showgrid="true" + inkscape:zoom="0.44418625" + inkscape:cx="586.98959" + inkscape:cy="803.99797" + inkscape:window-x="1" + inkscape:window-y="23" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" + showguides="true" + inkscape:snap-global="false" + units="pt" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:document-rotation="0"> + originx="0" + originy="0" /> - + + id="AI_group" + inkscape:label="#g4891"> + id="AI_horizon"> - - + id="AI_background" + inkscape:label="#g5492"> + + + width="1287.3096" + height="1102.3193" + x="-195.39726" + y="-493.56796" + inkscape:label="#rect5809" /> + id="AI_scale" + inkscape:label="#g5341"> + inkscape:label="#g4851" + id="AI_sky_scale"> + d="m 433.99987,580.702 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4686" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,492.0016 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,432.86803 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5073" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,403.3012 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5117" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,344.1676 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5121" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,255.4672 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,196.33363 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5135" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,166.7668 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5149" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,107.6332 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5153" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,18.932797 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,-40.200773 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5167" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-69.767603 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5181" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-128.9012 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5185" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,-217.6016 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,-276.73517 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5199" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-306.302 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path5213" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,-365.4356 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path5217" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,-454.136 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,551.13523 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + inkscape:label="#g4813" + id="AI_ground_scale"> - + + id="path4507" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,698.9688 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4521" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 420.6008,787.6696 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,817.2364 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 393.624,846.8032 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4531" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,935.5036 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + - + + id="path4567" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1053.7708 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4571" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1112.9044 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,1142.4712 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4577" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,1201.6048 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4599" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1290.3052 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4603" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1349.4388 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,1379.0056 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="path4609" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 393.624,1438.1392 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + + id="path4631" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 433.99987,1526.8396 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - - + + + inkscape:label="#g4737" + id="AI_scale_num"> - 10 + id="AI_sky_num" + inkscape:label="#g4699"> 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 + id="AI_ground_num" + inkscape:label="#g4661"> 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 + transform="translate(0,97.082371)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 370.53103,162.42242 21.66136,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + transform="translate(133.78495,0)" + id="g4951"> + d="m 370.5312,154.3476 21.6616,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;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:connector-curvature="0" + sodipodi:nodetypes="cc" /> + transform="matrix(0.9999956,0,0,0.9999865,26.97857,532.2047)" + id="g4964"> - - - - + + + + - X + transform="translate(0,97.08285)"> X X + id="text4958" + y="164.03458" + x="530.78998" + 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:#bb6100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">X X + X + id="AI_horizon_ground"> + + + + + + + + + + + + + - - - - - - - - - - - - - + style="fill:#000000" + d="m 452.95372,819.65041 -266.35567,0 0,-303.78402 0,-303.78402 266.35567,0 266.35567,0 0,303.78402 0,303.78402 z m -4.70012,-29.15978 22.4688,-0.86543 22.7656,-2.8912 c 9.03456,-1.14738 22.22459,-4.4067 31.0728,-6.6408 8.84823,-2.23412 21.63139,-7.28853 28.8248,-9.9304 7.19343,-2.64188 17.79374,-8.25496 25.9288,-12.3008 8.13505,-4.04583 20.89048,-11.8465 29.1968,-18.024 l 17.7128,-13.1728 14.076,-13.236 12.9,-13.496 10.2808,-11.2776 10.1272,-13.148 8.5,-11.9752 8.23219,-13.516 0,-137.35577 0,-136.5069 -8.23219,-13.516 c -2.4515,-4.02499 -5.60322,-7.65441 -8.5,-11.9752 -2.68932,-4.01133 -7.74317,-10.50003 -10.1272,-13.148 l -10.2808,-11.2776 -12.9,-13.496 -14.076,-13.236 -17.7128,-13.1728 c -8.4714,-6.30008 -21.06175,-13.97818 -29.1968,-18.024 -8.13506,-4.04584 -18.73537,-9.65931 -25.9288,-12.3012 -7.19341,-2.64188 -28.8248,-9.9312 -28.8248,-9.9312 0,0 -28.6997,-6.20989 -31.0728,-6.6408 l -22.7656,-2.8912 c 0,0 -13.87507,-0.84398 -22.4688,-0.8644 -9.15881,-0.0218 -22.4688,0.8644 -22.4688,0.8644 l -22.7656,2.8912 c -9.03456,1.14737 -22.22457,4.4067 -31.0728,6.6408 -8.84823,2.2341 -21.63138,7.28932 -28.8248,9.9312 -7.19343,2.64189 -17.79373,8.25536 -25.9288,12.3012 -8.13504,4.04582 -21.07541,12.04906 -29.1968,18.024 l -17.7128,13.1728 -14.076,13.236 -12.9,13.496 -10.2808,11.2776 -10.1272,13.148 -8.5,11.9752 -8.48835,13.516 0,136.5069 3.5e-4,137.35577 8.488,13.516 8.5,11.9752 10.1272,13.148 10.2808,11.2776 12.9,13.496 14.076,13.236 17.7128,13.1728 c 8.09045,6.01677 21.06176,13.97818 29.1968,18.024 8.13507,4.04585 18.73537,9.65892 25.9288,12.3008 7.19342,2.64188 19.83464,7.66085 28.8248,9.9308 8.99013,2.26993 23.06292,5.6237 31.0728,6.6408 l 22.7656,2.8912 22.4688,0.8652 z" + id="AI_horizon_mask" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + id="AI_bankindex" + d="m 433.21105,207.78584 30.0845,1e-5 -15.04195,25.28563 z" + style="fill:none;fill-opacity:1;stroke:#c9cc15;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + width="12.257594" + height="12.775722" + x="442.1286" + y="506.77753" /> + + id="FD_pitch" + width="7.5999999" + height="263.53848" + x="509.36719" + y="-580.02087" + inkscape:label="#rect4743" /> + id="AI_stick_pos"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 452.49998,480.26394 0,29.04648" + 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="g4806" + transform="matrix(-1,0,0,1,897.27706,0)"> + d="m 452.50015,509.31081 29.04648,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" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + id="g4812" + transform="matrix(1,0,0,-1,0,1026.344)"> - - - - + + + + + x="440.25876" + height="16.491779" + width="15.997281" + id="AI_center" + style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.77994585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="matrix(1.0666667,0,0,1.066636,4.919636,-0.50381959)" + id="g4844"> + + + + + - - - - - + - + d="m 302.91873,276.44572 c 89.26696,-54.70986 201.68233,-54.70986 290.94929,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + id="AI_bank"> + d="m 433.21105,267.08957 30.0845,-10e-6 -15.04225,-25.28563 z" + style="fill:none;fill-opacity:1;stroke:#c9cc15;stroke-width:3.99994254;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" + inkscape:label="#path905" + inkscape:transform-center-y="-258.88333" /> + id="AI_slipskid" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" + inkscape:label="#path912" + inkscape:transform-center-y="-228.40743" /> + - + id="path4367" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + - + transform="matrix(-1,0,0,1,896.78566,0)" + id="g4374"> + - + d="m 288.584,252.95092 13.8416,-7.96852" + 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="AI_bank_lim"> - + id="g4545" + transform="translate(0,19.596045)"> - - - + + + + + id="AI_bank_lim_X" + inkscape:label="#g4886"> X - X + X - + transform="matrix(-1,0,0,1,896.72324,0)" + id="g3954"> + + transform="matrix(0.98404072,0.17794355,-0.17794355,0.98404072,97.433196,-71.336811)" + id="g3968"> + - + d="m 354.9152,234.0368 -14.5632,5.4816" + 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="g3978" + transform="matrix(-0.98404072,0.17794355,0.17794355,0.98404072,799.64735,-71.336811)"> + id="path3982" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 354.9152,234.0368 4.87069,14.48383" + 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="path3986" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + inkscape:transform-center-y="245.55742" + id="AI_agl_g"> 0000 + x="511.25748" + id="tspan4624" + sodipodi:role="line">0000 + id="AI_stick"> + id="g4630" + transform="translate(0.97071068,0)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> - - - - - - - - + transform="matrix(-1,0,0,1,894.37964,0)" + id="g4634"> + + + + + + + + + width="21.356052" + height="552.00073" + x="124.90075" + y="237.03366" + inkscape:label="#rect9211" /> + id="ALT_target_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" /> - - - - - - - - - - - - + id="HDG_frame" + inkscape:label="#g4848"> + + + + + + + + + + + + - 1 + transform="matrix(1.0666667,0,0,1.066636,0.28284271,-0.50381959)" + id="g5112"> 2 + id="tspan5094" + sodipodi:role="line">1 2 + 6 - - - - - - - - - - - 6 - 2 - 1 + transform="matrix(1.0666667,0,0,-1.066636,0.28284271,1026.1924)" + id="g5092"> - + + 6 + 2 + 1 + + + + + + + + + + + y="-1060.3188" + x="509.69724" + height="361.44022" + width="6.5950012" + id="VS_pointer" + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:3.89981294;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + id="VS_box"> + width="45.6008" + height="45.6008" + x="983.48328" + y="424.25317" /> 00 + x="1147.7107" + id="tspan5136-1" + sodipodi:role="line">00 - + y="545.61121" /> + + transform="translate(-723.20023,0)"> + d="m 1579.3052,999.43982 -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="965.32141" + 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="path4937" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> 000 + x="1604.5295" + id="tspan4941" + sodipodi:role="line">000 + d="m 1479.2996,520.72043 9.3792,-7.9746 -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" /> + id="path4945" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,902.1027 -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="path4949" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,804.76558 -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="path4953" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,707.42846 -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="path4957" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 1579.3052,610.09134 -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="path4961" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> - 000 - - - - - - - - - - - 000 - 000 + + + + + + + + + + 000 + + 000 + + width="102.47213" + height="84.381813" + x="59.092628" + y="6.0090518" + inkscape:label="#rect4290" /> + TOGA TOGA - MAN - - MAN PITCH TRIM ONLY + x="125.84993" + id="tspan4303" + sodipodi:role="line">MAN ALT + 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" + y="115.0584" + x="505.48523" + id="tspan4614" + sodipodi:role="line">MAN PITCH TRIM ONLY + G/S + id="tspan4244" + x="370.20218" + y="34.986706" + 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:#0dc04b;fill-opacity:1;stroke-width:0.657577">ALT CLB - LOC + x="422.80801" + id="tspan4248" + sodipodi:role="line">G/S NAV + 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">CLB + LOC + NAV - - + + + transform="translate(0,4.4)"> + width="7.7972813" + height="41.291069" + x="444.25851" + y="816.11987" /> + d="m 355.793,836.92648 c 0,3.51647 -2.85073,6.36714 -6.3673,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.3673,2.85066 6.3673,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="circle4876" + d="m 257.81742,836.9262 c 0,3.51647 -2.85073,6.36714 -6.36731,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.36731,2.85066 6.36731,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="translate(1.8616028,0)" + id="g4527"> + d="m 649.3818,836.9262 c 0,3.51647 -2.85073,6.36714 -6.36731,6.36714 -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36714 0,-3.51647 2.85075,-6.36712 6.36731,-6.36712 3.51657,0 6.36731,2.85066 6.36731,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="circle4880" + d="m 551.40661,836.9262 c 0,3.51647 -2.85074,6.36714 -6.36731,6.36714 -3.51658,0 -6.36732,-2.85066 -6.36732,-6.36714 0,-3.51647 2.85075,-6.36712 6.36732,-6.36712 3.51656,0 6.36731,2.85066 6.36731,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + width="33.21196" + height="33.21196" + x="-517.64343" + y="1019.8428" + transform="matrix(0.83705476,-0.54711912,0.83705476,0.54711912,0,0)" + inkscape:label="#rect4872" /> + id="ALT_group2" + inkscape:label="#g4828"> + x="509.50464" + height="49.153526" + width="7.7970567" + id="rect4925" + style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:4.4806304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> STD - - - - - - 000 - - FL 000 - FL 000 - - QNH - STD + + + + + + 000 + + FL 000 + FL 000 + + QNH + 1013 + x="907.61713" + y="885.26117" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.3994px;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.75">1013 + transform="translate(5.2325902,0)"> + width="7.7970567" + height="49.153526" + x="509.50464" + y="-741.82098" + transform="matrix(0,1,-1,0,0,0)" /> + transform="translate(0,-1.0792028)" + id="g4531"> + d="m 714.66382,422.10642 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:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="circle4929" + d="m 714.66382,324.13136 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:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 714.66382,716.47762 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="circle4933" + d="m 714.66382,618.50242 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51647 2.85073,-6.36714 6.36731,-6.36714 3.51658,0 6.36732,2.85066 6.36732,6.36714 0,3.51647 -2.85075,6.36712 -6.36732,6.36712 z" + style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.39996552;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + y="-368.9328" + x="949.0885" + height="33.211578" + width="33.211578" + id="GS_pointer" + style="fill:none;fill-opacity:1;stroke:#b055be;stroke-width:4.03498697;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + width="89.289597" + height="59.519768" + x="768.71039" + y="483.25833" + inkscape:label="#rect4671" /> + width="48.851151" + height="90.122147" + x="858.00543" + y="467.59009" + inkscape:label="#rect9211" /> + id="ALT_frame" + inkscape:label="#g5167"> + + id="path965" + d="m 768.94214,790.64777 132.99332,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.16267705;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> - + id="ALT_group" + inkscape:label="#g5379"> + id="ALT_box" + inkscape:label="#g5173"> + id="rect953" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + - + d="m 770.31078,544.06163 86.08971,-6e-4" + style="fill:none;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" />  40200080604020008060 -  40200080604020008060 + 00 + x="890.99316" + id="tspan973" + sodipodi:role="line">00 - - + + AP 1+2 - 1 FD 2 - A/THR - CAT 3 + 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">AP 1+2 1 FD 2 + A/THR + DUAL + id="tspan4280" + sodipodi:role="line">CAT 3 NO DH - - - - - - + y="74.709656" + 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">DUAL SPEED + inkscape:label="#text983">NO DH + + + + FLARE + x="123.23077" + id="tspan981" + sodipodi:role="line">SPEED - DH + 250 + id="tspan4354" + x="505.48523" + y="34.635437" + 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:#0dc04b;fill-opacity:1;stroke-width:0.657577">FLARE + inkscape:label="#rect4290" + y="7.4160867" + x="296.9281" + height="36.76775" + width="293.76205" + id="FMA_combined_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" /> +40 + id="tspan4301" + x="826.09802" + 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">DH LVR CLB - - - - 00 - - 00 - - - - - 00 - 00 - 00 - - - - - - 00 - - - 00 - - - - - - - - - - - 000 - 000 - + 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" + y="115.05846" + x="922.034" + id="tspan4305" + sodipodi:role="line">250 + inkscape:label="#rect4290" + y="5.9218655" + x="21.79715" + height="84.557259" + width="171.9402" + id="FMA_flx_box" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + +40 + LVR CLB + id="HDG_group" + inkscape:label="#g4853"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 140 - 160 - 120 - 100 - 080 - 060 - 040 - 180 - 200 - 220 - 240 - 260 - 280 - 300 - 320 - 340 - 360 - 380 - 400 - 420 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(-104.78479,0)" + inkscape:label="#g4743" + id="HDG_scale"> + + 00 + 00 + + + + + 00 + 00 + 00 + + + + + + 00 + + + 00 + + + + transform="matrix(1.0666667,0,0,1.066636,7.9500002,2.8086774)" + inkscape:label="#g5019" + id="CRS_pointer"> + + + + + 000 + 000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 140 + 160 + 120 + 100 + 080 + 060 + 040 + 180 + 200 + 220 + 240 + 260 + 280 + 300 + 320 + 340 + 360 + 380 + 400 + 420 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="ASI_line" + d="m 123.76482,-2061.3896 0,2574.1872" + 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="ASI_trend_down" + transform="matrix(1,0,0,-1,0,1025.6524)"> - - - - - - + + 000 000 - . - 000 + id="tspan4668" + sodipodi:role="line">. 000 - . 000 + . - - SPD - + id="tspan4696" + x="80.506668" + y="220.32645" + 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">. + id="ASI_error" + inkscape:label="#g4779"> + SPD + id="ASI_line_red" + d="m 124.45518,236.9723 0,552.07397" + style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + + + - ATT - ALT ATT + V/S + y="505.93329" + x="851.70166" + id="tspan4386-4-0" + sodipodi:role="line">ALT HDG + id="tspan4386-4-0-2" + x="1029.0986" + y="445.50174" + 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">V/S HDG + MACH + x="34.684372" + y="874.4469" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ff0000;fill-opacity:1;stroke-width:0.75">MACH + ILS + ILS + 000.00 + 0.0 + NM + + + 000 + + + + 000 + ILS + y="792.14221" + x="652.33966" + id="tspan773-3" + sodipodi:role="line">MM ILS - 000.00 - 0.0 - NM - - - 000 - - - - 000 - + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#179ab7;fill-opacity:1;stroke-width:0.75" + y="792.1355" + x="654.69263" + id="tspan773-9" + sodipodi:role="line">OM + AWY diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index 0f0edc75..4f9ac4c5 100644 --- a/Systems/instrumentation.xml +++ b/Systems/instrumentation.xml @@ -159,11 +159,6 @@ 0.1 - - marker-beacon - 0 - - heading-indicator 0 @@ -187,6 +182,11 @@ 109.9 + + marker-beacon + 0 + + nav 0 From a9a081050c20e36112ba9fcf9376731b3970c347 Mon Sep 17 00:00:00 2001 From: Colin Geniet Date: Sat, 8 Feb 2020 23:24:44 +0100 Subject: [PATCH 2/6] Model: Add fallback model index --- A320-main.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/A320-main.xml b/A320-main.xml index 57f80d0c..29e4e1cd 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -15,6 +15,8 @@ + 212 + From 445b5a2f1ffae106c007450c1e5a215676f8a7bb Mon Sep 17 00:00:00 2001 From: hayden2000 Date: Sun, 9 Feb 2020 13:07:17 -0500 Subject: [PATCH 3/6] Only show marker beacons on landing --- Models/Instruments/PFD/PFD.nas | 133 ++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 386ef749..a1d0976c 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -112,6 +112,7 @@ var att_switch = props.globals.getNode("controls/switching/ATTHDG", 1); var air_switch = props.globals.getNode("controls/switching/AIRDATA", 1); var appr_enabled = props.globals.getNode("it-autoflight/output/appr-armed/", 1); var loc_enabled = props.globals.getNode("it-autoflight/output/loc-armed/", 1); +var vert_state = props.globals.getNode("it-autoflight/output/vert/", 1); var ils_data1 = props.globals.getNode("FMGC/internal/ils1-mcdu/", 1); # Independent MCDU ILS not implemented yet, use MCDU1 in the meantime # var ils_data2 = props.globals.getNode("FMGC/internal/ils2-mcdu/", 1); @@ -120,6 +121,9 @@ var dme_data = props.globals.getNode("instrumentation/dme[0]/indicated-distance- var ils_crs = props.globals.getNode("instrumentation/nav[0]/radials/selected-deg", 1); var ils1_crs_set = props.globals.getNode("FMGC/internal/ils1crs-set/", 1); var arrival_airport = props.globals.getNode("FMGC/internal/arr-arpt", 1); +var outer_marker = props.globals.getNode("instrumentation/marker-beacon/outer", 1); +var middle_marker = props.globals.getNode("instrumentation/marker-beacon/middle", 1); +var inner_marker = props.globals.getNode("instrumentation/marker-beacon/inner", 1); # Create Nodes: var vs_needle = props.globals.initNode("/instrumentation/pfd/vs-needle", 0.0, "DOUBLE"); @@ -797,8 +801,8 @@ var canvas_PFD_base = { } #Approach selected and tuned, overwrite RAD NAV - } else if (0) { -# var runways = airportinfo(airportinfo(arrival_airport.getValue()).id).runways; +# } else if (0) { +# var runways = airportinfo(airportinfo(arrival_airport.getValue()).id).runways; # var runway_keys = sort(keys(runways), string.icmp); # foreach(var rwy; runway_keys) { # var r = runways[rwy]; @@ -806,9 +810,9 @@ var canvas_PFD_base = { # magnetic_hdg = r.heading - getprop("environment/magnetic-variation-deg"); # magnetic_hdg_dif = geo.normdeg180(magnetic_hdg - heading.getValue()); # -# SET THE FMGC values here!!!!! -# course = r.heading; -# ils_frequency = r.ils_frequency_mhz; +# SET THE FMGC values here!!!!! +# course = r.heading; +# ils_frequency = r.ils_frequency_mhz; # # break; # } @@ -917,6 +921,33 @@ var canvas_PFD_1 = { me["ils_freq"].hide(); me["dme_dist"].hide(); me["dme_dist_legend"].hide(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + + if (ap_ils_mode.getValue() == 1 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1 or vert_state.getValue() == 2)) { + if (outer_marker.getValue() == 1) { + me["outerMarker"].show(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (middle_marker.getValue() == 1) { + me["middleMarker"].show(); + me["outerMarker"].hide(); + me["innerMarker"].hide(); + } else if (inner_marker.getValue() == 1) { + me["innerMarker"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); } if (ap_ils_mode.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) { @@ -929,38 +960,12 @@ var canvas_PFD_1 = { } else { me["GS_pointer"].hide(); } - - # Marker beacons/ILS warning + if (ap_ils_mode.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { - me["ilsError"].show(); - me["outerMarker"].hide(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } else if (ap_ils_mode.getValue() == 1 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { - me["ilsError"].hide(); - if (getprop("instrumentation/marker-beacon/outer")) { - me["outerMarker"].show(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } else if (getprop("instrumentation/marker-beacon/middle")) { - me["middleMarker"].show(); - me["outerMarker"].hide(); - me["innerMarker"].hide(); - } else if (getprop("instrumentation/marker-beacon/inner")) { - me["innerMarker"].show(); - me["outerMarker"].hide(); - me["middleMarker"].hide(); - } else { - me["outerMarker"].hide(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } - } else { - me["ilsError"].hide(); - me["outerMarker"].hide(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } + me["ilsError"].show(); + } else { + me["ilsError"].hide(); + } me.updateCommon(); }, @@ -1267,6 +1272,33 @@ var canvas_PFD_2 = { me["ils_freq"].hide(); me["dme_dist"].hide(); me["dme_dist_legend"].hide(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + + if (ap_ils_mode2.getValue() == 1 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1 or vert_state.getValue() == 2)) { + if (outer_marker.getValue() == 1) { + me["outerMarker"].show(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (middle_marker.getValue() == 1) { + me["middleMarker"].show(); + me["outerMarker"].hide(); + me["innerMarker"].hide(); + } else if (inner_marker.getValue() == 1) { + me["innerMarker"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } + } else { + me["outerMarker"].hide(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); } if (ap_ils_mode2.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) { @@ -1281,31 +1313,10 @@ var canvas_PFD_2 = { } if (ap_ils_mode2.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) { - me["ilsError"].show(); - } else if (ap_ils_mode2.getValue() == 1) { - me["ilsError"].hide(); - - # Marker beacons - if (getprop("instrumentation/marker-beacon/outer")) { - me["outerMarker"].show(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } else if (getprop("instrumentation/marker-beacon/middle")) { - me["middleMarker"].show(); - me["outerMarker"].hide(); - me["innerMarker"].hide(); - } else if (getprop("instrumentation/marker-beacon/inner")) { - me["innerMarker"].show(); - me["outerMarker"].hide(); - me["middleMarker"].hide(); - } else { - me["outerMarker"].hide(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } - } else { - me["ilsError"].hide(); - } + me["ilsError"].show(); + } else { + me["ilsError"].hide(); + } me.updateCommon(); }, From c30b42a888a802b0089cdc97fc66d5a771fa1c21 Mon Sep 17 00:00:00 2001 From: hayden2000 Date: Sun, 9 Feb 2020 13:12:22 -0500 Subject: [PATCH 4/6] Fix entabing --- .gitignore | 1 + Systems/instrumentation.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 71dc2c1b..d0dd3106 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ MyDevWIP # ignore swap files *.swp *.swo +.DS_Store diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index 4f9ac4c5..802a4b12 100644 --- a/Systems/instrumentation.xml +++ b/Systems/instrumentation.xml @@ -183,9 +183,9 @@ - marker-beacon - 0 - + marker-beacon + 0 + nav From 559f31fe7a27d47dc633af191b2fc2e17ae87fb0 Mon Sep 17 00:00:00 2001 From: Colin Geniet Date: Mon, 10 Feb 2020 10:24:13 +0100 Subject: [PATCH 5/6] Model: Mark flightdeck and cabin as interior --- Models/A320-100-CFM.xml | 21 +++++++++------------ Models/A320-200-CFM.xml | 21 +++++++++------------ Models/A320-200-IAE.xml | 21 +++++++++------------ Models/A320-interior.xml | 23 +++++++++++++++++++++++ Models/A320neo-CFM.xml | 21 +++++++++------------ Models/A320neo-PW.xml | 21 +++++++++------------ 6 files changed, 68 insertions(+), 60 deletions(-) create mode 100644 Models/A320-interior.xml diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml index 177a1bc6..476b99f6 100644 --- a/Models/A320-100-CFM.xml +++ b/Models/A320-100-CFM.xml @@ -16,20 +16,17 @@ Aircraft/A320-family/Models/Fuselages/A320-100/fuselage.xml - - - Flightdeck - Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml - - 4.81794 - 0.0 - 0.0 - - - Interior - Aircraft/A320-family/Models/Interior/a320.interior.xml + Aircraft/A320-family/Models/A320-interior.xml + + + 18.8499 + -1.7005004 + + interior diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 776d6987..ceeb328a 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -16,20 +16,17 @@ Aircraft/A320-family/Models/Fuselages/A320/fuselage.xml - - - Flightdeck - Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml - - 4.81794 - 0.0 - 0.0 - - - Interior - Aircraft/A320-family/Models/Interior/a320.interior.xml + Aircraft/A320-family/Models/A320-interior.xml + + + 18.8499 + -1.7005004 + + interior diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 2fdeb2c0..20efc22b 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -16,20 +16,17 @@ Aircraft/A320-family/Models/Fuselages/A320/fuselage.xml - - - Flightdeck - Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml - - 4.81794 - 0.0 - 0.0 - - - Interior - Aircraft/A320-family/Models/Interior/a320.interior.xml + Aircraft/A320-family/Models/A320-interior.xml + + + 18.8499 + -1.7005004 + + interior diff --git a/Models/A320-interior.xml b/Models/A320-interior.xml new file mode 100644 index 00000000..aa5c89d2 --- /dev/null +++ b/Models/A320-interior.xml @@ -0,0 +1,23 @@ + + + + + + Flightdeck + Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml + + -14.0320 + 0.0 + 1.7005004 + + + + + Interior + Aircraft/A320-family/Models/Interior/a320.interior.xml + + -18.8499 + 1.7005004 + + + diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index a98f3a22..9f48a1c7 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -16,20 +16,17 @@ Aircraft/A320-family/Models/Fuselages/A320neo/fuselage.xml - - - Flightdeck - Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml - - 4.81794 - 0.0 - 0.0 - - - Interior - Aircraft/A320-family/Models/Interior/a320.interior.xml + Aircraft/A320-family/Models/A320-interior.xml + + + 18.8499 + -1.7005004 + + interior diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index cf7dce0f..8999e7f6 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -16,20 +16,17 @@ Aircraft/A320-family/Models/Fuselages/A320neo/fuselage.xml - - - Flightdeck - Aircraft/A320-family/Models/FlightDeck/a320.flightdeck.xml - - 4.81794 - 0.0 - 0.0 - - - Interior - Aircraft/A320-family/Models/Interior/a320.interior.xml + Aircraft/A320-family/Models/A320-interior.xml + + + 18.8499 + -1.7005004 + + interior From 52cf2ac44c1a17cb777ae3ea0be9793de59fa7fe Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 11 Feb 2020 13:11:40 +0000 Subject: [PATCH 6/6] Add c-chord sound (sound only for now), fix IM, show markers anytime you fly over them (they should only show up below about 5000 feet, anyway) --- Models/Instruments/PFD/PFD.nas | 32 ++++++++++++------------------ Models/Instruments/PFD/res/pfd.svg | 2 +- Sounds/A320-common-sound.xml | 16 +++++++++++++++ 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index a1d0976c..6801aa2c 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -926,28 +926,22 @@ var canvas_PFD_1 = { me["innerMarker"].hide(); } - if (ap_ils_mode.getValue() == 1 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1 or vert_state.getValue() == 2)) { - if (outer_marker.getValue() == 1) { - me["outerMarker"].show(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } else if (middle_marker.getValue() == 1) { - me["middleMarker"].show(); - me["outerMarker"].hide(); - me["innerMarker"].hide(); - } else if (inner_marker.getValue() == 1) { - me["innerMarker"].show(); - me["outerMarker"].hide(); - me["middleMarker"].hide(); - } else { - me["outerMarker"].hide(); - me["middleMarker"].hide(); - me["innerMarker"].hide(); - } + if (outer_marker.getValue() == 1) { + me["outerMarker"].show(); + me["middleMarker"].hide(); + me["innerMarker"].hide(); + } else if (middle_marker.getValue() == 1) { + me["middleMarker"].show(); + me["outerMarker"].hide(); + me["innerMarker"].hide(); + } else if (inner_marker.getValue() == 1) { + me["innerMarker"].show(); + me["outerMarker"].hide(); + me["middleMarker"].hide(); } else { me["outerMarker"].hide(); me["middleMarker"].hide(); - me["innerMarker"].hide(); + me["innerMarker"].hide(); } if (ap_ils_mode.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) { diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index f225fba9..5f78eb00 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -5018,5 +5018,5 @@ id="tspan773-9-9" x="625.49036" y="792.17651" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.75">AWY + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.75">IM diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index f7bfe05e..d05399f2 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1598,6 +1598,22 @@ 10 100 + + + Cricket + Aircraft/A320-family/Sounds/Cockpit/c-chord.wav + once + avionics + + /sim/sound/warnings/cchord + + + /sim/current-view/internal + 0.2 + + 10 + 100 + stall-voice