From 9e9d514cdd6afc5736cc529cc4195263655baa0a Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 28 Apr 2020 15:33:28 +0100 Subject: [PATCH] Fix PFD typo, correct bearing could go below zero or above 360 --- Models/Instruments/PFD/PFD.nas | 2 +- Nasal/MCDU/F-PLN.nas | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index f15de027..2096426f 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -1261,7 +1261,7 @@ var canvas_PFD_1 = { tgt_ias = vapp; tgt_kts = vapp; } else if (FMGCphase.getValue() == 6) { - vapp = getprop("/FMGC/internal/computed-speeds/clean"); + clean = getprop("/FMGC/internal/computed-speeds/clean"); tgt_ias = clean; tgt_kts = clean; } else { diff --git a/Nasal/MCDU/F-PLN.nas b/Nasal/MCDU/F-PLN.nas index f3a21faf..749f121a 100644 --- a/Nasal/MCDU/F-PLN.nas +++ b/Nasal/MCDU/F-PLN.nas @@ -71,10 +71,16 @@ var fplnItem = { } }, getBrg: func() { - return sprintf("%03.0f", math.round(fmgc.wpCourse[me.plan][me.index].getValue() - pts.Environment.magVar.getValue())); + me.brg = fmgc.wpCourse[me.plan][me.index].getValue() - pts.Environment.magVar.getValue(); + if (me.brg < 0) { me.brg += 360; } + if (me.brg > 360) { me.brg -= 360; } + return sprintf("%03.0f", math.round(me.brg)); }, getTrack: func() { - return sprintf("%03.0f", math.round(fmgc.wpCoursePrev[me.plan][me.index].getValue() - pts.Environment.magVar.getValue())); + me.trk = fmgc.wpCoursePrev[me.plan][me.index].getValue() - pts.Environment.magVar.getValue(); + if (me.trk < 0) { me.trk += 360; } + if (me.trk > 360) { me.trk -= 360; } + return sprintf("%03.0f", math.round(me.trk)); }, getSpd: func() { return "---";