diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 6628107a..5de338b3 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -30,6 +30,9 @@ setprop("/it-autoflight/internal/vert-speed-fpm-pfd", 0); setprop("/position/gear-agl-ft", 0); setprop("/controls/flight/aileron-input-fast", 0); setprop("/controls/flight/elevator-input-fast", 0); +setprop("/instrumentation/adirs/ir[0]/aligned", 0); +setprop("/instrumentation/adirs/ir[1]/aligned", 0); +setprop("/instrumentation/adirs/ir[2]/aligned", 0); var ASI = 0; var ASItrgt = 0; var ASItrgtdiff = 0; @@ -107,7 +110,12 @@ var canvas_PFD_base = { return me; }, getKeys: func() { - return []; + return ["FMA_man","FMA_manmode","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","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","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_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"]; }, update: func() { if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/controls/lighting/DU/du1") > 0) { @@ -665,14 +673,6 @@ var canvas_PFD_1 = { return m; }, - getKeys: func() { - return ["FMA_man","FMA_manmode","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","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","AI_center","AI_bank","AI_bank_lim","AI_slipskid","AI_horizon","AI_horizon_ground", - "AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","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", - "VS_pointer","VS_box","VS_digit","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","TRK_pointer"]; - }, update: func() { fd1 = getprop("/it-autoflight/output/fd1"); fd2 = getprop("/it-autoflight/output/fd2"); @@ -683,6 +683,41 @@ var canvas_PFD_1 = { wow1 = getprop("/gear/gear[1]/wow"); wow2 = getprop("/gear/gear[2]/wow"); + # Errors + if (getprop("/instrumentation/adirs/ir[0]/aligned") == 1) { + me["ASI_group"].show(); + me["AI_group"].show(); + me["ALT_group"].show(); + me["ALT_group2"].show(); + me["ALT_scale"].show(); + me["VS_group"].show(); + me["HDG_group"].show(); + me["ASI_error"].hide(); + me["ASI_frame"].setColor(1,1,1); + me["AI_error"].hide(); + me["ALT_error"].hide(); + me["ALT_frame"].setColor(1,1,1); + me["VS_error"].hide(); + me["HDG_error"].hide(); + me["HDG_frame"].setColor(1,1,1); + } else { + me["ASI_error"].show(); + me["ASI_frame"].setColor(1,0,0); + me["AI_error"].show(); + me["ALT_error"].show(); + me["ALT_frame"].setColor(1,0,0); + me["VS_error"].show(); + me["HDG_error"].show(); + me["HDG_frame"].setColor(1,0,0); + me["ASI_group"].hide(); + me["AI_group"].hide(); + me["ALT_group"].hide(); + me["ALT_group2"].hide(); + me["ALT_scale"].hide(); + me["VS_group"].hide(); + me["HDG_group"].hide(); + } + # FD if (fd1 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { me["FD_roll"].show(); @@ -727,14 +762,6 @@ var canvas_PFD_2 = { return m; }, - getKeys: func() { - return ["FMA_man","FMA_manmode","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","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","AI_center","AI_bank","AI_bank_lim","AI_slipskid","AI_horizon","AI_horizon_ground", - "AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","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", - "VS_pointer","VS_box","VS_digit","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","TRK_pointer"]; - }, update: func() { fd1 = getprop("/it-autoflight/output/fd1"); fd2 = getprop("/it-autoflight/output/fd2"); @@ -745,6 +772,41 @@ var canvas_PFD_2 = { wow1 = getprop("/gear/gear[1]/wow"); wow2 = getprop("/gear/gear[2]/wow"); + # Errors + if (getprop("/instrumentation/adirs/ir[1]/aligned") == 1) { + me["ASI_group"].show(); + me["AI_group"].show(); + me["ALT_group"].show(); + me["ALT_group2"].show(); + me["ALT_scale"].show(); + me["VS_group"].show(); + me["HDG_group"].show(); + me["ASI_error"].hide(); + me["ASI_frame"].setColor(1,1,1); + me["AI_error"].hide(); + me["ALT_error"].hide(); + me["ALT_frame"].setColor(1,1,1); + me["VS_error"].hide(); + me["HDG_error"].hide(); + me["HDG_frame"].setColor(1,1,1); + } else { + me["ASI_error"].show(); + me["ASI_frame"].setColor(1,0,0); + me["AI_error"].show(); + me["ALT_error"].show(); + me["ALT_frame"].setColor(1,0,0); + me["VS_error"].show(); + me["HDG_error"].show(); + me["HDG_frame"].setColor(1,0,0); + me["ASI_group"].hide(); + me["AI_group"].hide(); + me["ALT_group"].hide(); + me["ALT_group2"].hide(); + me["ALT_scale"].hide(); + me["VS_group"].hide(); + me["HDG_group"].hide(); + } + # FD if (fd2 == 1 and ((!wow1 and !wow2 and roll_mode != " ") or roll_mode != " ") and getprop("/it-autoflight/custom/trk-fpa") == 0 and pitch < 25 and pitch > -13 and roll < 45 and roll > -45) { me["FD_roll"].show(); diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index 6d936d3b..8c71da19 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -22,7 +22,7 @@ image/svg+xml - + @@ -41,9 +41,9 @@ inkscape:window-height="1030" id="namedview371" showgrid="false" - inkscape:zoom="0.70710678" - inkscape:cx="1034.8491" - inkscape:cy="734.42739" + inkscape:zoom="4" + inkscape:cx="618.96509" + inkscape:cy="106.65812" inkscape:window-x="1592" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -94,957 +94,1512 @@ id="AI_heading_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="AI_group" + inkscape:label="#g4891"> + inkscape:label="#g5497" + transform="translate(0,-97.082454)" + id="AI_horizon"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + 10 + 20 + 20 + 30 + 30 + 40 + 40 + 50 + 50 + 60 + 60 + 70 + 70 + 80 + 80 + 90 + 90 + + + 10 + 10 + 20 + 20 + 30 + 30 + 40 + 40 + 50 + 50 + 60 + 60 + 70 + 70 + 80 + 80 + 90 + 90 + + + + + + x="-195.3976" + height="1102.3192" + width="1287.3097" + id="rect4914" + style="opacity:1;fill:#522001;fill-opacity:1;stroke:none;stroke-width:2.48752213;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - + id="AI_heading" + inkscape:label="#g4743" + transform="translate(-153.56239,-430.12536)"> + + + + + + + + + + + + + + + + + + + id="g4802"> - - + id="path4800" + 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="path4808" + 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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g4812" + transform="matrix(1,0,0,-1,0,1026.344)"> + id="path4814" + 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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - 10 - 20 - 20 - 30 - 30 - 40 - 40 - 50 - 50 - 60 - 60 - 70 - 70 - 80 - 80 - 90 - 90 - - - 10 - 10 - 20 - 20 - 30 - 30 - 40 - 40 - 50 - 50 - 60 - 60 - 70 - 70 - 80 - 80 - 90 - 90 - + transform="matrix(-1,0,0,-1,897.27706,1026.344)" + id="g4818"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0000 + + + + + + + + + + + + + + + + + @@ -1056,118 +1611,6 @@ width="104.39759" 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" /> - - - - - - - - - - - - - - STD - - - - - - - - - - + + + + + + - - - 1 - 2 - 6 - - - - - - - - - - - 6 - 2 - 1 - - - - - - - - - - - + sodipodi:nodetypes="ccccccc" /> + id="VS_group" + inkscape:label="#g4759"> + + 1 + 2 + 6 + + + + + + + + + + + 6 + 2 + 1 + + + + + + + + + - + + + + 00 - - - - 140 - 160 - 120 - 100 - 080 - 060 - 040 - 180 - 200 - 220 - 240 - 260 - 280 - 300 - 320 - 340 - 360 - 380 - 400 - 420 + inkscape:label="#text5138-5">00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QNH - - - + id="ASI_frame" + inkscape:label="#g4757"> + id="rect919" + d="m 13.168124,235.4451 141.300716,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" /> + sodipodi:nodetypes="cc" /> - - - - - + id="ALT_group2" + inkscape:label="#g4828"> + STD + + + + + + 000 + + FL 000 000 + id="tspan5116" + x="801.06317" + y="220.32645" + 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';text-align:start;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke-width:0.75">FL 000 + + QNH + 1013 + inkscape:label="#g5173"> - + 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" + style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75" + xml:space="preserve">00 + LVR CLB - - - - - + id="HDG_group" + inkscape:label="#g4853"> + transform="translate(-104.78479,0)" + inkscape:label="#g4743" + id="HDG_scale"> + 00 + + 00 + + + + + 00 + 00 + 00 + - - - - - - - - - - - - - + id="path4723" + d="m 207.64877,944.75532 0,12.35406" + 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="path4725" + d="m 749.62718,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 - - - - - - - - - - + + id="HDG_target" + d="m 426.05644,912.48947 43.41526,10e-6 -21.70763,40.47717 z" + style="fill:none;fill-opacity:1;stroke:#1684a5;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + + + + + + 000 + 000 + + + + + 140 + 160 + 120 + 100 + 080 + 060 + 040 + 180 + 200 + 220 + 240 + 260 + 280 + 300 + 320 + 340 + 360 + 380 + 400 + 420 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 000 + . + 000 + 000 + . + . + + + 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" /> 000 - . - 1013 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:56px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.75" + y="503.59891" + x="463.77478" + id="tspan4386-4-1" + sodipodi:role="line">ATT - 0000 - - - - - - - - - - - - - - - - - - - - - - 00 + id="ALT_error" + inkscape:label="#g5213"> + id="path951-4" + d="m 770.31038,481.90882 86.60236,-3.1e-4" + 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" /> + 00 - - - - - 00 - 00 - 00 - - - - - - 00 - - - 00 - - + 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;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 - - - - - - - 000 - 000 - 000 - V000 - /. + x="1029.0986" + y="565.50171" + 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';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.75" + id="tspan4815">S . - FL 000 - FL 000 + 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';text-align:end;text-anchor:end;fill:#ff0000;fill-opacity:1;stroke-width:0.75" + y="950.08264" + x="522.40784" + id="tspan4386-4-5" + sodipodi:role="line">HDG diff --git a/revision.txt b/revision.txt index 1dc05030..f31c1c7e 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4018 \ No newline at end of file +4019 \ No newline at end of file