Merge branch 'master' into MCDU
This commit is contained in:
Joshua Davidson
commit
def59d1cdb
4 changed files with 110 additions and 109 deletions
|
|
@ -16,6 +16,7 @@ var ASI = 0;
|
|||
var ASItrgt = 0;
|
||||
var ASItrgtdiff = 0;
|
||||
var ASImax = 0;
|
||||
var ASItrend = 0;
|
||||
var altTens = 0;
|
||||
var state1 = getprop("/systems/thrust/state1");
|
||||
var state2 = getprop("/systems/thrust/state2");
|
||||
|
|
@ -38,7 +39,6 @@ var wow1 = getprop("/gear/gear[1]/wow");
|
|||
var wow2 = getprop("/gear/gear[2]/wow");
|
||||
var pitch = 0;
|
||||
var roll = 0;
|
||||
var spdTrend_c = 0;
|
||||
setprop("/instrumentation/pfd/vs-needle", 0);
|
||||
setprop("/instrumentation/pfd/vs-digit-trans", 0);
|
||||
setprop("/it-autoflight/input/spd-managed", 0);
|
||||
|
|
@ -56,6 +56,7 @@ setprop("/instrumentation/pfd/hdg-diff", 0);
|
|||
setprop("/instrumentation/pfd/heading-scale", 0);
|
||||
setprop("/instrumentation/pfd/track-deg", 0);
|
||||
setprop("/instrumentation/pfd/track-hdg-diff", 0);
|
||||
setprop("/instrumentation/pfd/speed-lookahead", 0);
|
||||
setprop("/instrumentation/du/du1-test", 0);
|
||||
setprop("/instrumentation/du/du1-test-time", 0);
|
||||
setprop("/instrumentation/du/du6-test", 0);
|
||||
|
|
@ -72,6 +73,7 @@ setprop("/instrumentation/adirs/ir[1]/aligned", 0);
|
|||
setprop("/instrumentation/adirs/ir[2]/aligned", 0);
|
||||
setprop("/controls/switching/ATTHDG", 0);
|
||||
setprop("/controls/switching/AIRDATA", 0);
|
||||
setprop("/testing", 0);
|
||||
|
||||
var canvas_PFD_base = {
|
||||
init: func(canvas_group, file) {
|
||||
|
|
@ -124,10 +126,10 @@ var canvas_PFD_base = {
|
|||
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_max","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"];
|
||||
"FMA_Middle1","FMA_Middle2","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center",
|
||||
"AI_bank","AI_bank_lim","AI_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() {
|
||||
elapsedtime = getprop("/sim/time/elapsed-sec");
|
||||
|
|
@ -564,7 +566,20 @@ var canvas_PFD_base = {
|
|||
me["ASI_target"].hide();
|
||||
}
|
||||
|
||||
me["ASI_ten_sec"].hide();
|
||||
ASItrend = getprop("/instrumentation/pfd/speed-lookahead") - ASI;
|
||||
me["ASI_trend_up"].setTranslation(0, math.clamp(ASItrend, 0, 50) * -6.6);
|
||||
me["ASI_trend_down"].setTranslation(0, math.clamp(ASItrend, -50, 0) * -6.6);
|
||||
|
||||
if (ASItrend >= 2) {
|
||||
me["ASI_trend_up"].show();
|
||||
me["ASI_trend_down"].hide();
|
||||
} else if (ASItrend <= -2) {
|
||||
me["ASI_trend_down"].show();
|
||||
me["ASI_trend_up"].hide();
|
||||
} else {
|
||||
me["ASI_trend_up"].hide();
|
||||
me["ASI_trend_down"].hide();
|
||||
}
|
||||
|
||||
# Attitude Indicator
|
||||
pitch = getprop("/orientation/pitch-deg") or 0;
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@
|
|||
inkscape:window-height="1030"
|
||||
id="namedview371"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.8284273"
|
||||
inkscape:cx="324.67088"
|
||||
inkscape:cy="851.22941"
|
||||
inkscape:zoom="0.5"
|
||||
inkscape:cx="299.82204"
|
||||
inkscape:cy="530.33915"
|
||||
inkscape:window-x="1592"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
|
|
@ -1696,6 +1696,14 @@
|
|||
width="117.6912"
|
||||
id="ASI_scale_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" />
|
||||
<rect
|
||||
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="ASI_trend_up_clip"
|
||||
width="117.6912"
|
||||
height="275.79279"
|
||||
x="8.3655996"
|
||||
y="237.0336"
|
||||
inkscape:label="#rect9211" />
|
||||
<path
|
||||
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"
|
||||
d="m 975.91454,177.03888 47.58966,0 c -0.052,113.09539 0.026,226.19024 0,339.28612 -0.026,110.77565 -0.158,221.55229 0,332.33137 l -47.58966,0 z"
|
||||
|
|
@ -3218,6 +3226,14 @@
|
|||
y="895.61029"
|
||||
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:end;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000</tspan></text>
|
||||
</g>
|
||||
<rect
|
||||
inkscape:label="#rect9211"
|
||||
y="512.82642"
|
||||
x="8.3655996"
|
||||
height="275.79279"
|
||||
width="117.6912"
|
||||
id="ASI_trend_down_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" />
|
||||
<g
|
||||
id="ASI_group"
|
||||
inkscape:label="#g4784">
|
||||
|
|
@ -4458,27 +4474,50 @@
|
|||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
</g>
|
||||
<g
|
||||
style="stroke:#c9d121;stroke-opacity:1"
|
||||
transform="matrix(1,0,0,-1,0.90463468,1027.5828)"
|
||||
inkscape:label="#g4646"
|
||||
id="ASI_ten_sec">
|
||||
id="ASI_trend_up"
|
||||
inkscape:label="#g4874">
|
||||
<path
|
||||
inkscape:label="#path4632"
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4632"
|
||||
d="m 101.56619,514.15641 0,66.47209"
|
||||
d="m 102.47083,892.24236 0,-377.61127"
|
||||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;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:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 90.2872,560.82534 11.2792,20.70316"
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4642"
|
||||
d="M 91.191843,534.39032 102.47104,513.68716"
|
||||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;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:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 113.75024,534.39032 -11.2792,-20.70316"
|
||||
id="path4644"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:label="#g4874"
|
||||
id="ASI_trend_down"
|
||||
transform="matrix(1,0,0,-1,0,1025.6524)">
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 102.47083,892.24236 0,-377.61127"
|
||||
id="path4886"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:label="#path4632" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="M 91.191843,534.39032 102.47104,513.68716"
|
||||
id="path4888"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4644"
|
||||
d="M 112.8456,560.82534 101.5664,581.5285"
|
||||
id="path4890"
|
||||
d="m 113.75024,534.39032 -11.2792,-20.70316"
|
||||
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
</g>
|
||||
<text
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 266 KiB After Width: | Height: | Size: 267 KiB |
127
Systems/pfd.xml
127
Systems/pfd.xml
|
|
@ -7,7 +7,7 @@
|
|||
-->
|
||||
|
||||
<PropertyList>
|
||||
|
||||
|
||||
<filter>
|
||||
<name>Ground level diff</name>
|
||||
<type>gain</type>
|
||||
|
|
@ -171,94 +171,41 @@
|
|||
</period>
|
||||
</filter>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- PFD display preprocessors -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<filter>
|
||||
<name>Stall speed margin computer</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<property>/instrumentation/weu/state/stall-speed</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/velocities/airspeed-kt</property>
|
||||
<offset>85</offset>
|
||||
</reference>
|
||||
<output>/instrumentation/pfd/stallspeed-diff</output>
|
||||
<min>-205</min>
|
||||
<max>10</max>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Over speed margin computer</name>
|
||||
<type>gain</type>
|
||||
<gain>-1.0</gain>
|
||||
<input>
|
||||
<property>/instrumentation/afds/max-airspeed-kts</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/velocities/airspeed-kt</property>
|
||||
<offset>-95</offset>
|
||||
</reference>
|
||||
<output>/instrumentation/pfd/overspeed-diff</output>
|
||||
<min>-200</min>
|
||||
<max>-10</max>
|
||||
</filter>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- speed trend vector processing -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<predict-simple>
|
||||
<name>speed predictor (smoothed)</name>
|
||||
<debug>false</debug>
|
||||
<input>/velocities/airspeed-kt</input>
|
||||
<output>/instrumentation/pfd/speed-lookahead</output>
|
||||
<seconds>10.0</seconds>
|
||||
<filter-gain>0.01</filter-gain>
|
||||
</predict-simple>
|
||||
|
||||
<filter>
|
||||
<name>PFD preprocessor (spd trend up)</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<input>
|
||||
<property>/instrumentation/pfd/speed-lookahead</property>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/velocities/airspeed-kt</property>
|
||||
<offset>90</offset>
|
||||
</reference>
|
||||
<gain>-0.002667</gain>
|
||||
<output>/instrumentation/pfd/speed-trend-up</output>
|
||||
<max>0.24</max>
|
||||
<min>0</min>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>PFD preprocessor (spd trend down)</name>
|
||||
<debug>false</debug>
|
||||
<type>gain</type>
|
||||
<input>
|
||||
<property>/instrumentation/pfd/speed-lookahead</property>
|
||||
<min>0</min>
|
||||
</input>
|
||||
<reference>
|
||||
<property>/velocities/airspeed-kt</property>
|
||||
<offset>-90</offset>
|
||||
</reference>
|
||||
<gain>-0.002667</gain>
|
||||
<output>/instrumentation/pfd/speed-trend-down</output>
|
||||
<min>-0.24</min>
|
||||
<max>0</max>
|
||||
</filter>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Other stuff -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<filter>
|
||||
<name>Speed Predictor Input</name>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
<input>
|
||||
<expression>
|
||||
<difference>
|
||||
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
|
||||
<value>30</value>
|
||||
</difference>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/instrumentation/pfd/speed-minus-30</output>
|
||||
<min>0</min>
|
||||
<max>390</max>
|
||||
</filter>
|
||||
|
||||
<predict-simple>
|
||||
<name>Speed Predictor (Smoothed)</name>
|
||||
<debug>false</debug>
|
||||
<input>/instrumentation/pfd/speed-minus-30</input>
|
||||
<output>/instrumentation/pfd/speed-lookahead-cmd</output>
|
||||
<seconds>10.0</seconds>
|
||||
<filter-gain>0.01</filter-gain>
|
||||
</predict-simple>
|
||||
|
||||
<filter>
|
||||
<name>Speed Predictor Exponential</name>
|
||||
<debug>false</debug>
|
||||
<type>exponential</type>
|
||||
<input>/instrumentation/pfd/speed-lookahead-cmd</input>
|
||||
<output>/instrumentation/pfd/speed-lookahead</output>
|
||||
<filter-time>0.32</filter-time>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>Ground Horizon</name>
|
||||
<type>gain</type>
|
||||
|
|
@ -394,5 +341,5 @@
|
|||
</input>
|
||||
<output>/instrumentation/pfd/vs-digit-trans</output>
|
||||
</filter>
|
||||
|
||||
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4212
|
||||
4213
|
||||
Reference in a new issue