From ff4e599eb0a8f16c24121e173de953b22b66157e Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sat, 16 Oct 2004 12:37:46 +0000
Subject: [PATCH] Roy Vegard Ovesen:

Instrumentation and systems are now configureable from xml files. The two
generic configurations generic-systems.xml and generic-instrumentation.xml
configures the systems and instrumentation as it was hardcoded. You can
override the generic configurations in a similar way as you override the
autopilot configuration.
---
 Aircraft/Generic/generic-instrumentation.xml | 99 ++++++++++++++++++++
 Aircraft/Generic/generic-systems.xml         | 29 ++++++
 preferences.xml                              |  4 +
 3 files changed, 132 insertions(+)
 create mode 100644 Aircraft/Generic/generic-instrumentation.xml
 create mode 100644 Aircraft/Generic/generic-systems.xml

diff --git a/Aircraft/Generic/generic-instrumentation.xml b/Aircraft/Generic/generic-instrumentation.xml
new file mode 100644
index 000000000..66ec34ff3
--- /dev/null
+++ b/Aircraft/Generic/generic-instrumentation.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+
+<!--
+**********************************************************************
+generic-instrumentation.xml
+
+Generic instrumentation configuration. This file selects the
+instrumentation modules that should be available.
+
+You can have several instances of the same instrument type.
+The value inside the name tag becomes the node in the property tree.
+If two instruments have the same name you must use the number tag
+to separate them. They become name[number] in the property tree.
+Some instruments have additional configuration tags like static-port
+and pitot-port. The static- and pitot-ports (and any other system that
+an instrument depend on) have to be configured in the systems
+configuration file: generic-systems.xml
+
+The values in this file are the default values. If any configuration
+tags are omitted in an aircraft specific version of this configuration
+file, these values will be used (they are hardcoded).
+
+**********************************************************************
+-->
+
+<PropertyList>
+
+  <adf>
+    <name>adf</name>
+    <number>0</number>
+  </adf>
+
+  <adf>
+    <name>adf-radio</name>
+    <number>0</number>
+  </adf>
+
+  <airspeed-indicator>
+    <name>airspeed-indicator</name>
+    <number>0</number>
+    <pitot-port>/systems/pitot</pitot-port>
+    <static-port>/systems/static</static-port>
+  </airspeed-indicator>
+
+  <altimeter>
+    <name>altimeter</name>
+    <number>0</number>
+    <static-port>/systems/static</static-port>
+  </altimeter>
+
+  <attitude-indicator>
+    <name>attitude-indicator</name>
+    <number>0</number>
+    <vacuum-system>/systems/vacuum</vacuum-system>
+  </attitude-indicator>
+
+  <clock>
+    <name>clock</name>
+    <number>0</number>
+  </clock>
+
+  <dme>
+    <name>dme</name>
+    <number>0</number>
+  </dme>
+
+  <heading-indicator>
+    <name>heading-indicator</name>
+    <number>0</number>
+    <vacuum-system>/systems/vacuum</vacuum-system>
+  </heading-indicator>
+
+  <magnetic-compass>
+    <name>magnetic-compass</name>
+    <number>0</number>
+  </magnetic-compass>
+
+  <slip-skid-ball>
+    <name>slip-skid-ball</name>
+    <number>0</number>
+  </slip-skid-ball>
+
+  <turn-indicator>
+    <name>turn-indicator</name>
+    <number>0</number>
+  </turn-indicator>
+
+  <vertical-speed-indicator>
+    <name>vertical-speed-indicator</name>
+    <number>0</number>
+    <static-port>/systems/static</static-port>
+  </vertical-speed-indicator>
+
+  <gps>
+    <name>gps</name>
+    <number>0</number>
+  </gps>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Aircraft/Generic/generic-systems.xml b/Aircraft/Generic/generic-systems.xml
new file mode 100644
index 000000000..d66b1dc67
--- /dev/null
+++ b/Aircraft/Generic/generic-systems.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+  <pitot>
+    <name>pitot</name>
+    <number>0</number>
+  </pitot>
+
+  <static>
+    <name>static</name>
+    <number>0</number>
+  </static>
+
+  <vacuum>
+    <name>vacuum</name>
+    <number>0</number>
+    <rpm>/engines/engine[0]/rpm</rpm>
+    <scale>1.0</scale>
+  </vacuum>
+
+  <vacuum>
+    <name>vacuum</name>
+    <number>1</number>
+    <rpm>/engines/engine[1]/rpm</rpm>
+    <scale>1.0</scale>
+  </vacuum>
+
+</PropertyList>
\ No newline at end of file
diff --git a/preferences.xml b/preferences.xml
index 6c91599a8..6bf802610 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -71,10 +71,14 @@ Started September 2000 by David Megginson, david@megginson.com
    <draw-fps>false</draw-fps>
   </hud>
   <systems>
+   <path>Aircraft/Generic/generic-systems.xml</path>
    <autopilot>
     <path>Aircraft/Generic/generic-autopilot.xml</path>
    </autopilot>
   </systems>
+  <instrumentation>
+   <path>Aircraft/Generic/generic-instrumentation.xml</path>
+  </instrumentation>
   <instrument-options>
    <nav n="0">
     <has-gs-needle type="bool">true</has-gs-needle>