From 8425cb6277f880fe0f6ce387023fc2d88be7aa57 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 15 Nov 2017 11:46:59 -0500 Subject: [PATCH] A3XX: Fix some ND bad things #75 --- .../ND/canvas/framework/navdisplay.nas | 18 ++++++++++++++---- revision.txt | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas index 99fa336e..3fb35c27 100644 --- a/Models/Instruments/ND/canvas/framework/navdisplay.nas +++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas @@ -444,10 +444,20 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec var vorheading = userHdgTru; var adfheading = userHdgMag; } - if(getprop(vor1_path~ "heading-deg") != nil) - var nav0hdg=getprop(vor1_path~ "heading-deg") - vorheading; - if(getprop(vor2_path~ "heading-deg") != nil) - var nav1hdg=getprop(vor2_path~ "heading-deg") - vorheading; + if (getprop("/instrumentation/nav[2]/heading-deg") != nil and me.get_switch('toggle_true_north') == 0) { + var nav0hdg = getprop("/instrumentation/nav[2]/heading-deg") - getprop("/orientation/heading-magnetic-deg"); + } else if (getprop("/instrumentation/nav[2]/heading-deg") != nil and me.get_switch('toggle_true_north') == 1) { + var nav0hdg = getprop("/instrumentation/nav[2]/heading-deg") - getprop("/orientation/heading-deg"); + } else { + var nav0hdg = 0; + } + if (getprop("/instrumentation/nav[3]/heading-deg") != nil and me.get_switch('toggle_true_north') == 0) { + var nav1hdg = getprop("/instrumentation/nav[3]/heading-deg") - getprop("/orientation/heading-magnetic-deg"); + } else if (getprop("/instrumentation/nav[3]/heading-deg") != nil and me.get_switch('toggle_true_north') == 1) { + var nav1hdg = getprop("/instrumentation/nav[3]/heading-deg") - getprop("/orientation/heading-deg"); + } else { + var nav1hdg = 0; + } var adf0hdg=getprop("instrumentation/adf/indicated-bearing-deg"); var adf1hdg=getprop("instrumentation/adf[1]/indicated-bearing-deg"); if(!me.get_switch('toggle_centered')) diff --git a/revision.txt b/revision.txt index a2113715..d59954b6 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4000 \ No newline at end of file +4001 \ No newline at end of file