X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fattitude_indicator.cxx;h=19f6d4c708ad0d20973eabc01650603efadc4006;hb=fe0a703a192a37b96aa4f6048c8e542c24671705;hp=ca450cf661bef12e2853e9b502844848f2d1297b;hpb=d9bfd5a425df1bad7e3c53a64adce871e299a6b9;p=flightgear.git diff --git a/src/Instrumentation/attitude_indicator.cxx b/src/Instrumentation/attitude_indicator.cxx index ca450cf66..19f6d4c70 100644 --- a/src/Instrumentation/attitude_indicator.cxx +++ b/src/Instrumentation/attitude_indicator.cxx @@ -6,6 +6,10 @@ // TODO: // - better spin-up +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include @@ -18,12 +22,16 @@ #include
#include
+using std::string; AttitudeIndicator::AttitudeIndicator ( SGPropertyNode *node ) : _name(node->getStringValue("name", "attitude-indicator")), _num(node->getIntValue("number", 0)), - _suction(node->getStringValue("suction", "/systems/vacuum/suction-inhg")) + _suction(node->getStringValue("suction", "/systems/vacuum/suction-inhg")), + spin_thresh(0.8), + max_roll_error(40.0), + max_pitch_error(12.0) { } @@ -38,6 +46,7 @@ AttitudeIndicator::init () branch = "/instrumentation/" + _name; 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); @@ -46,6 +55,12 @@ AttitudeIndicator::init () _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); @@ -139,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 ) {