Changes by Roy Ovesen to begin migrating the avionics out of the Cockpit

[flightgear.git] / src / Instrumentation / altimeter.cxx

diff --git a/src/Instrumentation/altimeter.cxx b/src/Instrumentation/altimeter.cxx
index cf15be1f00b706dcccf1cba59391d7795fff7bd4..5b7e3decc3cc52345386b4cff5325b55b851f3c0 100644 (file)
--- a/src/Instrumentation/altimeter.cxx
+++ b/src/Instrumentation/altimeter.cxx
@@ -10,6 +10,10 @@
 #include <Main/util.hxx>
 
 
+// A higher number means more responsive
+#define RESPONSIVENESS 10.0
+
+
 // Altitude based on pressure difference from sea level.
 // pressure difference inHG, altitude ft
 static double altitude_data[][2] = {
@@ -41,6 +45,35 @@ static double altitude_data[][2] = {
 };
 
 
+Altimeter::Altimeter ( SGPropertyNode *node )
+    : _altitude_table(new SGInterpTable),
+      name("altimeter"),
+      num(0),
+      static_port("/systems/static")
+{
+    int i;
+    for (i = 0; altitude_data[i][0] != -1; i++)
+        _altitude_table->addEntry(altitude_data[i][0], altitude_data[i][1]);
+
+    for ( i = 0; i < node->nChildren(); ++i ) {
+        SGPropertyNode *child = node->getChild(i);
+        string cname = child->getName();
+        string cval = child->getStringValue();
+        if ( cname == "name" ) {
+            name = cval;
+        } else if ( cname == "number" ) {
+            num = child->getIntValue();
+        } else if ( cname == "static-port" ) {
+            static_port = cval;
+        } else {
+            SG_LOG( SG_INSTR, SG_WARN, "Error in altimeter config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
+            }
+        }
+    }
+}
+
 Altimeter::Altimeter ()
     : _altitude_table(new SGInterpTable)
 {
@@ -57,24 +90,16 @@ Altimeter::~Altimeter ()
 void
 Altimeter::init ()
 {
-    _serviceable_node =
-        fgGetNode("/instrumentation/altimeter/serviceable", true);
-    _setting_node =
-        fgGetNode("/instrumentation/altimeter/setting-inhg", true);
-    _pressure_node =
-        fgGetNode("/systems/static/pressure-inhg", true);
-    _altitude_node =
-        fgGetNode("/instrumentation/altimeter/indicated-altitude-ft", true);
-}
+    string branch;
+    branch = "/instrumentation/" + name;
+    static_port += "/pressure-inhg";
 
-void
-Altimeter::bind ()
-{
-}
+    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
 
-void
-Altimeter::unbind ()
-{
+    _serviceable_node = node->getChild("serviceable", 0, true);
+    _setting_node = node->getChild("setting-inhg", 0, true);
+    _pressure_node = fgGetNode(static_port.c_str(), true);
+    _altitude_node = node->getChild("indicated-altitude-ft", 0, true);
 }
 
 void
@@ -83,11 +108,14 @@ Altimeter::update (double dt)
     if (_serviceable_node->getBoolValue()) {
         double pressure = _pressure_node->getDoubleValue();
         double setting = _setting_node->getDoubleValue();
-        double altitude =
-            fgGetLowPass(_altitude_node->getDoubleValue(),
-                         _altitude_table->interpolate(setting - pressure),
-                         dt * 10);
-        _altitude_node->setDoubleValue(altitude);
+
+                                // Move towards the current setting
+        double last_altitude = _altitude_node->getDoubleValue();
+        double current_altitude =
+            _altitude_table->interpolate(setting - pressure);
+        _altitude_node->setDoubleValue(fgGetLowPass(last_altitude,
+                                                    current_altitude,
+                                                    dt * RESPONSIVENESS));
     }
 }