fly/A320-family
1
0
Fork 0
Code Activity

Minor refactor of FPV code - remove unused variables.

Browse source
This commit is contained in:
sgilchrist123 2020-09-18 18:02:09 +10:00
parent b91ebcbb54
commit cfea513ace
1 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ var elapsedtime = 0;
var altTens = 0;
var altPolarity = "";
var track_diff = 0;
var AICenter = nil; # FPV
var AICenter = nil;
# Fetch nodes:
var state1 = props.globals.getNode("/systems/thrust/state1", 1);
@ -138,7 +138,6 @@ var adr_1_fault = props.globals.getNode("/controls/navigation/adirscp/lights/adr
var adr_2_fault = props.globals.getNode("/controls/navigation/adirscp/lights/adr-2-fault", 1);
var adr_3_fault = props.globals.getNode("/controls/navigation/adirscp/lights/adr-3-fault", 1);
var air_data_switch = props.globals.getNode("/controls/navigation/switching/air-data", 1);
var alpha = props.globals.getNode("/fdm/jsbsim/aero/alpha-deg", 1); # TODO - Is this used anywhere?
# Create Nodes:
var alt_diff = props.globals.initNode("/instrumentation/pfd/alt-diff", 0.0, "DOUBLE");
@ -150,7 +149,7 @@ var horizon_ground = props.globals.initNode("/instrumentation/pfd/horizon-ground
var hdg_diff = props.globals.initNode("/instrumentation/pfd/hdg-diff", 0.0, "DOUBLE");
var hdg_scale = props.globals.initNode("/instrumentation/pfd/heading-scale", 0.0, "DOUBLE");
var track = props.globals.initNode("/instrumentation/pfd/track-deg", 0.0, "DOUBLE");
#var track_diff = props.globals.initNode("/instrumentation/pfd/track-hdg-diff", 0.0, "DOUBLE"); # returns incorrect value and can calculate on the fly
#var track_diff = props.globals.initNode("/instrumentation/pfd/track-hdg-diff", 0.0, "DOUBLE"); # returns incorrect value
var du1_test = props.globals.initNode("/instrumentation/du/du1-test", 0, "BOOL");
var du1_test_time = props.globals.initNode("/instrumentation/du/du1-test-time", 0.0, "DOUBLE");
var du1_offtime = props.globals.initNode("/instrumentation/du/du1-off-time", 0.0, "DOUBLE");
@ -1028,7 +1027,7 @@ var canvas_PFD_base = {
me["AI_heading"].update();
},
# Dim the yellow outline of fixed aircraft symbol on PFDs (eg when crew select TRK)
# Dim the yellow outline of fixed aircraft symbol on PFDs (when crew select TRK-FPA)
# 1 == dim
# 0 == undim
dimFixedAircraftOutline: func(dim_bool) {
@ -1136,8 +1135,7 @@ var canvas_PFD_1 = {
me["FD_pitch"].hide();
}
# FPV
# If TRK FPA selected on the FCU, display FPV on PFD1
# If TRK FPA selected, display FPV on PFD1
if (ap_trk_sw.getValue() == 0 ) {
me["FPV"].hide();
me.dimFixedAircraftOutline(0);
@ -1148,24 +1146,10 @@ var canvas_PFD_1 = {
me.dimFixedAircraftOutline(0);
} else {
var roll_deg = roll.getValue() or 0;
var alpha_deg = aoa;
var fpa_deg = pitch.getValue() - alpha_deg;
AICenter = me["AI_center"].getCenter();
var track_x_translation = me.getTrackDiffPixels(track_diff);
# Display FPV in red if FPA greater or less plus or minus 9.9 degrees
# if (fpa_deg > 9.9) {
# alpha_deg = alpha_deg + (fpa_deg - 9.9);
# me["FPV"].setColor(1, 0, 0);
# } else if (fpa_deg < -9.9) {
# alpha_deg = alpha_deg + (fpa_deg + 9.9);
# me["FPV"].setColor(1, 0, 0);
# } else {
# me["FPV"].setColor(0.066666667, 0.752941176, 0.294117647);
# }
me.AI_fpv_trans.setTranslation(track_x_translation, math.clamp(alpha_deg, -20, 20) * 12.5);
me.AI_fpv_trans.setTranslation(track_x_translation, math.clamp(aoa, -20, 20) * 12.5);
me.AI_fpv_rot.setRotation(-roll_deg * D2R, AICenter);
me["FPV"].setRotation(roll_deg * D2R); # It shouldn't be rotated, only the axis should be
me["FPV"].show();
@ -1912,8 +1896,7 @@ var canvas_PFD_2 = {
me["FD_pitch"].hide();
}
# FPV
# If TRK FPA selected on the FCU, display FPV on PFD2
# If TRK FPA selected, display FPV on PFD2
if (ap_trk_sw.getValue() == 0 ) {
me["FPV"].hide();
me.dimFixedAircraftOutline(0);
@ -1923,25 +1906,11 @@ var canvas_PFD_2 = {
me["FPV"].hide();
me.dimFixedAircraftOutline(0);
} else {
var roll_deg = roll.getValue() or 0;
var alpha_deg = aoa;
var fpa_deg = pitch.getValue() - alpha_deg;
var roll_deg = roll.getValue() or 0;
AICenter = me["AI_center"].getCenter();
var track_x_translation = me.getTrackDiffPixels(track_diff);
# Display FPV in red if FPA greater or less plus or minus 9.9 degrees
# if (fpa_deg > 9.9) {
# alpha_deg = alpha_deg + (fpa_deg - 9.9);
# me["FPV"].setColor(1, 0, 0);
# } else if (fpa_deg < -9.9) {
# alpha_deg = alpha_deg + (fpa_deg + 9.9);
# me["FPV"].setColor(1, 0, 0);
# } else {
# me["FPV"].setColor(0.066666667, 0.752941176, 0.294117647);
# }
me.AI_fpv_trans.setTranslation(track_x_translation, math.clamp(alpha_deg, -20, 20) * 12.5);
me.AI_fpv_trans.setTranslation(track_x_translation, math.clamp(aoa, -20, 20) * 12.5);
me.AI_fpv_rot.setRotation(-roll_deg * D2R, AICenter);
me["FPV"].setRotation(roll_deg * D2R); # It shouldn't be rotated, only the axis should be
me["FPV"].show();