From da0449a4d95637ced52b05f9f9bd0bc19149046b Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Wed, 9 Jun 2010 00:33:37 +0200
Subject: [PATCH 1/3] Merge branch 'master' of git://gitorious.org/fg/fgdata


From 7a7ac553fab747cde19d7bee97d4c9ee309c14a9 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Fri, 11 Jun 2010 22:05:55 +0200
Subject: [PATCH 2/3] Prepare for moving the hard coded A/P helpers into XML

Currently, there are some hard coded autopilot helpers.
They can (and should) easily be modeled in an external XML file.
The filter in this file produce the exact same output as the hard coded
filters.
This is just a preparation step for a smooth transition at a later time.
---
 Aircraft/Generic/generic-autopilot-helper.xml | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 Aircraft/Generic/generic-autopilot-helper.xml

diff --git a/Aircraft/Generic/generic-autopilot-helper.xml b/Aircraft/Generic/generic-autopilot-helper.xml
new file mode 100644
index 000000000..94ebb1ba3
--- /dev/null
+++ b/Aircraft/Generic/generic-autopilot-helper.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!-- 
+     These are the autopilot helpers, currently implemented
+     in the c++ code of xmlauto.cxx.
+     These will take over the functionality of the hard
+     coded helpers, once they are removed and this file
+     has been added as an autopilot to preferences.xml
+-->
+ 
+<PropertyList>
+
+  <filter>
+    <name>heading bug error computer/normalizer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>
+      <property>autopilot/settings/heading-bug-deg</property>
+      <offset>
+        <property>orientation/heading-magnetic-deg</property>
+        <scale>-1.0</scale>
+      </offset>
+    </input>
+    <output>autopilot/internal/heading-bug-error-deg</output>
+    <output>autopilot/internal/fdm-heading-bug-error-deg</output>
+    <period>
+      <min>-180</min>
+      <max>180</max>
+    </period>
+    <gain>1.0</gain>
+  </filter>
+
+  <filter>
+    <name>true heading error computer/normalizer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>
+      <property>autopilot/settings/true-heading-deg</property>
+      <offset>
+        <property>orientation/heading-deg</property>
+        <scale>-1.0</scale>
+      </offset>
+    </input>
+    <output>autopilot/internal/true-heading-error-deg</output>
+    <period>
+      <min>-180</min>
+      <max>180</max>
+    </period>
+    <gain>1.0</gain>
+  </filter>
+
+  <filter>
+    <name>nav1 heading error computer/normalizer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>
+      <property>instrumentation/nav[0]/radials/target-auto-hdg-deg</property>
+      <offset>
+        <property>orientation/heading-deg</property>
+        <scale>-1.0</scale>
+      </offset>
+    </input>
+    <output>autopilot/internal/nav1-heading-error-deg</output>
+    <period>
+      <min>-180</min>
+      <max>180</max>
+    </period>
+    <gain>1.0</gain>
+  </filter>
+
+  <filter>
+    <name>nav1 selected course error computer/normalizer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>
+      <property>instrumentation/nav[0]/radials/selected-deg</property>
+      <offset>
+        <property>orientation/heading-magnetic-deg</property>
+        <scale>-1.0</scale>
+      </offset>
+    </input>
+    <output>autopilot/internal/nav1-course-error</output>
+    <period>
+      <min>-180</min>
+      <max>180</max>
+    </period>
+    <gain>1.0</gain>
+  </filter>
+
+  <filter>
+    <name>vertical speed fpm computer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>velocities/vertical-speed-fps</input>
+    <output>autopilot/internal/vert-speed-fpm</output>
+    <gain>60.0</gain>
+  </filter>
+
+  <predict-simple>
+    <name>speed in 5 seconds predictor</name>
+    <debug>false</debug>
+    <input>velocities/airspeed-kt</input>
+    <output>autopilot/internal/lookahead-5-sec-airspeed-kt</output>
+    <seconds>5.0</seconds>
+    <filter-gain>0.0</filter-gain>
+  </predict-simple>
+
+  <predict-simple>
+    <name>speed in 10 seconds predictor</name>
+    <debug>false</debug>
+    <input>velocities/airspeed-kt</input>
+    <output>autopilot/internal/lookahead-10-sec-airspeed-kt</output>
+    <seconds>10.0</seconds>
+    <filter-gain>0.0</filter-gain>
+  </predict-simple>
+
+  <filter>
+    <name>static port pressure rate computer</name>
+    <debug>false</debug>
+    <type>differential</type>
+    <input>systems/static[0]/pressure-inhg</input>
+    <output>autopilot/internal/pressure-rate</output>
+    <filter-time>1.0</filter-time>
+  </filter>
+
+  <filter>
+    <name>nav1 track error computer</name>
+    <debug>false</debug>
+    <type>gain</type>
+    <input>
+      <property>instrumentation/nav[0]/radials/target-auto-hdg-deg</property>
+      <offset>
+        <property>orientation/track-deg</property>
+        <scale>-1.0</scale>
+      </offset>
+    </input>
+    <output>autopilot/internal/nav1-track-error-deg</output>
+    <period>
+      <min>-180</min>
+      <max>180</max>
+    </period>
+    <gain>1.0</gain>
+  </filter>
+
+</PropertyList>
+

From 767b8f179db811731530da1907fe9e10928fb03c Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Fri, 11 Jun 2010 22:10:08 +0200
Subject: [PATCH 3/3] Nondestructive preparation for replacement of hard coded
 A/P helpers

---
 preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/preferences.xml b/preferences.xml
index daa3e8506..206e78511 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -269,6 +269,12 @@ Started September 2000 by David Megginson, david@megginson.com
    <autopilot>
     <path>Aircraft/Generic/generic-autopilot.xml</path>
    </autopilot>
+   <!-- 
+   to be enabled when the hard coded helpers are gone
+   <autopilot>
+    <path>Aircraft/Generic/generic-autopilot-helper.xml</path>
+   </autopilot>
+   -->
   </systems>
   <instrumentation>
    <path>Aircraft/Generic/generic-instrumentation.xml</path>