diff --git a/Aircraft/Generic/kap140.nas b/Aircraft/Generic/kap140.nas index 1b7625568..64bdc17c9 100644 --- a/Aircraft/Generic/kap140.nas +++ b/Aircraft/Generic/kap140.nas @@ -95,7 +95,7 @@ var elevatorControl = propFlightControls.getNode("elevator", 0); var elevatorTrimControl = propFlightControls.getNode("elevator-trim", 0); var headingNeedleDeflection = "/instrumentation/nav/heading-needle-deflection"; -var gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection"; +var gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection-norm"; var staticPressure = "systems/static/pressure-inhg"; var pressureUnits = { "inHg" : 0, "hPa" : 1 }; @@ -912,19 +912,19 @@ var gsArm = func { var deviation = getprop(gsNeedleDeflection); ## - # If the deflection is more than 1 degrees wait 5 seconds and check again. + # If the deflection is more than 50% (manual says '2 to 3 dots') ## - if (abs(deviation) > 1.0) + if (abs(deviation) > 0.5) { #print("deviation"); settimer(gsArm, 5); return; } ## - # If the deviation is less than 1 degrees turn off the GS-ARM annunciator + # If the deviation is less than 50% turn off the GS-ARM annunciator # and show the GS annunciator. Activate the GS pitch mode. ## - elsif (abs(deviation) < 1.1) + else { #print("capture"); annunciatorAlt.setBoolValue(0); diff --git a/Aircraft/Instruments-3d/kfc200/kfc-200.nas b/Aircraft/Instruments-3d/kfc200/kfc-200.nas index 683015757..acfdde6ba 100644 --- a/Aircraft/Instruments-3d/kfc200/kfc-200.nas +++ b/Aircraft/Instruments-3d/kfc200/kfc-200.nas @@ -39,7 +39,7 @@ var NAVLOC = "/instrumentation/nav/nav-loc"; var NAVDST = "/instrumentation/nav/nav-dist"; var NAVRNG = "/instrumentation/nav/in-range"; var HDEFL = "/instrumentation/nav/heading-needle-deflection"; -var GSDEFL = "/instrumentation/nav/gs-needle-deflection"; +var GSDEFL = "/instrumentation/nav/gs-needle-deflection-norm"; var BC = "/instrumentation/nav/back-course-btn"; var HDG = props.globals.getNode("/autopilot/locks/heading",1); @@ -173,7 +173,7 @@ var update_nav = func { if(getprop("instrumentation/kfc200/gs-arm")){ if(getprop("instrumentation/nav/gs-distance") < 25000){ var GS1 = getprop(GSDEFL); - if( GS1< 1.0 and GS1 > -1.0){vnav = 4; + if( GS1< 0.5 and GS1 > -0.5){vnav = 4; setprop("/instrumentation/kfc200/vnav",vnav); } } diff --git a/Aircraft/Instruments-3d/kfc200/ki252a.xml b/Aircraft/Instruments-3d/kfc200/ki252a.xml index 87a851d16..b3985ab60 100644 --- a/Aircraft/Instruments-3d/kfc200/ki252a.xml +++ b/Aircraft/Instruments-3d/kfc200/ki252a.xml @@ -91,13 +91,12 @@ Syd Adams translate GSneedle - instrumentation/nav/gs-needle-deflection + instrumentation/nav/gs-needle-deflection-norm - -100.0-0.0085 - -5.0-0.0085 + -1-0.0085 + -0.5-0.0085 0.00.0 - 10.00.0162 - 100.00.0162 + 1.00.0162 0.0 diff --git a/Aircraft/Instruments-3d/ki206/ki206.xml b/Aircraft/Instruments-3d/ki206/ki206.xml index d28b8a926..5f4495360 100644 --- a/Aircraft/Instruments-3d/ki206/ki206.xml +++ b/Aircraft/Instruments-3d/ki206/ki206.xml @@ -111,13 +111,11 @@ Syd Adams translate KI206.gsneedle - instrumentation/nav/gs-needle-deflection + instrumentation/nav/gs-needle-deflection-norm - -9999.0-0.0113 - -10.0-0.0113 + -1.0-0.0113 0.00.0 - 10.00.0113 - 9999.00.0113 + 1.00.0113 0.0 diff --git a/Aircraft/Instruments-3d/primus-1000/P1000.nas b/Aircraft/Instruments-3d/primus-1000/P1000.nas index fe26116e6..ab7067981 100644 --- a/Aircraft/Instruments-3d/primus-1000/P1000.nas +++ b/Aircraft/Instruments-3d/primus-1000/P1000.nas @@ -343,9 +343,7 @@ var P1000 = { if(getprop("/instrumentation/nav["~nv~"]/has-gs")){ me.NavType.setValue(2); if(nm_calc<30)me.GS_inrange.setValue(1); - var df = getprop("/instrumentation/nav["~nv~"]/gs-needle-deflection"); - if(df>10)df=10; - if(df<-10)df=-10; + var df = getprop("/instrumentation/nav["~nv~"]/gs-needle-deflection-norm"); me.GS_deflection.setValue(df); } id = getprop("instrumentation/nav["~nv~"]/nav-id"); diff --git a/Aircraft/Instruments-3d/primus-1000/pfd.xml b/Aircraft/Instruments-3d/primus-1000/pfd.xml index 59d6733bd..2f937658c 100644 --- a/Aircraft/Instruments-3d/primus-1000/pfd.xml +++ b/Aircraft/Instruments-3d/primus-1000/pfd.xml @@ -506,28 +506,22 @@ Primus 1000 Primary Flight Display translate GSneedle - instrumentation/nav/gs-needle-deflection + instrumentation/nav/gs-needle-deflection-norm - -10.0-0.0188 + -1.0-0.0188 - -5.0-0.0162 - - - -2.5-0.0083 + -0.5-0.0162 0.00.0 - 2.500.0078 + 0.50.0158 - 5.00.0158 - - - 10.00.02 + 1.00.02 diff --git a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml index dd773d800..02e887860 100644 --- a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml +++ b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml @@ -320,28 +320,22 @@ Primus 1000 Primary Flight Display translate GSneedle - instrumentation/nav/gs-needle-deflection + instrumentation/nav/gs-needle-deflection-norm - -10.0-0.0188 + -1.0-0.0188 - -5.0-0.0162 - - - -2.5-0.0083 + -0.5-0.0162 0.00.0 - 2.500.0078 + 0.50.0158 - 5.00.0158 - - - 10.00.02 + 1.00.02 diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml index 624b902af..923cfd7f2 100644 --- a/Aircraft/Instruments-3d/vor/vor.xml +++ b/Aircraft/Instruments-3d/vor/vor.xml @@ -6,7 +6,7 @@ /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /instrumentation/nav[0]/in-range @@ -102,7 +102,7 @@ rotate GlidescopeNeedle - -3.2 + -32 -32 32
diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml index 64887b1c2..cfab12ca8 100644 --- a/Aircraft/Instruments-3d/vor/vor2.xml +++ b/Aircraft/Instruments-3d/vor/vor2.xml @@ -6,7 +6,7 @@ /instrumentation/nav[1]/to-flag /instrumentation/nav[1]/from-flag /instrumentation/nav[1]/radials/selected-deg - /instrumentation/nav[1]/gs-needle-deflection + /instrumentation/nav[1]/gs-needle-deflection-norm /instrumentation/nav[1]/heading-needle-deflection /instrumentation/nav[1]/in-range @@ -102,7 +102,7 @@ rotate GlidescopeNeedle - -3.2 + -32.0 -32 32
diff --git a/Aircraft/Instruments/hsi-bk-hi.xml b/Aircraft/Instruments/hsi-bk-hi.xml index 10ddd8757..d1a0430c4 100644 --- a/Aircraft/Instruments/hsi-bk-hi.xml +++ b/Aircraft/Instruments/hsi-bk-hi.xml @@ -18,7 +18,7 @@ Mar 18 2003 512 - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /instrumentation/nav[0]/radials/selected-deg /instrumentation/nav[0]/to-flag @@ -424,10 +424,8 @@ Mar 18 2003 y-shift - -3.5 - 3.5 - 24 - -24 + 84 + -84 diff --git a/Aircraft/Instruments/hsi-hi.xml b/Aircraft/Instruments/hsi-hi.xml index 8a6c2d6fb..ef77ad60b 100644 --- a/Aircraft/Instruments/hsi-hi.xml +++ b/Aircraft/Instruments/hsi-hi.xml @@ -12,7 +12,7 @@ Started 24-7-01 by Timothy Gale 128 - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /sim/instrument-options/hsi[0]/has-gs-needle @@ -132,9 +132,7 @@ Started 24-7-01 by Timothy Gale y-shift - -3.5 - 3.5 - 7.0 + 24.5 rotation diff --git a/Aircraft/Instruments/hsi.xml b/Aircraft/Instruments/hsi.xml index 34b47b439..5c1924c61 100644 --- a/Aircraft/Instruments/hsi.xml +++ b/Aircraft/Instruments/hsi.xml @@ -12,7 +12,7 @@ Started 24-7-01 by Timothy Gale 128 - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /sim/instrument-options/hsi[0]/has-gs-needle @@ -132,9 +132,7 @@ Started 24-7-01 by Timothy Gale y-shift - -3.5 - 3.5 - 7.0 + 24.5 rotation diff --git a/Aircraft/Instruments/hsi2.xml b/Aircraft/Instruments/hsi2.xml index 182c55e93..fc37d8cd2 100644 --- a/Aircraft/Instruments/hsi2.xml +++ b/Aircraft/Instruments/hsi2.xml @@ -15,7 +15,7 @@ Started 24-7-01 by Timothy Gale /instrumentation/nav[0]/radials/selected-deg /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /sim/instrument-options/hsi[0]/has-gs-needle /orientation/heading-magnetic-deg /autopilot/settings/heading-bug-deg @@ -181,9 +181,7 @@ Started 24-7-01 by Timothy Gale y-shift - -3.5 - 3.5 - 7.0 + 24.5 rotation diff --git a/Aircraft/Instruments/nav1-hi.xml b/Aircraft/Instruments/nav1-hi.xml index 112cf7ea4..0a90cc4ab 100644 --- a/Aircraft/Instruments/nav1-hi.xml +++ b/Aircraft/Instruments/nav1-hi.xml @@ -32,7 +32,7 @@ properties' values. /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /sim/instrument-options/nav[0]/has-gs-needle /sim/instrument-options/nav[0]/needles-pivot @@ -214,9 +214,9 @@ properties' values. rotation - -3.5 - 3.5 - -7 + -1 + 1 + -24.5 x-shift @@ -254,8 +254,6 @@ properties' values. y-shift - -1 - 1 25.6 diff --git a/Aircraft/Instruments/nav1.xml b/Aircraft/Instruments/nav1.xml index ea25aab39..1c9b8beed 100644 --- a/Aircraft/Instruments/nav1.xml +++ b/Aircraft/Instruments/nav1.xml @@ -32,7 +32,7 @@ properties' values. /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /sim/instrument-options/nav[0]/has-gs-needle /sim/instrument-options/nav[0]/needles-pivot @@ -214,9 +214,7 @@ properties' values. rotation - -3.5 - 3.5 - -7 + -24.5 x-shift diff --git a/Aircraft/Instruments/vor1-c172s.xml b/Aircraft/Instruments/vor1-c172s.xml index 90cae471a..e29ee73f2 100644 --- a/Aircraft/Instruments/vor1-c172s.xml +++ b/Aircraft/Instruments/vor1-c172s.xml @@ -21,7 +21,7 @@ Jan 26 2003 /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /instrumentation/nav[0]/in-range @@ -219,9 +219,9 @@ Jan 26 2003 rotation 0 - -3.5 - 3.5 - -10.0 + -1 + 1 + -35.0 @@ -246,9 +246,7 @@ Jan 26 2003 rotation 0 - -3.5 - 3.5 - -10.0 + -35.0 x-shift diff --git a/Aircraft/c172p/Instruments/vor/vor.xml b/Aircraft/c172p/Instruments/vor/vor.xml index 624b902af..923cfd7f2 100644 --- a/Aircraft/c172p/Instruments/vor/vor.xml +++ b/Aircraft/c172p/Instruments/vor/vor.xml @@ -6,7 +6,7 @@ /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection + /instrumentation/nav[0]/gs-needle-deflection-norm /instrumentation/nav[0]/heading-needle-deflection /instrumentation/nav[0]/in-range @@ -102,7 +102,7 @@ rotate GlidescopeNeedle - -3.2 + -32 -32 32
diff --git a/Aircraft/c172p/Instruments/vor/vor2.xml b/Aircraft/c172p/Instruments/vor/vor2.xml index 64887b1c2..2f73f3e6a 100644 --- a/Aircraft/c172p/Instruments/vor/vor2.xml +++ b/Aircraft/c172p/Instruments/vor/vor2.xml @@ -6,7 +6,7 @@ /instrumentation/nav[1]/to-flag /instrumentation/nav[1]/from-flag /instrumentation/nav[1]/radials/selected-deg - /instrumentation/nav[1]/gs-needle-deflection + /instrumentation/nav[1]/gs-needle-deflection-norm /instrumentation/nav[1]/heading-needle-deflection /instrumentation/nav[1]/in-range @@ -102,7 +102,7 @@ rotate GlidescopeNeedle - -3.2 + -32 -32 32
diff --git a/Aircraft/c172p/Models/c172p-2d-panel.xml b/Aircraft/c172p/Models/c172p-2d-panel.xml index b0c70b363..161235788 100644 --- a/Aircraft/c172p/Models/c172p-2d-panel.xml +++ b/Aircraft/c172p/Models/c172p-2d-panel.xml @@ -198,7 +198,7 @@ Legacy 2D instruments and actions for the 3D C172P cockpit. /instrumentation/nav[1]/to-flag /instrumentation/nav[1]/from-flag /instrumentation/nav[1]/radials/selected-deg - /instrumentation/nav[1]/gs-needle-deflection + /instrumentation/nav[1]/gs-needle-deflection-norm /instrumentation/nav[1]/heading-needle-deflection /sim/instrument-options/nav[1]/has-gs-needle /sim/instrument-options/nav[1]/needles-pivot diff --git a/Aircraft/c172p/Panels/c172-vfr-panel.xml b/Aircraft/c172p/Panels/c172-vfr-panel.xml index 257ebb642..8f480fd31 100644 --- a/Aircraft/c172p/Panels/c172-vfr-panel.xml +++ b/Aircraft/c172p/Panels/c172-vfr-panel.xml @@ -240,7 +240,7 @@ override those by providing .. and .. properties with the /instrumentation/nav[1]/to-flag /instrumentation/nav[1]/from-flag /instrumentation/nav[1]/radials/selected-deg - /instrumentation/nav[1]/gs-needle-deflection + /instrumentation/nav[1]/gs-needle-deflection-norm /instrumentation/nav[1]/heading-needle-deflection /sim/instrument-options/nav[1]/has-gs-needle /sim/instrument-options/nav[1]/needles-pivot diff --git a/Aircraft/c172p/Systems/KAP140.xml b/Aircraft/c172p/Systems/KAP140.xml index 55df74516..609cd031f 100644 --- a/Aircraft/c172p/Systems/KAP140.xml +++ b/Aircraft/c172p/Systems/KAP140.xml @@ -207,7 +207,7 @@ true - /instrumentation/nav/gs-needle-deflection + /instrumentation/nav/gs-needle-deflection-norm 0.0 diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml index 60155572b..fee7b5d0a 100644 --- a/Aircraft/c172p/c172p-set.xml +++ b/Aircraft/c172p/c172p-set.xml @@ -205,7 +205,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net to override the ones that are in the .nas file.-->