fly/A320-family
1
0
Fork 0
Code Activity

Correct LS warning/position, allow LS waring during GS phase, add ILS indication (non-fuctional currently)

Browse source
This commit is contained in:
hayden2000 2020-02-22 16:57:01 -05:00
parent 49a17647d4
commit 494b4f1bae
2 changed files with 4046 additions and 4028 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Models/Instruments/PFD/PFD.nas
View file

@ -115,6 +115,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_gs = props.globals.getNode("it-autoflight/output/vert/", 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
@ -215,7 +216,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_box_flash", "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", "outerMarker", "middleMarker", "innerMarker", "v1_group", "v1_text", "vr_speed"];
"TRK_pointer","machError","ilsError","ilsError_2","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L","ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed"];
},
updateDu1: func() {
var elapsedtime_act = elapsedtime.getValue();
@ -1010,15 +1011,15 @@ var canvas_PFD_1 = {
me["innerMarker"].hide();
}
if (outer_marker.getValue() == 1 and ilsFlash1.getValue() == 0) {
if (outer_marker.getValue() == 1) {
me["outerMarker"].show();
me["middleMarker"].hide();
me["innerMarker"].hide();
} else if (middle_marker.getValue() == 1 and ilsFlash1.getValue() == 0) {
} else if (middle_marker.getValue()) {
me["middleMarker"].show();
me["outerMarker"].hide();
me["innerMarker"].hide();
} else if (inner_marker.getValue() == 1 and ilsFlash1.getValue() == 0) {
} else if (inner_marker.getValue()) {
me["innerMarker"].show();
me["outerMarker"].hide();
me["middleMarker"].hide();
@ -1028,6 +1029,8 @@ var canvas_PFD_1 = {
me["innerMarker"].hide();
}
me["ilsError_2"].hide();
if (ap_ils_mode.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) {
me["LOC_pointer"].show();
} else {
@ -1039,7 +1042,7 @@ var canvas_PFD_1 = {
me["GS_pointer"].hide();
}
if (ap_ils_mode.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) {
if (ap_ils_mode.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1 or vert_gs.getValue() == 2)) {
if (ils_going1 == 0) {
ils_going1 = 1;
}
@ -1465,15 +1468,15 @@ var canvas_PFD_2 = {
me["innerMarker"].hide();
}
if (outer_marker.getValue() == 1 and ilsFlash2.getValue() == 0) {
if (outer_marker.getValue() == 1) {
me["outerMarker"].show();
me["middleMarker"].hide();
me["innerMarker"].hide();
} else if (middle_marker.getValue() == 1 and ilsFlash2.getValue() == 0) {
} else if (middle_marker.getValue()) {
me["middleMarker"].show();
me["outerMarker"].hide();
me["innerMarker"].hide();
} else if (inner_marker.getValue() == 1 and ilsFlash2.getValue() == 0) {
} else if (inner_marker.getValue()) {
me["innerMarker"].show();
me["outerMarker"].hide();
me["middleMarker"].hide();
@ -1483,6 +1486,8 @@ var canvas_PFD_2 = {
me["innerMarker"].hide();
}
me["ilsError_2"].hide();
if (ap_ils_mode2.getValue() == 1 and loc_in_range.getValue() == 1 and hasloc.getValue() == 1 and nav0_signalq.getValue() > 0.99) {
me["LOC_pointer"].show();
} else {
@ -1494,7 +1499,7 @@ var canvas_PFD_2 = {
me["GS_pointer"].hide();
}
if (ap_ils_mode2.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1)) {
if (ap_ils_mode2.getValue() == 0 and (appr_enabled.getValue() == 1 or loc_enabled.getValue() == 1 or vert_gs.getValue() == 2)) {
if (ils_going2 == 0) {
ils_going2 = 1;
}

8051
Models/Instruments/PFD/res/pfd.svg
View file

File diff suppressed because it is too large Load diff
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 287 KiB

After

Width:  |  Height:  |  Size: 288 KiB