fly/flightgear
1
0
Fork 0
Code Activity

Make hardcoded error values configurable.

Browse source 
This patch introduces the optional elements
<config>
   <spin-thresh>0.8</spin-thresh>
   <max-roll-error-deg>40</max-roll-error-deg>
   <max-pitch-error-deg>12</max-pitch-error-deg>
</config>
under the corresponding /instrumentation/attitude-indicator element.
The values are initialized to the shown default values if omitted.
These are the values of the former hardcoded constants.
This commit is contained in:
torsten 2009-03-09 22:25:51 +00:00 • committed by Tim Moore
parent 9cc92035b1
commit 43880b201c
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Instrumentation/attitude_indicator.cxx
View file

@ -23,7 +23,10 @@ AttitudeIndicator::AttitudeIndicator ( SGPropertyNode *node )
: :
_name(node->getStringValue("name", "attitude-indicator")), _name(node->getStringValue("name", "attitude-indicator")),
_num(node->getIntValue("number", 0)), _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 +41,7 @@ AttitudeIndicator::init ()
branch = "/instrumentation/" + _name; 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); _pitch_in_node = fgGetNode("/orientation/pitch-deg", true);
_roll_in_node = fgGetNode("/orientation/roll-deg", true); _roll_in_node = fgGetNode("/orientation/roll-deg", true);
@ -46,6 +50,12 @@ AttitudeIndicator::init ()
_tumble_flag_node = cnode->getChild("tumble-flag", 0, true); _tumble_flag_node = cnode->getChild("tumble-flag", 0, true);
_caged_node = node->getChild("caged-flag", 0, true); _caged_node = node->getChild("caged-flag", 0, true);
_tumble_node = node->getChild("tumble-norm", 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); _pitch_int_node = node->getChild("internal-pitch-deg", 0, true);
_roll_int_node = node->getChild("internal-roll-deg", 0, true); _roll_int_node = node->getChild("internal-roll-deg", 0, true);
_pitch_out_node = node->getChild("indicated-pitch-deg", 0, true); _pitch_out_node = node->getChild("indicated-pitch-deg", 0, true);
@ -139,9 +149,6 @@ AttitudeIndicator::update (double dt)
_pitch_int_node->setDoubleValue(pitch); _pitch_int_node->setDoubleValue(pitch);
// add in a gyro underspin "error" if gyro is spinning too slowly // 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 roll_error;
double pitch_error; double pitch_error;
if ( spin <= spin_thresh ) { if ( spin <= spin_thresh ) {

3
src/Instrumentation/attitude_indicator.hxx
View file

@ -68,6 +68,9 @@ private:
SGPropertyNode_ptr _pitch_out_node; SGPropertyNode_ptr _pitch_out_node;
SGPropertyNode_ptr _roll_out_node; SGPropertyNode_ptr _roll_out_node;
double spin_thresh;
double max_roll_error;
double max_pitch_error;
}; };
#endif // __INSTRUMENTS_ATTITUDE_INDICATOR_HXX #endif // __INSTRUMENTS_ATTITUDE_INDICATOR_HXX