From 3b85be339880e459b84dc01d3e9756cd8081f6b2 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Fri, 27 Sep 2002 18:26:42 +0000
Subject: [PATCH] Modifications to support new altimeter and static port models
 in FlightGear.

---
 Aircraft/Instruments/altimeter-hi.xml | 46 ++++++++++++-------------
 Aircraft/Instruments/altimeter.xml    | 49 +++++++++++++--------------
 preferences.xml                       |  8 +++++
 3 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/Aircraft/Instruments/altimeter-hi.xml b/Aircraft/Instruments/altimeter-hi.xml
index f5e614489..360890683 100644
--- a/Aircraft/Instruments/altimeter-hi.xml
+++ b/Aircraft/Instruments/altimeter-hi.xml
@@ -48,10 +48,10 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altimeter-datum-mb</property>
-     <min>945</min>
-     <max>1090</max>
-     <scale>-2.9533373</scale>  <!-- degrees rotation per millibar -->
+     <property>/instrumentation/altimeter/setting-inhg</property>
+     <min>26.0</min>
+     <max>33.0</max>
+     <scale>-99.89</scale>  <!-- degrees rotation per millibar -->
      <offset>120</offset>
     </transformation>
    </transformations>
@@ -80,7 +80,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
       <max>100000.0</max>
       <scale>0.0036</scale>
     </transformation>
@@ -104,7 +104,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
       <max>100000.0</max>
       <scale>0.036</scale>
     </transformation>
@@ -128,7 +128,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
       <max>100000.0</max>
       <scale>0.36</scale>
     </transformation>
@@ -159,10 +159,10 @@ properties' values.
    <h>45</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>-0.3386</step>
-    <min>945</min>
-    <max>1090</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>-0.01</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -175,10 +175,10 @@ properties' values.
    <h>45</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>-3.386</step>
-    <min>945</min>
-    <max>1090</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>-0.1</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -191,10 +191,10 @@ properties' values.
    <h>45</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>0.3386</step>
-    <min>945</min>
-    <max>1090</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>0.01</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -207,10 +207,10 @@ properties' values.
    <h>45</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>3.386</step>
-    <min>945</min>
-    <max>1090</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>0.1</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
diff --git a/Aircraft/Instruments/altimeter.xml b/Aircraft/Instruments/altimeter.xml
index 7056a1972..e3d04976f 100644
--- a/Aircraft/Instruments/altimeter.xml
+++ b/Aircraft/Instruments/altimeter.xml
@@ -62,8 +62,8 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altimeter-datum-mb</property>
-     <scale>-4.5</scale>  <!-- degrees rotation per millibar -->
+     <property>/instrumentation/altimeter/setting-inhg</property>
+     <scale>-152.37</scale>  <!-- degrees rotation per inHG -->
     </transformation>
    </transformations>
   </layer>
@@ -82,7 +82,7 @@ properties' values.
   <layer>
    <name>numeric datum</name>
    <type>text</type>
-   <point-size>10</point-size>
+   <point-size>8</point-size>
    <color>
     <red>1.0</red>
     <green>1.0</green>
@@ -91,9 +91,8 @@ properties' values.
    <chunks>
     <chunk>
      <type>number-value</type>
-     <property>/steam/altimeter-datum-mb</property>
-<!-- <format>%5.2f</format> <scale>0.029530</scale> -->  <!-- Display inHg -->
-     <format>%4.0f</format>                              <!-- Display mb -->
+     <property>/instrumentation/altimeter/setting-inhg</property>
+     <format>%2.2f</format>
     </chunk>
    </chunks>
    <transformations>
@@ -121,7 +120,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
      <max>100000.0</max>
      <scale>0.036</scale>
     </transformation>
@@ -145,7 +144,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
      <max>100000.0</max>
      <scale>0.36</scale>
     </transformation>
@@ -169,7 +168,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>rotation</type>
-     <property>/steam/altitude-ft</property>
+     <property>/instrumentation/altimeter/indicated-altitude-ft</property>
      <max>100000.0</max>
      <scale>0.0036</scale>
     </transformation>
@@ -253,10 +252,10 @@ properties' values.
    <h>24</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>-0.333333</step>
-    <min>500</min>
-    <max>1100</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>-0.01</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -270,10 +269,10 @@ properties' values.
    <h>24</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>-5</step>
-    <min>500</min>
-    <max>1100</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>-0.1</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -287,10 +286,10 @@ properties' values.
    <h>24</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>0.333333</step>
-    <min>500</min>
-    <max>1100</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>0.1</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
@@ -304,10 +303,10 @@ properties' values.
    <h>24</h>
    <binding>
     <command>property-adjust</command>
-    <property>/steam/altimeter-datum-mb</property>
-    <step>5</step>
-    <min>500</min>
-    <max>1100</max>
+    <property>/instrumentation/altimeter/setting-inhg</property>
+    <step>0.1</step>
+    <min>26.0</min>
+    <max>33.0</max>
     <wrap>false</wrap>
    </binding>
   </action>
diff --git a/preferences.xml b/preferences.xml
index 946254ee7..17c543619 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -368,12 +368,20 @@ Started September 2000 by David Megginson, david@megginson.com
  </steam>
 
  <instrumentation>
+  <altimeter>
+   <serviceable type="bool">true</serviceable>
+   <setting-inhg type="double">29.92</setting-inhg>
+  </altimeter>
   <attitude-indicator>
    <serviceable type="bool">true</serviceable>
   </attitude-indicator>
  </instrumentation>
 
  <systems>
+  <static>
+   <serviceable type="bool">true</serviceable>
+   <pressure-inhg type="double">29.92</pressure-inhg>
+  </static>
   <vacuum>
    <serviceable type="bool">true</serviceable>
   </vacuum>