fly/A320-family
1
0
Fork 0
Code Activity

The flightplan should return to the great circle path - set flag to true

Browse source 
Change the decel code so that it only works for active flightplan.
This commit is contained in:
Jonathan Redpath 2022-01-17 14:44:39 +00:00
parent 9befc5ce02
commit 40a8e85d0b
3 changed files with 34 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
A320-main.xml
View file

@ -590,6 +590,9 @@
<surveillance type="string">S</surveillance>
</icao>
<performance>
<!-- explicitly force the category to be 'E' instead of using tag heuristics
Although the A320 is a category 'C' aircraft, category 'E's profile fits better -->
<icao-category type="string">E</icao-category>
<minimum>
<takeoff-length-ft type="int">4500</takeoff-length-ft>
<landing-length-ft type="int">4500</landing-length-ft>

29
Nasal/FMGC/flightplan-delegates.nas
View file

@ -41,29 +41,24 @@ var A320GPSDeleagte = {
# tell the GPS C++ code we will do sequencing ourselves, so it can disable
# its legacy logic for this
setprop(GPSPath ~ '/config/delegate-sequencing', 1);
# enable 2020.2 C++ turn anticipation
setprop(GPSPath ~ '/config/enable-fly-by', 0);
# Set maximum lateral deviation for sequencing to 5 miles
# flyOver maximum distance
setprop(GPSPath ~ '/config/over-flight-arm-distance', 5);
# make FlightPlan behaviour match GPS config state
fp.followLegTrackToFix = getprop(GPSPath ~ '/config/follow-leg-track-to-fix') or 0;
# similarly, make FlightPlan follow the performance category settings
fp.aircraftCategory = getprop('/autopilot/settings/icao-aircraft-category') or 'A';
fp.followLegTrackToFix = 1;
fp.aircraftCategory = 'C';
m._modeProp = props.globals.getNode(GPSPath ~ '/mode');
return m;
},
_landingCheckTimeout: func
{
var wow = getprop('gear/gear[0]/wow');
var gs = getprop('velocities/groundspeed-kt');
if (wow and (gs < 25)) {
if (pts.Gear.wow[0].getValue() and pts.Velocities.groundspeed.getValue() < 25) {
logprint(LOG_INFO, 'GPS saw speed < 25kts on destination runway, end of route.');
me.landingCheck.stop();
# record touch-down time?
@ -73,8 +68,7 @@ var A320GPSDeleagte = {
_captureCurrentCourse: func
{
var crs = getprop(GPSPath ~ "/desired-course-deg");
setprop(GPSPath ~ "/selected-course-deg", crs);
setprop(GPSPath ~ "/selected-course-deg", getprop(GPSPath ~ "/desired-course-deg"));
},
_selectOBSMode: func
@ -154,17 +148,13 @@ var A320GPSDeleagte = {
} else if (mode == 'leg') {
# standard leq sequencing
var nextIndex = me.flightplan.current + 1;
if (nextIndex < me.flightplan.numWaypoints() and me.flightplan.nextWP().id == '(DECEL)') {
nextIndex += 1;
logprint(LOG_INFO, "default GPS reached DECEL, going to next waypoint");
}
if (nextIndex >= me.flightplan.numWaypoints()) {
logprint(LOG_INFO, "default GPS sequencing, finishing flightplan");
me.flightplan.finish();
} elsif (me.flightplan.nextWP().wp_type == 'discontinuity') {
logprint(LOG_INFO, "default GPS sequencing DISCONTINUITY in flightplan, switching to OBS mode");
# TODO - revert autopilot to hdg / vs
me._captureCurrentCourse();
me._selectOBSMode();
} else {
@ -194,9 +184,8 @@ var A320GPSDeleagte = {
# this check is needed to avoid problems with circular routes; when
# activating the FP we end up here, and without this check, immediately
# detect that we've 'landed' and finish the FP again.
var wow = getprop('gear/gear[0]/wow');
if (!wow and
if (!pts.Gear.wow[0].getValue() and
(activeRunway != nil) and (me.flightplan.destination_runway != nil) and
(activeRunway.id == me.flightplan.destination_runway.id))
{

71
Nasal/FMGC/flightplan.nas
View file

@ -95,7 +95,9 @@ var flightPlanController = {
},
loadFlightPlan: func(path) {
call(func {me.flightplans[3] = createFlightplan(path);}, nil, var err = []);
call(func {
me.flightplans[3] = createFlightplan(path);
}, nil, var err = []);
if (size(err) or me.flightplans[3] == nil) {
print(err[0]);
print("Load failed.");
@ -275,11 +277,6 @@ var flightPlanController = {
fmgc.windController.insertWind(n, index, 0, "PPOS");
},
insertDecel: func(n, pos, index) {
me.flightplans[n].insertWP(createWP(pos, "(DECEL)"), index);
#me.flightplans[n].getWP(index).hidden = 1;
fmgc.windController.insertWind(n, index, 0, "(DECEL)");
},
# childWPBearingDistance - return waypoint at bearing and distance from specified waypoint ghost
# args: wpt, bearing, dist, name, typeStr
@ -400,8 +397,7 @@ var flightPlanController = {
fmgc.windController.deleteWind(n, index);
}
# if n = 2, then we are clearing a discontinuity. Don't recalculate decel.
me.flightPlanChanged(n, n == 2 ? 0 : 1);
me.flightPlanChanged(n);
canvas_nd.A3XXRouteDriver.triggerSignal("fp-removed");
return 2;
} else {
@ -692,68 +688,46 @@ var flightPlanController = {
return count;
},
getIndexOfFirstDecel: func(plan) {
for (var wpt = 0; wpt < me.flightplans[plan].getPlanSize(); wpt += 1) {
if (me.flightplans[plan].getWP(wpt).wp_name == "(DECEL)") {
return wpt;
}
}
return -99;
},
calculateDecelPoint: func(n) {
if (me.getPlanSizeNoDiscont(n) <= 1 or fmgc.FMGCInternal.decel) {
calculateDecelPoint: func() {
if (me.getPlanSizeNoDiscont(2) <= 1 or fmgc.FMGCInternal.decel) {
setprop("/instrumentation/nd/symbols/decel/show", 0);
return;
}
me.indexDecel = me.getIndexOfFirstDecel(n);
if (me.indexDecel != -99) {
me.flightplans[n].deleteWP(me.indexDecel);
fmgc.windController.deleteWind(n, me.indexDecel);
me.flightPlanChanged(n,0);
}
me.indexDecel = 0;
for (var wpt = 0; wpt < me.flightplans[n].getPlanSize(); wpt += 1) {
if (me.flightplans[n].getWP(wpt).wp_role == "approach") {
for (var wpt = 0; wpt < me.flightplans[2].getPlanSize(); wpt += 1) {
if (me.flightplans[2].getWP(wpt).wp_role == "approach") {
me.indexDecel = wpt;
break;
}
if (wpt == me.flightplans[n].getPlanSize()) {
if (wpt == me.flightplans[2].getPlanSize()) {
me.indexDecel = me.arrivalIndex - 2;
break;
}
}
me.dist = me.flightplans[n].getWP(me.indexDecel).leg_distance - 7;
me.dist = me.flightplans[2].getWP(me.indexDecel).leg_distance - 7;
if (me.dist < 0) {
me.dist = 0.1;
}
me.decelPoint = me.flightplans[n].pathGeod(me.indexDecel - 1, me.dist);
me.decelPoint = me.flightplans[2].pathGeod(me.indexDecel - 1, me.dist);
if (n == 2) {
setprop("/instrumentation/nd/symbols/decel/latitude-deg", me.decelPoint.lat);
setprop("/instrumentation/nd/symbols/decel/longitude-deg", me.decelPoint.lon);
setprop("/instrumentation/nd/symbols/decel/show", 1);
}
setprop("/instrumentation/nd/symbols/decel/latitude-deg", me.decelPoint.lat);
setprop("/instrumentation/nd/symbols/decel/longitude-deg", me.decelPoint.lon);
setprop("/instrumentation/nd/symbols/decel/show", 1);
me.indexTemp = me.indexDecel;
me.distTemp = 7;
if (me.flightplans[n].getWP(me.indexTemp).leg_distance < 7) {
if (me.flightplans[2].getWP(me.indexTemp).leg_distance < 7) {
while (me.distTemp > 0 and me.indexTemp > 0) {
me.distTemp -= me.flightplans[n].getWP(me.indexTemp).leg_distance;
me.distTemp -= me.flightplans[2].getWP(me.indexTemp).leg_distance;
me.indexTemp -= 1;
}
me.indexTemp += 1;
}
# todo add to FPLN list
setprop("/instrumentation/nd/symbols/decel/index", me.indexTemp);
# me.insertDecel(n,{lat: me.decelPoint.lat, lon: me.decelPoint.lon}, me.indexTemp);
me.flightPlanChanged(n,0);
},
# insertPlaceBearingDistance - insert PBD waypoint at specified index,
@ -818,9 +792,8 @@ var flightPlanController = {
}
},
# callDecel - a variable that gets passed from the calling function. Used to prevent recalculating decel after discontinuity clearing
flightPlanChanged: func(n, callDecel = 1) {
me.updatePlans(1, callDecel);
flightPlanChanged: func(n) {
me.updatePlans(1);
fmgc.windController.updatePlans();
# push update to fuel
@ -837,7 +810,7 @@ var flightPlanController = {
},
# runDecel - used to ensure that only flightplanchanged will update the decel point
updatePlans: func(runDecel = 0, callDecel = 1) {
updatePlans: func(runDecel = 0) {
if (fmgc.FMGCInternal.toFromSet and me.flightplans[2].departure != nil and me.flightplans[2].destination != nil) { # check if flightplan exists
if (!me.active.getBoolValue()) {
if (me.currentToWptIndex.getValue() < 1) {
@ -869,10 +842,10 @@ var flightPlanController = {
}
}
}
}
if (runDecel and callDecel) {
me.calculateDecelPoint(n);
}
if (runDecel) {
me.calculateDecelPoint();
}
for (var i = 0; i <= 1; i += 1) {