From 310c375ebcc28020466bf3e318f2f95f50a4eedc Mon Sep 17 00:00:00 2001
From: jmt <jmt>
Date: Sun, 13 Sep 2009 08:10:56 +0000
Subject: [PATCH] PA-24 and PA-26 glideslope fixes from Dave Perry, including
 updated autopilot gains.

---
 Aircraft/Generic/century3.nas        | 12 ++++++------
 Aircraft/Instruments-3d/vor/vor.xml  |  8 ++++----
 Aircraft/Instruments-3d/vor/vor2.xml |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Aircraft/Generic/century3.nas b/Aircraft/Generic/century3.nas
index 27da9b3cf..ede1e0bd6 100644
--- a/Aircraft/Generic/century3.nas
+++ b/Aircraft/Generic/century3.nas
@@ -86,7 +86,7 @@ var pitchControl            = propAutopilotControls.getNode("pitch", 1);
 # values 0 (PITCH switch off)  1 (PITCH switch on)
 
 var headingNeedleDeflection = "/instrumentation/nav/heading-needle-deflection";
-var gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection";
+var gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection-deg";
 var indicatedPitchDeg =  "/instrumentation/attitude-indicator/indicated-pitch-deg";
 var staticPressure = "/systems/static/pressure-inhg";
 var altitudePressure = "/autopilot/CENTURYIII/settings/target-alt-pressure";
@@ -580,18 +580,18 @@ var gsArm = func {
 
   deviation = getprop(gsNeedleDeflection);
   ##
-  # If the deflection is more than 0.25 degrees wait 5 seconds and check again.
+  # If the deflection is more than 0.1 degrees wait 1 seconds and check again.
   ##
-  if (abs(deviation) > 0.25)
+  if (abs(deviation) > 0.1)
   {
     #print("deviation");
-    settimer(gsArm, 5);
+    settimer(gsArm, 1);
     return;
   }
   ##
-  # If the deviation is less than 1 then activate the GS pitch mode.
+  # If the deviation is less than 0.1 then activate the GS pitch mode.
   ##
-  elsif (abs(deviation) < 0.251)
+  elsif (abs(deviation) < 0.1)
   {
     #print("capture");
     lockAltHold.setBoolValue(0);
diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml
index 923cfd7f2..5697fb62e 100644
--- a/Aircraft/Instruments-3d/vor/vor.xml
+++ b/Aircraft/Instruments-3d/vor/vor.xml
@@ -47,7 +47,7 @@
   <type>rotate</type>
   <object-name>LocalizerNeedle</object-name>
   <property alias="../../params/nav-heading-needle-deflection"/>
-  <factor>-3.2</factor>
+  <factor>-2.8</factor>
   <center>
    <x-m>0</x-m>
    <y-m>0</y-m>
@@ -102,9 +102,9 @@
   <type>rotate</type>
   <object-name>GlidescopeNeedle</object-name>
    <property alias="../../params/nav-gs-needle-deflection"/>
-  <factor>-32</factor>
-  <min-deg>-32</min-deg>
-  <max-deg>32</max-deg>
+  <factor>-25</factor>
+  <min-deg>-25</min-deg>
+  <max-deg>25</max-deg>
   <center>
    <x-m>0</x-m>
    <y-m>-0.03</y-m>
diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml
index cfab12ca8..42aa20699 100644
--- a/Aircraft/Instruments-3d/vor/vor2.xml
+++ b/Aircraft/Instruments-3d/vor/vor2.xml
@@ -47,7 +47,7 @@
   <type>rotate</type>
   <object-name>LocalizerNeedle</object-name>
   <property alias="../../params/nav-heading-needle-deflection"/>
-  <factor>-3.2</factor>
+  <factor>-2.8</factor>
   <center>
    <x-m>0</x-m>
    <y-m>0</y-m>
@@ -102,9 +102,9 @@
   <type>rotate</type>
   <object-name>GlidescopeNeedle</object-name>
    <property alias="../../params/nav-gs-needle-deflection"/>
-  <factor>-32.0</factor>
-  <min-deg>-32</min-deg>
-  <max-deg>32</max-deg>
+  <factor>-25</factor>
+  <min-deg>-25</min-deg>
+  <max-deg>25</max-deg>
   <center>
    <x-m>0</x-m>
    <y-m>-0.03</y-m>