X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fattitude_indicator.cxx;h=19f6d4c708ad0d20973eabc01650603efadc4006;hb=805c4cbba15c6922e511b3a20ba5a9cb56ceed4f;hp=1555c2c74eeddc49dda9b2656043e8c89544b711;hpb=e9b70e3ab8ab098a5a59f5ea2c13bed9e8c5695c;p=flightgear.git

diff --git a/src/Instrumentation/attitude_indicator.cxx b/src/Instrumentation/attitude_indicator.cxx
index 1555c2c74..19f6d4c70 100644
--- a/src/Instrumentation/attitude_indicator.cxx
+++ b/src/Instrumentation/attitude_indicator.cxx
@@ -6,10 +6,14 @@
 // TODO:
 // - better spin-up
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include <math.h>	// fabs()
@@ -18,34 +22,16 @@
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
 
+using std::string;
 
 AttitudeIndicator::AttitudeIndicator ( SGPropertyNode *node )
     :
-    name("attitude-indicator"),
-    num(0),
-    vacuum_system("/systems/vacuum")
-{
-    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 = (int) child->getDoubleValue();
-        } else if ( cname == "vacuum-system" ) {
-            vacuum_system = cval;
-        } else {
-            SG_LOG( SG_INSTR, SG_WARN, "Error in attitude-indicator config logic" );
-            if ( name.length() ) {
-                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
-            }
-        }
-    }
-}
-
-AttitudeIndicator::AttitudeIndicator ()
+    _name(node->getStringValue("name", "attitude-indicator")),
+    _num(node->getIntValue("number", 0)),
+    _suction(node->getStringValue("suction", "/systems/vacuum/suction-inhg")),
+    spin_thresh(0.8),
+    max_roll_error(40.0),
+    max_pitch_error(12.0)
 {
 }
 
@@ -57,18 +43,24 @@ void
 AttitudeIndicator::init ()
 {
     string branch;
-    branch = "/instrumentation/" + name;
-    vacuum_system += "/suction-inhg";
+    branch = "/instrumentation/" + _name;
 
-    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
+    SGPropertyNode *n;
     
     _pitch_in_node = fgGetNode("/orientation/pitch-deg", true);
     _roll_in_node = fgGetNode("/orientation/roll-deg", true);
-    _suction_node = fgGetNode(vacuum_system.c_str(), true);
+    _suction_node = fgGetNode(_suction.c_str(), true);
     SGPropertyNode *cnode = node->getChild("config", 0, true);
     _tumble_flag_node = cnode->getChild("tumble-flag", 0, true);
     _caged_node = node->getChild("caged-flag", 0, true);
     _tumble_node = node->getChild("tumble-norm", 0, true);
+    if( ( n = cnode->getChild("spin-thresh", 0, false ) ) != NULL )
+      spin_thresh = n->getDoubleValue();
+    if( ( n = cnode->getChild("max-roll-error-deg", 0, false ) ) != NULL )
+      max_roll_error = n->getDoubleValue();
+    if( ( n = cnode->getChild("max-pitch-error-deg", 0, false ) ) != NULL )
+      max_pitch_error = n->getDoubleValue();
     _pitch_int_node = node->getChild("internal-pitch-deg", 0, true);
     _roll_int_node = node->getChild("internal-roll-deg", 0, true);
     _pitch_out_node = node->getChild("indicated-pitch-deg", 0, true);
@@ -80,8 +72,8 @@ AttitudeIndicator::bind ()
 {
     std::ostringstream temp;
     string branch;
-    temp << num;
-    branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+    temp << _num;
+    branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
 
     fgTie((branch + "/serviceable").c_str(),
           &_gyro, &Gyro::is_serviceable, &Gyro::set_serviceable);
@@ -94,8 +86,8 @@ AttitudeIndicator::unbind ()
 {
     std::ostringstream temp;
     string branch;
-    temp << num;
-    branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+    temp << _num;
+    branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
 
     fgUntie((branch + "/serviceable").c_str());
     fgUntie((branch + "/spin").c_str());
@@ -162,9 +154,6 @@ AttitudeIndicator::update (double dt)
     _pitch_int_node->setDoubleValue(pitch);
 
     // add in a gyro underspin "error" if gyro is spinning too slowly
-    const double spin_thresh = 0.8;
-    const double max_roll_error = 40.0;
-    const double max_pitch_error = 12.0;
     double roll_error;
     double pitch_error;
     if ( spin <= spin_thresh ) {