Fix line endings

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

diff --git a/src/Instrumentation/airspeed_indicator.cxx b/src/Instrumentation/airspeed_indicator.cxx
index 46eb585c8aab0075e42bc38569cd18ed53c4abee..db34f3fce6f70739b3ab29cd504f0307a6167649 100644 (file)
--- a/src/Instrumentation/airspeed_indicator.cxx
+++ b/src/Instrumentation/airspeed_indicator.cxx
@@ -15,9 +15,44 @@
 // A higher number means more responsive.
 #define RESPONSIVENESS 50.0
 
+AirspeedIndicator::AirspeedIndicator ( SGPropertyNode *node )
+    :
+    name("airspeed-indicator"),
+    num(0),
+    pitot_port("/systems/pitot"),
+    static_port("/systems/static")
+{
+    int i;
+    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 == "pitot-port" ) {
+            pitot_port = cval;
+        } else if ( cname == "static-port" ) {
+            static_port = cval;
+        } else {
+            SG_LOG( SG_INSTR, SG_WARN, "Error in aispeed-indicator config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
+            }
+        }
+    }
+}
+
 
-AirspeedIndicator::AirspeedIndicator ()
+AirspeedIndicator::AirspeedIndicator ( int i )
+    :
+    name("airspeed-indicator"),
+    num(0),
+    pitot_port("/systems/pitot"),
+    static_port("/systems/static")
 {
+    num = i;
 }
 
 AirspeedIndicator::~AirspeedIndicator ()
@@ -27,22 +62,19 @@ AirspeedIndicator::~AirspeedIndicator ()
 void
 AirspeedIndicator::init ()
 {
-    _serviceable_node =
-        fgGetNode("/instrumentation/airspeed-indicator/serviceable",
-                  true);
-    _total_pressure_node =
-        fgGetNode("/systems/pitot/total-pressure-inhg", true);
-    _static_pressure_node =
-        fgGetNode("/systems/static/pressure-inhg", true);
-    _speed_node =
-        fgGetNode("/instrumentation/airspeed-indicator/indicated-speed-kt",
-                  true);
+    string branch;
+    branch = "/instrumentation/" + name;
+    pitot_port += "/total-pressure-inhg";
+    static_port += "/pressure-inhg";
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    _serviceable_node = node->getChild("serviceable", 0, true);
+    _total_pressure_node = fgGetNode(pitot_port.c_str(), true);
+    _static_pressure_node = fgGetNode(static_port.c_str(), true);
+    _density_node = fgGetNode("/environment/density-slugft3", true);
+    _speed_node = node->getChild("indicated-speed-kt", 0, true);
 }
 
-#ifndef SEA_LEVEL_DENSITY_SLUGFG3
-# define SEA_LEVEL_DENSITY_SLUGFT3 0.002378
-#endif
-
 #ifndef FPSTOKTS
 # define FPSTOKTS 0.592484
 #endif
@@ -55,12 +87,15 @@ void
 AirspeedIndicator::update (double dt)
 {
     if (_serviceable_node->getBoolValue()) {
-        double pt = _total_pressure_node->getDoubleValue();
-        double p = _static_pressure_node->getDoubleValue();
-        double q = ( pt - p ) * INHGTOPSF;      // dynamic pressure
-
-                                // Now, reverse the equation
-        double v_fps = sqrt((2 * q) / SEA_LEVEL_DENSITY_SLUGFT3);
+        double pt = _total_pressure_node->getDoubleValue() * INHGTOPSF;
+        double p = _static_pressure_node->getDoubleValue() * INHGTOPSF;
+        double r = _density_node->getDoubleValue();
+        double q = ( pt - p );  // dynamic pressure
+
+        // Now, reverse the equation (normalize dynamic pressure to
+        // avoid "nan" results from sqrt)
+        if ( q < 0 ) { q = 0.0; }
+        double v_fps = sqrt((2 * q) / r);
 
                                 // Publish the indicated airspeed
         double last_speed_kt = _speed_node->getDoubleValue();