last_x(0.0),
last_loc_dist(0.0),
last_xtrack_error(0.0),
- name("nav"),
- num(0),
+ _name(node->getStringValue("name", "nav")),
+ _num(node->getIntValue("number", 0)),
_time_before_search_sec(-1.0)
{
SGPath path( globals->get_fg_root() );
term_tbl = new SGInterpTable( term.str() );
low_tbl = new SGInterpTable( low.str() );
high_tbl = new SGInterpTable( high.str() );
-
- 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 = child->getIntValue();
- } else {
- SG_LOG( SG_INSTR, SG_WARN,
- "Error in nav radio config logic" );
- if ( name.length() ) {
- SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
- }
- }
- }
-
}
morse.init();
string branch;
- branch = "/instrumentation/" + name;
+ branch = "/instrumentation/" + _name;
- SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+ SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
bus_power_node =
- fgGetNode(("/systems/electrical/outputs/" + name).c_str(), true);
+ fgGetNode(("/systems/electrical/outputs/" + _name).c_str(), true);
// inputs
is_valid_node = node->getChild("data-is-valid", 0, true);
gps_from_flag_node = fgGetNode("/instrumentation/gps/from-flag", true);
std::ostringstream temp;
- temp << name << "nav-ident" << num;
+ temp << _name << "nav-ident" << _num;
nav_fx_name = temp.str();
- temp << name << "dme-ident" << num;
+ temp << _name << "dme-ident" << _num;
dme_fx_name = temp.str();
}
{
std::ostringstream temp;
string branch;
- temp << num;
- branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+ temp << _num;
+ branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
}
{
std::ostringstream temp;
string branch;
- temp << num;
- branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+ temp << _num;
+ branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
}
//////////////////////////////////////////////////////////
// compute to/from flag status
//////////////////////////////////////////////////////////
- double value = false;
+ bool value = false;
double offset = fabs(radial - target_radial);
if ( tofrom_serviceable ) {
if ( nav_slaved_to_gps_node->getBoolValue() ) {
target_radial = 0;
trans_ident = "";
last_nav_id = "";
- if ( ! globals->get_soundmgr()->remove( nav_fx_name ) ) {
- SG_LOG(SG_COCKPIT, SG_WARN, "Failed to remove nav-vor-ident sound");
- }
+ globals->get_soundmgr()->remove( nav_fx_name );
globals->get_soundmgr()->remove( dme_fx_name );
- // cout << "not picking up vor1. :-(" << endl;
}
is_valid_node->setBoolValue( is_valid );