fly/A320-family
1
0
Fork 0
Code Activity

Fix that it would occasionally go to waypoint index -1

Browse source
This commit is contained in:
Jonathan Redpath 2022-05-13 16:41:09 +01:00
parent be32f89d7d
commit 3d1046c195
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Nasal/FMGC/flightplan.nas
View file

@ -78,6 +78,7 @@ var flightPlanController = {
},
oldCurrentWp: 0,
lastSequencedCurrentWP: 0,
createTemporaryFlightPlan: func(n) {
me.resetFlightplan(n);
me.flightplans[n] = me.flightplans[2].clone();
@ -166,7 +167,6 @@ var flightPlanController = {
fmgc.windController.destroyTemporaryWinds(n, a);
# TODO - handle changed wpt order
if (FPLN.currentWP.getValue() != me.oldCurrentWp) {
FPLN.currentWP.setValue(me.oldCurrentWp);
}
@ -230,6 +230,8 @@ var flightPlanController = {
fmgc.Input.lat.setValue(3);
} else {
me.currentToWptIndex.setValue(me.currentToWptIndexTemp + 1);
me.lastSequencedCurrentWP = me.currentToWptIndexTemp + 1;
if (me.num[2].getValue() > 2 and me.currentToWptIndexTemp >= 1) {
for (var i = 0; i <= 2; i += 1) {
if (i == 2 or me.temporaryFlag[i]) {
@ -865,6 +867,11 @@ var flightPlanController = {
me.active.setValue(0);
}
if (me.active.getBoolValue() and me.currentToWptIndex.getValue() == -1) {
print("Setting index to " ~ me.lastSequencedCurrentWP);
me.currentToWptIndex.setValue(me.lastSequencedCurrentWP);
}
for (var n = 0; n <= 2; n += 1) {
for (var wpt = 0; wpt < me.flightplans[n].getPlanSize(); wpt += 1) { # Iterate through the waypoints and update their data
var waypointHashStore = me.flightplans[n].getWP(wpt);