fly/flightgear
1
0
Fork 0
Code Activity

Fixed the DG heading bug hold to work with the new DG instrumentation.

Browse source 
It was slightly goofed up before by about the amount of the magnetic
variation.
This commit is contained in:
curt 2002-10-23 16:27:30 +00:00
parent 66e8d3fe65
commit 2214f540e2
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Autopilot/newauto.cxx
View file

@ -213,6 +213,9 @@ void FGAutopilot::init ()
altitude_agl_node = fgGetNode("/position/altitude-agl-ft", true); altitude_agl_node = fgGetNode("/position/altitude-agl-ft", true);
vertical_speed_node = fgGetNode("/velocities/vertical-speed-fps", true); vertical_speed_node = fgGetNode("/velocities/vertical-speed-fps", true);
heading_node = fgGetNode("/orientation/heading-deg", true); heading_node = fgGetNode("/orientation/heading-deg", true);
dg_heading_node
= fgGetNode("/instrumentation/heading-indicator/indicated-heading-deg",
true);
roll_node = fgGetNode("/orientation/roll-deg", true); roll_node = fgGetNode("/orientation/roll-deg", true);
pitch_node = fgGetNode("/orientation/pitch-deg", true); pitch_node = fgGetNode("/orientation/pitch-deg", true);
@ -484,8 +487,10 @@ FGAutopilot::update (double dt)
// heading hold // heading hold
if ( heading_hold == true ) { if ( heading_hold == true ) {
if ( heading_mode == FG_DG_HEADING_LOCK ) { if ( heading_mode == FG_DG_HEADING_LOCK ) {
TargetHeading = DGTargetHeading + double dg_error = heading_node->getDoubleValue()
globals->get_steam()->get_DG_err(); - dg_heading_node->getDoubleValue();
TargetHeading = DGTargetHeading + dg_error;
// cout << "dg_error = " << dg_error << endl;
while ( TargetHeading < 0.0 ) { TargetHeading += 360.0; } while ( TargetHeading < 0.0 ) { TargetHeading += 360.0; }
while ( TargetHeading > 360.0 ) { TargetHeading -= 360.0; } while ( TargetHeading > 360.0 ) { TargetHeading -= 360.0; }
MakeTargetHeadingStr( TargetHeading ); MakeTargetHeadingStr( TargetHeading );
@ -887,10 +892,7 @@ void FGAutopilot::set_HeadingMode( fgAutoHeadingMode mode ) {
heading_mode = mode; heading_mode = mode;
if ( heading_mode == FG_DG_HEADING_LOCK ) { if ( heading_mode == FG_DG_HEADING_LOCK ) {
// set heading hold to current heading (as read from DG) // use current heading bug value
// ... no, leave target heading along ... just use the current
// heading bug value
// DGTargetHeading = FGSteam::get_DG_deg();
} else if ( heading_mode == FG_TC_HEADING_LOCK ) { } else if ( heading_mode == FG_TC_HEADING_LOCK ) {
// set autopilot to hold a zero turn (as reported by the TC) // set autopilot to hold a zero turn (as reported by the TC)
} else if ( heading_mode == FG_TRUE_HEADING_LOCK ) { } else if ( heading_mode == FG_TRUE_HEADING_LOCK ) {

1
src/Autopilot/newauto.hxx
View file

@ -124,6 +124,7 @@ private:
SGPropertyNode *altitude_agl_node; SGPropertyNode *altitude_agl_node;
SGPropertyNode *vertical_speed_node; SGPropertyNode *vertical_speed_node;
SGPropertyNode *heading_node; SGPropertyNode *heading_node;
SGPropertyNode *dg_heading_node;
SGPropertyNode *roll_node; SGPropertyNode *roll_node;
SGPropertyNode *pitch_node; SGPropertyNode *pitch_node;