fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'jmt/bulk'

Browse source
This commit is contained in:
Tim Moore 2010-02-25 12:05:07 +01:00
commit 62dfad273c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Autopilot/xmlauto.cxx
View file

@ -1002,13 +1002,13 @@ void FGXMLAutopilotGroup::init()
continue; continue;
} }
} catch (const sg_exception& e) { } catch (const sg_exception& e) {
SG_LOG( SG_ALL, SG_ALERT, "Failed to load autopilot configuration: " SG_LOG( SG_AUTOPILOT, SG_ALERT, "Failed to load autopilot configuration: "
<< config.str() << ":" << e.getMessage() ); << config.str() << ":" << e.getMessage() );
delete ap; delete ap;
continue; continue;
} }
SG_LOG( SG_ALL, SG_INFO, "adding autopilot subsystem " << apName ); SG_LOG( SG_AUTOPILOT, SG_INFO, "adding autopilot subsystem " << apName );
set_subsystem( apName, ap ); set_subsystem( apName, ap );
_autopilotNames.push_back( apName ); _autopilotNames.push_back( apName );
} }
@ -1053,7 +1053,7 @@ bool FGXMLAutopilot::build( SGPropertyNode_ptr config_props ) {
node = config_props->getChild(i); node = config_props->getChild(i);
string name = node->getName(); string name = node->getName();
// cout << name << endl; // cout << name << endl;
SG_LOG( SG_ALL, SG_INFO, "adding autopilot component " << name ); SG_LOG( SG_AUTOPILOT, SG_BULK, "adding autopilot component " << name );
if ( name == "pid-controller" ) { if ( name == "pid-controller" ) {
components.push_back( new FGPIDController( node ) ); components.push_back( new FGPIDController( node ) );
} else if ( name == "pi-simple-controller" ) { } else if ( name == "pi-simple-controller" ) {
@ -1062,9 +1062,8 @@ bool FGXMLAutopilot::build( SGPropertyNode_ptr config_props ) {
components.push_back( new FGPredictor( node ) ); components.push_back( new FGPredictor( node ) );
} else if ( name == "filter" ) { } else if ( name == "filter" ) {
components.push_back( new FGDigitalFilter( node ) ); components.push_back( new FGDigitalFilter( node ) );
// } else { } else {
// SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: " SG_LOG( SG_AUTOPILOT, SG_WARN, "Unknown top level autopilot section: " << name );
// << name );
// return false; // return false;
} }
} }