Boris Koenig:

[flightgear.git] / src / Systems / vacuum.cxx

diff --git a/src/Systems/vacuum.cxx b/src/Systems/vacuum.cxx
index 3e6311d60f399a0560abc9d1a8eb70ef76b56d85..bede8ed77cf716288527e2dd8e10118f88c93cd6 100644 (file)
--- a/src/Systems/vacuum.cxx
+++ b/src/Systems/vacuum.cxx
@@ -7,9 +7,42 @@
 #include <Main/fg_props.hxx>
 
 
+VacuumSystem::VacuumSystem ( SGPropertyNode *node )
+    :
+    name("vacuum"),
+    num(0),
+    rpm("/engines/engine[0]/rpm"),
+    scale(1.0)
+
+{
+    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 == "rpm" ) {
+            rpm = cval;
+        } else if ( cname == "scale" ) {
+            scale = child->getDoubleValue();
+        } else {
+            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in vacuum config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+            }
+        }
+    }
+}
+
 VacuumSystem::VacuumSystem( int i )
 {
+    name = "vacuum";
     num = i;
+    rpm = "/engines/engine[0]/rpm";
+    scale = 1.0;
 }
 
 VacuumSystem::~VacuumSystem ()
@@ -19,13 +52,16 @@ VacuumSystem::~VacuumSystem ()
 void
 VacuumSystem::init()
 {
-                                // TODO: allow index of engine to be
-                                // configured.
-    SGPropertyNode *node = fgGetNode("/systems/vacuum", num, true );
+    string branch;
+    branch = "/systems/" + name;
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
     _serviceable_node = node->getChild("serviceable", 0, true);
-    _rpm_node = fgGetNode("/engines/engine[0]/rpm", true);
+    _rpm_node = fgGetNode(rpm.c_str(), true);
     _pressure_node = fgGetNode("/environment/pressure-inhg", true);
     _suction_node = node->getChild("suction-inhg", 0, true);
+
+    _serviceable_node->setBoolValue(true);
 }
 
 void
@@ -48,7 +84,7 @@ VacuumSystem::update (double dt)
     if (!_serviceable_node->getBoolValue()) {
         suction = 0.0;
     } else {
-        double rpm = _rpm_node->getDoubleValue();
+        double rpm = _rpm_node->getDoubleValue() * scale;
         double pressure = _pressure_node->getDoubleValue();
         // This magic formula yields about 4 inhg at 700 rpm
         suction = pressure * rpm / (rpm + 4875.0);