Per photo reference, the ground reference bar should use radio altimeter rather than barometric altimeter, consequently is independent of the altimeter setting.
This commit is contained in:
parent
46b439571e
commit
56955bebc4
3 changed files with 83 additions and 114 deletions
|
@ -69,9 +69,6 @@ var alt_inhg = props.globals.getNode("/instrumentation/altimeter/setting-inhg",
|
|||
var target_altitude = props.globals.getNode("/autopilot/settings/target-altitude-ft", 1);
|
||||
var altitude = props.globals.getNode("/instrumentation/altimeter/indicated-altitude-ft", 1);
|
||||
var altitude_pfd = props.globals.getNode("/instrumentation/altimeter/indicated-altitude-ft-pfd", 1);
|
||||
var alt_diff = props.globals.getNode("/instrumentation/pfd/alt-diff", 1);
|
||||
var ground_diff = props.globals.getNode("/instrumentation/pfd/ground-diff", 1);
|
||||
var landing_diff = props.globals.getNode("/instrumentation/pfd/landing-diff", 1);
|
||||
var ap_alt = props.globals.getNode("/it-autoflight/internal/alt", 1);
|
||||
var vs_needle = props.globals.getNode("/instrumentation/pfd/vs-needle", 1);
|
||||
var vs_digit = props.globals.getNode("/instrumentation/pfd/vs-digit-trans", 1);
|
||||
|
@ -141,8 +138,6 @@ var air_data_switch = props.globals.getNode("/controls/navigation/switching/air-
|
|||
|
||||
# Create Nodes:
|
||||
var alt_diff = props.globals.initNode("/instrumentation/pfd/alt-diff", 0.0, "DOUBLE");
|
||||
var ground_diff = props.globals.initNode("/instrumentation/pfd/ground-diff", 0.0, "DOUBLE");
|
||||
var landing_diff = props.globals.initNode("/instrumentation/pfd/landing-diff", 0.0, "DOUBLE");
|
||||
var heading = props.globals.initNode("/instrumentation/pfd/heading-deg", 0.0, "DOUBLE");
|
||||
var horizon_pitch = props.globals.initNode("/instrumentation/pfd/horizon-pitch", 0.0, "DOUBLE");
|
||||
var horizon_ground = props.globals.initNode("/instrumentation/pfd/horizon-ground", 0.0, "DOUBLE");
|
||||
|
@ -1691,6 +1686,7 @@ var canvas_PFD_1 = {
|
|||
me["ALT_error"].hide();
|
||||
me["ALT_frame"].setColor(1,1,1);
|
||||
me["ALT_group"].show();
|
||||
me["ALT_tens"].show();
|
||||
me["ALT_box"].show();
|
||||
me["ALT_group2"].show();
|
||||
me["ALT_scale"].show();
|
||||
|
@ -1758,7 +1754,7 @@ var canvas_PFD_1 = {
|
|||
me["ALT_target"].hide();
|
||||
}
|
||||
|
||||
ground_diff_cur = ground_diff.getValue();
|
||||
ground_diff_cur = -gear_agl.getValue();
|
||||
if (ground_diff_cur >= -565 and ground_diff_cur <= 565) {
|
||||
me["ground_ref"].setTranslation(0, (ground_diff_cur / 100) * -48.66856);
|
||||
me["ground_ref"].show();
|
||||
|
@ -1766,10 +1762,9 @@ var canvas_PFD_1 = {
|
|||
me["ground_ref"].hide();
|
||||
}
|
||||
|
||||
landing_diff_cur = landing_diff.getValue();
|
||||
if (landing_diff_cur >= -565 and landing_diff_cur <= 565) {
|
||||
if (ground_diff_cur >= -565 and ground_diff_cur <= 565) {
|
||||
if ((fmgc.FMGCInternal.phase == 5 or fmgc.FMGCInternal.phase == 6) and !wow1.getValue() and !wow2.getValue()) { #add std too
|
||||
me["ground"].setTranslation(0, (landing_diff_cur / 100) * -48.66856);
|
||||
me["ground"].setTranslation(0, (ground_diff_cur / 100) * -48.66856);
|
||||
me["ground"].show();
|
||||
} else {
|
||||
me["ground"].hide();
|
||||
|
@ -1826,6 +1821,7 @@ var canvas_PFD_1 = {
|
|||
me["ALT_error"].show();
|
||||
me["ALT_frame"].setColor(1,0,0);
|
||||
me["ALT_group"].hide();
|
||||
me["ALT_tens"].hide();
|
||||
me["ALT_group2"].hide();
|
||||
me["ALT_scale"].hide();
|
||||
me["ALT_box_flash"].hide();
|
||||
|
@ -2464,6 +2460,7 @@ var canvas_PFD_2 = {
|
|||
me["ALT_error"].hide();
|
||||
me["ALT_frame"].setColor(1,1,1);
|
||||
me["ALT_group"].show();
|
||||
me["ALT_tens"].show();
|
||||
me["ALT_box"].show();
|
||||
me["ALT_group2"].show();
|
||||
me["ALT_scale"].show();
|
||||
|
@ -2531,7 +2528,7 @@ var canvas_PFD_2 = {
|
|||
me["ALT_target"].hide();
|
||||
}
|
||||
|
||||
ground_diff_cur = ground_diff.getValue();
|
||||
ground_diff_cur = -gear_agl.getValue();
|
||||
if (ground_diff_cur >= -565 and ground_diff_cur <= 565) {
|
||||
me["ground_ref"].setTranslation(0, (ground_diff_cur / 100) * -48.66856);
|
||||
me["ground_ref"].show();
|
||||
|
@ -2539,10 +2536,9 @@ var canvas_PFD_2 = {
|
|||
me["ground_ref"].hide();
|
||||
}
|
||||
|
||||
landing_diff_cur = landing_diff.getValue();
|
||||
if (landing_diff_cur >= -565 and landing_diff_cur <= 565) {
|
||||
if (ground_diff_cur >= -565 and ground_diff_cur <= 565) {
|
||||
if ((fmgc.FMGCInternal.phase == 5 or fmgc.FMGCInternal.phase == 6) and !wow1.getValue() and !wow2.getValue()) { #add std too
|
||||
me["ground"].setTranslation(0, (landing_diff_cur / 100) * -48.66856);
|
||||
me["ground"].setTranslation(0, (ground_diff_cur / 100) * -48.66856);
|
||||
me["ground"].show();
|
||||
} else {
|
||||
me["ground"].hide();
|
||||
|
@ -2599,6 +2595,7 @@ var canvas_PFD_2 = {
|
|||
me["ALT_error"].show();
|
||||
me["ALT_frame"].setColor(1,0,0);
|
||||
me["ALT_group"].hide();
|
||||
me["ALT_tens"].hide();
|
||||
me["ALT_group2"].hide();
|
||||
me["ALT_scale"].hide();
|
||||
me["ALT_box_flash"].hide();
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:cy="259.23779"
|
||||
inkscape:cx="201.84998"
|
||||
inkscape:cy="595.1653"
|
||||
inkscape:cx="1107.2972"
|
||||
inkscape:zoom="2.56"
|
||||
showgrid="true"
|
||||
id="namedview371"
|
||||
|
@ -2380,78 +2380,20 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="path1283"
|
||||
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.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
style="fill:#000000;fill-opacity:1;stroke:#ffff00;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path1285"
|
||||
d="m 770.31078,481.90873 86.08971,-3.1e-4"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 770.31078,544.06163 86.08971,-6e-4"
|
||||
id="path1287"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
</g>
|
||||
<text
|
||||
id="ALT_tens"
|
||||
y="317.73038"
|
||||
x="898.703"
|
||||
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"
|
||||
inkscape:label="#text913"
|
||||
transform="scale(0.96366556,1.0377044)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="317.73038"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan919">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="344.55804"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4300">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="371.38571"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan931">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="398.21338"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan927">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="425.04105"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan925">60</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="451.86871"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan923">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="478.69638"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan921">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="505.52405"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan917">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="532.35168"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan915">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.8364px;line-height:87%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="559.17938"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4302">60</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;line-height:0%;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"
|
||||
|
@ -2464,8 +2406,16 @@
|
|||
id="tspan973"
|
||||
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</tspan></text>
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83480072px;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</tspan></text>
|
||||
</g>
|
||||
<rect
|
||||
style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.22735;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="ground_ref"
|
||||
width="16.287683"
|
||||
height="2088.8245"
|
||||
x="860.0014"
|
||||
y="512.75592"
|
||||
inkscape:label="ground_ref" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#515256;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 216.77826,137.60788 0,-135.9564208"
|
||||
|
@ -6000,6 +5950,64 @@
|
|||
x="680.1095"
|
||||
id="tspan773-9-9"
|
||||
sodipodi:role="line">IM</tspan></text>
|
||||
<text
|
||||
id="ALT_tens"
|
||||
y="317.73038"
|
||||
x="898.703"
|
||||
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"
|
||||
inkscape:label="#text913"
|
||||
transform="scale(0.96366556,1.0377044)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="317.73038"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan919">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="344.55804"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4300">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="371.38571"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan931">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="398.21338"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan927">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="425.04105"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan925">60</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="451.86871"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan923">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="478.69638"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan921">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="505.52405"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan917">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="532.35175"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan915">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83639908px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="559.17938"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4302">60</tspan></text>
|
||||
<g
|
||||
inkscape:label="#g5173"
|
||||
id="ALT_box_flash">
|
||||
|
@ -6022,14 +6030,6 @@
|
|||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
</g>
|
||||
<rect
|
||||
style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.22735;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="ground_ref"
|
||||
width="16.287683"
|
||||
height="2088.8245"
|
||||
x="857.0014"
|
||||
y="512.75592"
|
||||
inkscape:label="ground_ref" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
|
|
Before Width: | Height: | Size: 339 KiB After Width: | Height: | Size: 339 KiB |
|
@ -136,39 +136,11 @@
|
|||
<property>/it-autoflight/internal/alt</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
|
||||
<property>/position/gear-agl-ft</property>
|
||||
</reference>
|
||||
<output>/instrumentation/pfd/alt-diff</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Ground bug diff</name>
|
||||
<type>gain</type>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<property>/position/ground-elev-ft</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
|
||||
</reference>
|
||||
<output>/instrumentation/pfd/ground-diff</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Destination bug diff</name>
|
||||
<type>gain</type>
|
||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<property>/FMGC/internal/ldg-elev</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
|
||||
</reference>
|
||||
<output>/instrumentation/pfd/landing-diff</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Localizer course diff</name>
|
||||
<type>gain</type>
|
||||
|
|
Loading…
Add table
Reference in a new issue