fly/A320-family
1
0
Fork 0
Code Activity

Revert "some logic optiomizing"

Browse source 
This reverts commit b4e59e15b8.
This commit is contained in:
Inuyaksa 2021-06-06 22:25:52 +02:00
parent b4e59e15b8
commit 69a4678e16
3 changed files with 120 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
Models/Instruments/MCDU/MCDU.nas
View file

@ -410,14 +410,9 @@ var canvas_MCDU_base = {
}
}
return irsstatus;
},
onPageUpdate: func(p) {
},
updateCommon: func(i) {
page = pageProp[i].getValue();
var phase = fmgc.FMGCInternal.phase;
if (page != "NOTIFICATION") {
me["NOTIFY"].hide();
me["NOTIFY_FLTNBR"].hide();
@ -2119,7 +2114,7 @@ var canvas_MCDU_base = {
me.colorRightS("wht", "wht", "wht", "wht", "grn", "wht");
me.colorRightArrow("wht", "wht", "wht", "wht", "wht", "wht");
if (phase == 0 or phase == 7) { # only on preflight and done phases
if (fmgc.FMGCInternal.phase == 0 or fmgc.FMGCInternal.phase == 7) { # only on preflight and done phases
me["Simple_L5S"].setText("CHG CODE");
me["Simple_L5S"].show();
me["Simple_L5"].setText("[ ]");
@ -2169,7 +2164,7 @@ var canvas_MCDU_base = {
me["arrow5R"].setColor(getprop("/MCDUC/colors/blu/r"),getprop("/MCDUC/colors/blu/g"),getprop("/MCDUC/colors/blu/b"));
}
if (phase == 0 or phase == 7) {
if (fmgc.FMGCInternal.phase == 0 or fmgc.FMGCInternal.phase == 7) {
me["Simple_L5"].show();
me["Simple_L5S"].show();
} else {
@ -2481,7 +2476,7 @@ var canvas_MCDU_base = {
}
}
if (phase == 7) { # DONE phase
if (fmgc.FMGCInternal.phase == 7) { # DONE phase
if (fmgc.FMGCInternal.arrApt != nil and fmgc.flightPlanController.flightplans[2].departure_runway != nil) {
me["Simple_R1S"].setText(sprintf("DRIFT AT %7s ",fmgc.FMGCInternal.arrApt ~ fmgc.flightPlanController.flightplans[2].departure_runway.id));
}
@ -2833,7 +2828,7 @@ var canvas_MCDU_base = {
}
me["Simple_R6S"].setText("GND TEMP");
if (phase == 0 and !fmgc.FMGCInternal.gndTempSet) {
if (fmgc.FMGCInternal.phase == 0 and !fmgc.FMGCInternal.gndTempSet) {
fmgc.FMGCInternal.gndTemp = 15 - (2 * getprop("/position/gear-agl-ft") / 1000);
me["Simple_R6"].setText(sprintf("%.0fg", fmgc.FMGCInternal.gndTemp));
me["Simple_R6"].setFontSize(small);
@ -3839,25 +3834,25 @@ var canvas_MCDU_base = {
} else if (page == "PROGPREF" or page == "PROGTO" or page == "PROGCLB" or page == "PROGCRZ" or page == "PROGDES" or page == "PROGAPPR" or page == "PROGDONE") {
if (phase == 0) {
if (fmgc.FMGCInternal.phase == 0) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGPREF");
page = "PROGPREF";
} else if (phase == 1) {
} else if (fmgc.FMGCInternal.phase == 1) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGTO");
page = "PROGTO";
} else if (phase == 2) {
} else if (fmgc.FMGCInternal.phase == 2) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGCLB");
page = "PROGCLB";
} else if (phase == 3) {
} else if (fmgc.FMGCInternal.phase == 3) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGCRZ");
page = "PROGCRZ";
} else if (phase == 4) {
} else if (fmgc.FMGCInternal.phase == 4) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGDES");
page = "PROGDES";
} else if (phase == 5 or phase == 6) {
} else if (fmgc.FMGCInternal.phase == 5 or fmgc.FMGCInternal.phase == 6) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGAPPR");
page = "PROGAPPR";
} else if (phase == 7) {
} else if (fmgc.FMGCInternal.phase == 7) {
setprop("/MCDU[" ~ i ~ "]/page", "PROGDONE");
page = "PROGDONE";
}
@ -4136,7 +4131,7 @@ var canvas_MCDU_base = {
me["Simple_L4"].setFontSize(small);
}
if (phase == 0 or phase == 7) {
if (fmgc.FMGCInternal.phase == 0 or fmgc.FMGCInternal.phase == 7) {
me["Simple_L6_Arrow"].show();
me["Simple_L6"].show();
me["Simple_L6S"].show();
@ -4146,7 +4141,7 @@ var canvas_MCDU_base = {
me["Simple_L6S"].hide();
}
if (phase == 1) { # GREEN title and not modifiable on TO phase
if (fmgc.FMGCInternal.phase == 1) { # GREEN title and not modifiable on TO phase
me["Simple_Title"].setColor(GREEN);
me.colorLeft("grn", "grn", "grn", "blu", "grn", "wht");
me.colorRight("grn", "blu", "grn", "grn", "grn", "wht");
@ -4226,7 +4221,7 @@ var canvas_MCDU_base = {
me["Simple_R5"].setFontSize(small);
}
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or phase == 1) {
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or fmgc.FMGCInternal.phase == 1) {
me["Simple_C1"].setText(sprintf("%3.0f", fmgc.FMGCInternal.flap2_to));
me["Simple_C2"].setText(sprintf("%3.0f", fmgc.FMGCInternal.slat_to));
me["Simple_C3"].setText(sprintf("%3.0f", fmgc.FMGCInternal.clean_to));
@ -4285,7 +4280,7 @@ var canvas_MCDU_base = {
pageSwitch[i].setBoolValue(1);
}
if (phase == 2) {
if (fmgc.FMGCInternal.phase == 2) {
me["Simple_Title"].setColor(GREEN);
me.showLeft(0, 0, 0, 0, 1, 0);
me.showLeftS(0, 0, 0, 0, 1, 0);
@ -4315,7 +4310,7 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "amb");
} else if (phase == 5) {
} else if (fmgc.FMGCInternal.phase == 5) {
me["Simple_L6S"].setText("");
me["Simple_L6"].setText("");
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
@ -4439,7 +4434,7 @@ var canvas_MCDU_base = {
pageSwitch[i].setBoolValue(1);
}
if (phase == 3) {
if (fmgc.FMGCInternal.phase == 3) {
me["Simple_Title"].setColor(GREEN);
if (managedSpeed.getValue() == 1) {
@ -4463,7 +4458,7 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "amb");
} else if (phase == 5) {
} else if (fmgc.FMGCInternal.phase == 5) {
me["Simple_L6S"].setText("");
me["Simple_L6"].setText("");
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
@ -4577,7 +4572,7 @@ var canvas_MCDU_base = {
pageSwitch[i].setBoolValue(1);
}
if (phase == 4) {
if (fmgc.FMGCInternal.phase == 4) {
me["Simple_Title"].setColor(GREEN);
me.showLeft(0, 0, 0, 0, 1, 0);
me.showRight(0, 1, 0, 1, 0, 0);
@ -4606,7 +4601,7 @@ var canvas_MCDU_base = {
me.colorLeft("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftS("ack", "ack", "ack", "ack", "ack", "amb");
me.colorLeftArrow("ack", "ack", "ack", "ack", "ack", "amb");
} else if (phase == 5) {
} else if (fmgc.FMGCInternal.phase == 5) {
me["Simple_L6S"].setText("");
me["Simple_L6"].setText("");
me.colorLeft("ack", "ack", "ack", "ack", "ack", "blu");
@ -4734,7 +4729,7 @@ var canvas_MCDU_base = {
pageSwitch[i].setBoolValue(1);
}
if (phase == 5) {
if (fmgc.FMGCInternal.phase == 5) {
me["Simple_Title"].setColor(GREEN);
} else {
me["Simple_Title"].setColor(WHITE);
@ -4842,7 +4837,7 @@ var canvas_MCDU_base = {
me["Simple_R6"].setText("PHASE ");
me["Simple_L5S"].setText(" VAPP");
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or phase == 5) {
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or fmgc.FMGCInternal.phase == 5) {
me["Simple_C1"].setText(sprintf("%3.0f", fmgc.FMGCInternal.flap2_appr));
me["Simple_C2"].setText(sprintf("%3.0f", fmgc.FMGCInternal.slat_appr));
me["Simple_C3"].setText(sprintf("%3.0f", fmgc.FMGCInternal.clean_appr));
@ -4918,7 +4913,7 @@ var canvas_MCDU_base = {
pageSwitch[i].setBoolValue(1);
}
if (phase == 6) {
if (fmgc.FMGCInternal.phase == 6) {
me["Simple_Title"].setColor(GREEN);
} else {
me["Simple_Title"].setColor(WHITE);
@ -4942,7 +4937,7 @@ var canvas_MCDU_base = {
me["Simple_R5"].setText(sprintf("%3.0f", engOutAcc.getValue()));
me["Simple_R5S"].setText("ENG OUT ACC");
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or phase == 6) {
if ((fmgc.FMGCInternal.zfwSet and fmgc.FMGCInternal.blockSet) or fmgc.FMGCInternal.phase == 6) {
me["Simple_C1"].setText(sprintf("%3.0f", fmgc.FMGCInternal.flap2_appr));
me["Simple_C2"].setText(sprintf("%3.0f", fmgc.FMGCInternal.slat_appr));
me["Simple_C3"].setText(sprintf("%3.0f", fmgc.FMGCInternal.clean_appr));
@ -6597,32 +6592,13 @@ setlistener("/sim/signals/fdm-initialized", func {
mcdu.mcdu_message(0, "SELECT DESIRED SYSTEM");
mcdu.mcdu_message(1, "SELECT DESIRED SYSTEM");
#setlistener("/MCDU[0]/page", func(v) {
# pageSwitch[0].setBoolValue(0);
# MCDU_1.onPageChanged(0);
#}, 1, 0);
#setlistener("/MCDU[1]/page", func(v) {
# pageSwitch[1].setBoolValue(0);
# MCDU_2.onPageChanged(1);
#}, 1, 0);
MCDU_update.start();
});
var MCDU_update = maketimer(0.125, func {
canvas_MCDU_base.update();
});
var MCDU1_update = maketimer(0.125, func {
MCDU1.update();
});
var MCDU2_update = maketimer(0.125, func {
MCDU2.update();
});
var showMCDU1 = func {
gui.showDialog("mcdu1");
@ -6632,3 +6608,10 @@ var showMCDU2 = func {
gui.showDialog("mcdu2");
}
setlistener("/MCDU[0]/page", func {
pageSwitch[0].setBoolValue(0);
}, 0, 0);
setlistener("/MCDU[1]/page", func {
pageSwitch[1].setBoolValue(0);
}, 0, 0);

248
Nasal/FMGC/FMGC.nas
View file

@ -84,7 +84,6 @@ var FMGCinit = func {
FMGCInternal.minspeed = 0;
FMGCInternal.maxspeed = 338;
FMGCInternal.phase = 0; # 0 is Preflight 1 is Takeoff 2 is Climb 3 is Cruise 4 is Descent 5 is Decel/Approach 6 is Go Around 7 is Done
FMGCNodes.phase.setValue(0);
FMGCInternal.mngSpd = 157;
FMGCInternal.mngSpdCmd = 157;
FMGCInternal.mngKtsMach = 0;
@ -258,7 +257,6 @@ var FMGCNodes = {
toState: props.globals.initNode("/FMGC/internal/to-state", 0, "BOOL"),
v1: props.globals.initNode("/FMGC/internal/v1", 0, "DOUBLE"),
v1set: props.globals.initNode("/FMGC/internal/v1-set", 0, "BOOL"),
phase: props.globals.initNode("/FMGC/internal/phase", 0, "INT"),
};
############
@ -603,15 +601,92 @@ var radios = maketimer(1, func() {
adf1();
});
var fuelUpdateFMGC = maketime(0.5, func {
var masterFMGC = maketimer(0.2, func {
n1_left = pts.Engines.Engine.n1Actual[0].getValue();
n1_right = pts.Engines.Engine.n1Actual[1].getValue();
modelat = Modes.PFD.FMA.rollMode.getValue();
mode = Modes.PFD.FMA.pitchMode.getValue();
gs = pts.Velocities.groundspeed.getValue();
alt = pts.Instrumentation.Altimeter.indicatedFt.getValue();
# cruiseft = FMGCInternal.crzFt;
# cruiseft_b = FMGCInternal.crzFt - 200;
state1 = pts.Systems.Thrust.state[0].getValue();
state2 = pts.Systems.Thrust.state[1].getValue();
accel_agl_ft = Setting.reducAglFt.getValue();
gear0 = pts.Gear.wow[0].getBoolValue();
altSel = Input.alt.getValue();
if ((n1_left < 85 or n1_right < 85) and gs < 90 and mode == " " and gear0 and FMGCInternal.phase == 1) { # rejected takeoff
FMGCInternal.phase = 0;
systems.PNEU.pressMode.setValue("GN");
}
if (gear0 and FMGCInternal.phase == 0 and ((n1_left >= 85 and n1_right >= 85 and mode == "SRS") or gs >= 90)) {
FMGCInternal.phase = 1;
systems.PNEU.pressMode.setValue("TO");
}
if (FMGCInternal.phase == 1 and ((mode != "SRS" and mode != " ") or alt >= accel_agl_ft)) {
FMGCInternal.phase = 2;
systems.PNEU.pressMode.setValue("TO");
}
if (FMGCInternal.phase == 2 and (mode == "ALT CRZ" or mode == "ALT CRZ*")) {
FMGCInternal.phase = 3;
systems.PNEU.pressMode.setValue("CR");
}
if (FMGCInternal.crzFl >= 200) {
if (FMGCInternal.phase == 3 and (flightPlanController.arrivalDist <= 200 or altSel < 20000)) {
FMGCInternal.phase = 4;
systems.PNEU.pressMode.setValue("DE");
}
} else {
if (FMGCInternal.phase == 3 and (flightPlanController.arrivalDist <= 200 or altSel < (FMGCInternal.crzFl * 100))) { # todo - not sure about crzFl condition, investigate what happens!
FMGCInternal.phase = 4;
systems.PNEU.pressMode.setValue("DE");
}
}
if (FMGCInternal.phase == 4) {
if (getprop("/FMGC/internal/decel")) {
FMGCInternal.phase = 5;
}
else if (altSel == (FMGCInternal.crzFl * 100)) { # back to CRZ state
FMGCInternal.phase = 3;
systems.PNEU.pressMode.setValue("CR");
}
}
if (flightPlanController.num[2].getValue() > 0 and getprop("/FMGC/flightplan[2]/active") == 1 and flightPlanController.arrivalDist <= 15 and (modelat == "NAV" or modelat == "LOC" or modelat == "LOC*") and pts.Position.gearAglFt.getValue() < 9500) { #todo decel pseudo waypoint
setprop("/FMGC/internal/decel", 1);
} else if (getprop("/FMGC/internal/decel") == 1 and (FMGCInternal.phase == 0 or FMGCInternal.phase == 6)) {
setprop("/FMGC/internal/decel", 0);
}
if ((FMGCInternal.phase == 5) and state1 == "TOGA" and state2 == "TOGA") {
FMGCInternal.phase = 6;
systems.PNEU.pressMode.setValue("TO");
Input.toga.setValue(1);
}
if (FMGCInternal.phase == 6 and alt >= accel_agl_ft) { # todo when insert altn or new dest
FMGCInternal.phase = 2;
}
if (getprop("/systems/navigation/adr/computation/overspeed-vfe-spd") != 1024) {
FMGCInternal.maxspeed = getprop("/systems/navigation/adr/computation/overspeed-vfe-spd") - 4;
} elsif (pts.Gear.position[0].getValue() != 0 or pts.Gear.position[1].getValue() != 0 or pts.Gear.position[2].getValue() != 0) {
FMGCInternal.maxspeed = 284;
} else {
FMGCInternal.maxspeed = fmgc.FMGCInternal.vmo_mmo;
}
############################
# fuel
############################
updateFuel();
});
var windUpdateFMGC = maketime(1, func {
############################
# wind
############################
@ -655,141 +730,6 @@ var windUpdateFMGC = maketime(1, func {
fmgc.windController.write();
}
}
});
var prop_n1_left = pts.Engines.Engine.n1Actual[0];
var prop_n1_right = pts.Engines.Engine.n1Actual[1];
var prop_nmodelat = Modes.PFD.FMA.rollMode;
var prop_mode = Modes.PFD.FMA.pitchMode;
var prop_gs = pts.Velocities.groundspeed;
var prop_alt = pts.Instrumentation.Altimeter.indicatedFt;
var prop_state1 = pts.Systems.Thrust.state[0];
var prop_state2 = pts.Systems.Thrust.state[1];
var prop_accel_agl_ft = Setting.reducAglFt;
var prop_gear0 = pts.Gear.wow[0];
var prop_altSel = Input.alt;
var masterFMGC = maketimer(0.2, func {
n1_left = prop_n1_left.getValue();
n1_right = prop_n1_right.getValue();
modelat = prop_nmodelat.getValue();
mode = prop_mode.getValue();
gs = prop_gs.getValue();
alt = prop_alt.getValue();
# cruiseft = FMGCInternal.crzFt;
# cruiseft_b = FMGCInternal.crzFt - 200;
state1 = prop_state1.getValue();
state2 = prop_state2.getValue();
accel_agl_ft = prop_accel_agl_ft.getValue();
gear0 = prop_gear0.getBoolValue();
altSel = prop_altSel.getValue();
var phase = FMGCInternal.phase;
var newphase = phase;
if (phase == 0) {
if (gear0 and ((n1_left >= 85 and n1_right >= 85 and mode == "SRS") or gs >= 90)) {
newphase = 1;
systems.PNEU.pressMode.setValue("TO");
}
}
else if (phase == 1) {
if (gear0) {
if ((n1_left < 85 or n1_right < 85) and gs < 90 and mode == " ") { # rejected takeoff
newphase = 0;
systems.PNEU.pressMode.setValue("GN");
}
}
else if (((mode != "SRS" and mode != " ") or alt >= accel_agl_ft)) {
newphase = 2;
systems.PNEU.pressMode.setValue("TO");
}
}
else if (phase == 2) {
if ((mode == "ALT CRZ" or mode == "ALT CRZ*")) {
newphase = 3;
systems.PNEU.pressMode.setValue("CR");
}
}
else if (phase == 3) {
if (FMGCInternal.crzFl >= 200) {
if ((flightPlanController.arrivalDist <= 200 or altSel < 20000)) {
newphase = 4;
systems.PNEU.pressMode.setValue("DE");
}
} else {
if ((flightPlanController.arrivalDist <= 200 or altSel < (FMGCInternal.crzFl * 100))) { # todo - not sure about crzFl condition, investigate what happens!
newphase = 4;
systems.PNEU.pressMode.setValue("DE");
}
}
}
else if (phase == 4) {
if (getprop("/FMGC/internal/decel")) {
newphase = 5;
}
else if (altSel == (FMGCInternal.crzFl * 100)) { # back to CRZ state
newphase = 3;
systems.PNEU.pressMode.setValue("CR");
}
}
else if (phase == 5) {
if (state1 == "TOGA" and state2 == "TOGA") {
newphase = 6;
systems.PNEU.pressMode.setValue("TO");
Input.toga.setValue(1);
}
}
else if (phase == 6) {
if (alt >= accel_agl_ft) { # todo when insert altn or new dest
newphase = 2;
}
}
if (flightPlanController.num[2].getValue() > 0 and getprop("/FMGC/flightplan[2]/active") == 1 and
flightPlanController.arrivalDist <= 15 and (modelat == "NAV" or modelat == "LOC" or modelat == "LOC*") and pts.Position.gearAglFt.getValue() < 9500) { #todo decel pseudo waypoint
setprop("/FMGC/internal/decel", 1);
} else if (getprop("/FMGC/internal/decel") == 1 and (phase == 0 or phase == 6)) {
setprop("/FMGC/internal/decel", 0);
}
if (getprop("/systems/navigation/adr/computation/overspeed-vfe-spd") != 1024) {
FMGCInternal.maxspeed = getprop("/systems/navigation/adr/computation/overspeed-vfe-spd") - 4;
} elsif (pts.Gear.position[0].getValue() != 0 or pts.Gear.position[1].getValue() != 0 or pts.Gear.position[2].getValue() != 0) {
FMGCInternal.maxspeed = 284;
} else {
FMGCInternal.maxspeed = fmgc.FMGCInternal.vmo_mmo;
}
if (newphase != phase) { # phase changed
FMGCInternal.phase = newphase;
FMGCNodes.phase.setValue(newphase);
}
############################
# calculate speeds
@ -831,7 +771,7 @@ var masterFMGC = maketimer(0.2, func {
}
# predicted takeoff speeds
if (phase == 1) {
if (FMGCInternal.phase == 1) {
FMGCInternal.clean_to = FMGCInternal.clean;
FMGCInternal.vs1g_clean_to = FMGCInternal.vs1g_clean;
FMGCInternal.vs1g_conf_2_to = FMGCInternal.vs1g_conf_2;
@ -853,7 +793,7 @@ var masterFMGC = maketimer(0.2, func {
}
# predicted approach (temp go-around) speeds
if (phase == 5 or phase == 6) {
if (FMGCInternal.phase == 5 or FMGCInternal.phase == 6) {
FMGCInternal.clean_appr = FMGCInternal.clean;
FMGCInternal.vs1g_clean_appr = FMGCInternal.vs1g_clean;
FMGCInternal.vs1g_conf_2_appr = FMGCInternal.vs1g_conf_2;
@ -974,8 +914,7 @@ var masterFMGC = maketimer(0.2, func {
}
}
#if (gear0 and pts.Controls.Flight.flapsPos.getValue() < 5 and (state1 == "MCT" or state1 == "MAN THR" or state1 == "TOGA") and (state2 == "MCT" or state2 == "MAN THR" or state2 == "TOGA")) {
if (gear0 and flaps < 5 and (state1 == "MCT" or state1 == "MAN THR" or state1 == "TOGA") and (state2 == "MCT" or state2 == "MAN THR" or state2 == "TOGA")) {
if (gear0 and pts.Controls.Flight.flapsPos.getValue() < 5 and (state1 == "MCT" or state1 == "MAN THR" or state1 == "TOGA") and (state2 == "MCT" or state2 == "MAN THR" or state2 == "TOGA")) {
if (!FMGCInternal.takeoffState) {
fmgc.FMGCNodes.toState.setValue(1);
}
@ -991,15 +930,9 @@ var masterFMGC = maketimer(0.2, func {
#handle radios, runways, v1/vr/v2
############################
});
var updateAirportRadios = func {
var phase = FMGCInternal.phase;
departure_rwy = fmgc.flightPlanController.flightplans[2].departure_runway;
destination_rwy = fmgc.flightPlanController.flightplans[2].destination_runway;
if (destination_rwy != nil and phase >= 2) {
if (destination_rwy != nil and FMGCInternal.phase >= 2) {
var airport = airportinfo(FMGCInternal.arrApt);
setprop("/FMGC/internal/ldg-elev", airport.elevation * M2FT); # eventually should be runway elevation
magnetic_hdg = geo.normdeg(destination_rwy.heading - getprop("/environment/magnetic-variation-deg"));
@ -1014,7 +947,7 @@ var updateAirportRadios = func {
} else if (!getprop("/FMGC/internal/ils1crs-set")) {
setprop("instrumentation/nav[0]/radials/selected-deg", magnetic_hdg);
}
} else if (departure_rwy != nil and phase <= 1) {
} else if (departure_rwy != nil and FMGCInternal.phase <= 1) {
magnetic_hdg = geo.normdeg(departure_rwy.heading - getprop("/environment/magnetic-variation-deg"));
runway_ils = departure_rwy.ils_frequency_mhz;
if (runway_ils != nil and !getprop("/FMGC/internal/ils1freq-set") and !getprop("/FMGC/internal/ils1crs-set")) {
@ -1028,15 +961,10 @@ var updateAirportRadios = func {
setprop("instrumentation/nav[0]/radials/selected-deg", magnetic_hdg);
}
}
};
setlistener(FMGCNodes.phase, updateAirportRadios);
setlistener(flightPlanController.changed, updateAirportRadios);
});
var reset_FMGC = func {
FMGCInternal.phase = 0;
FMGCNodes.phase.serValue(0);
fd1 = Input.fd1.getValue();
fd2 = Input.fd2.getValue();
spd = Input.kts.getValue();

5
Nasal/FMGC/flightplan.nas
View file

@ -32,8 +32,6 @@ var flightPlanController = {
# These flags are only for the main flgiht-plan
active: props.globals.initNode("/FMGC/flightplan[2]/active", 0, "BOOL"),
changed: props.globals.initNode("/FMGC/flightplan[2]/changed", 0, "BOOL"),
currentToWpt: nil, # container for the current TO waypoint ghost
currentToWptIndex: props.globals.initNode("/FMGC/flightplan[2]/current-wp", 0, "INT"),
@ -767,9 +765,6 @@ var flightPlanController = {
fmgc.FMGCInternal.fuelCalculating = 1;
fmgc.fuelCalculating.setValue(1);
}
if (n == 2) flightPlanController.changed.setBoolValue(1);
canvas_nd.A3XXRouteDriver.triggerSignal("fp-added");
},