fly/flightgear
1
0
Fork 0
Code Activity

Fix the has-gs flag when switching to a VOR (thanks Torsten), and expose GS validity via a new gs-in-range boolean prop, as suggested by John Denker.

Browse source
This commit is contained in:
jmt 2009-09-14 21:53:55 +00:00 committed by Tim Moore
parent d11ad100cc
commit a650cf4239
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Instrumentation/navradio.cxx
View file

@ -120,6 +120,7 @@ FGNavRadio::FGNavRadio(SGPropertyNode *node) :
gs_deflection_norm_node(NULL), gs_deflection_norm_node(NULL),
gs_rate_of_climb_node(NULL), gs_rate_of_climb_node(NULL),
gs_dist_node(NULL), gs_dist_node(NULL),
gs_inrange_node(NULL),
nav_id_node(NULL), nav_id_node(NULL),
id_c1_node(NULL), id_c1_node(NULL),
id_c2_node(NULL), id_c2_node(NULL),
@ -232,6 +233,8 @@ FGNavRadio::init ()
gs_deflection_norm_node = node->getChild("gs-needle-deflection-norm", 0, true); gs_deflection_norm_node = node->getChild("gs-needle-deflection-norm", 0, true);
gs_rate_of_climb_node = node->getChild("gs-rate-of-climb", 0, true); gs_rate_of_climb_node = node->getChild("gs-rate-of-climb", 0, true);
gs_dist_node = node->getChild("gs-distance", 0, true); gs_dist_node = node->getChild("gs-distance", 0, true);
gs_inrange_node = node->getChild("gs-in-range", 0, true);
nav_id_node = node->getChild("nav-id", 0, true); nav_id_node = node->getChild("nav-id", 0, true);
id_c1_node = node->getChild("nav-id_asc1", 0, true); id_c1_node = node->getChild("nav-id_asc1", 0, true);
id_c2_node = node->getChild("nav-id_asc2", 0, true); id_c2_node = node->getChild("nav-id_asc2", 0, true);
@ -255,20 +258,12 @@ FGNavRadio::init ()
void void
FGNavRadio::bind () FGNavRadio::bind ()
{ {
std::ostringstream temp;
string branch;
temp << _num;
branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
} }
void void
FGNavRadio::unbind () FGNavRadio::unbind ()
{ {
std::ostringstream temp;
string branch;
temp << _num;
branch = "/instrumentation/" + _name + "[" + temp.str() + "]";
} }
@ -382,6 +377,7 @@ void FGNavRadio::clearOutputs()
gs_deflection_node->setDoubleValue( 0.0 ); gs_deflection_node->setDoubleValue( 0.0 );
gs_deflection_deg_node->setDoubleValue(0.0); gs_deflection_deg_node->setDoubleValue(0.0);
gs_deflection_norm_node->setDoubleValue(0.0); gs_deflection_norm_node->setDoubleValue(0.0);
gs_inrange_node->setBoolValue( false );
to_flag_node->setBoolValue( false ); to_flag_node->setBoolValue( false );
from_flag_node->setBoolValue( false ); from_flag_node->setBoolValue( false );
@ -532,12 +528,16 @@ void FGNavRadio::updateGlideSlope(double dt, const SGVec3d& aircraft, double sig
_gsNeedleDeflection = 0.0; _gsNeedleDeflection = 0.0;
if (!_gs || !inrange_node->getBoolValue()) { if (!_gs || !inrange_node->getBoolValue()) {
gs_dist_node->setDoubleValue( 0.0 ); gs_dist_node->setDoubleValue( 0.0 );
gs_inrange_node->setBoolValue(false);
return; return;
} }
double gsDist = dist(aircraft, _gsCart); double gsDist = dist(aircraft, _gsCart);
gs_dist_node->setDoubleValue(gsDist); gs_dist_node->setDoubleValue(gsDist);
if (gsDist > (_gs->get_range() * SG_NM_TO_METER)) { bool gsInRange = (gsDist < (_gs->get_range() * SG_NM_TO_METER));
gs_inrange_node->setBoolValue(gsInRange);
if (!gsInRange) {
return; return;
} }
@ -800,10 +800,11 @@ void FGNavRadio::search()
if (nav->type() == FGPositioned::VOR) { if (nav->type() == FGPositioned::VOR) {
target_radial = sel_radial_node->getDoubleValue(); target_radial = sel_radial_node->getDoubleValue();
_gs = NULL; _gs = NULL;
has_gs_node->setBoolValue(false);
} else { // ILS or LOC } else { // ILS or LOC
_gs = globals->get_gslist()->findByFreq(freq, pos); _gs = globals->get_gslist()->findByFreq(freq, pos);
_localizerWidth = localizerWidth(nav);
has_gs_node->setBoolValue(_gs != NULL); has_gs_node->setBoolValue(_gs != NULL);
_localizerWidth = localizerWidth(nav);
twist = 0.0; twist = 0.0;
effective_range = nav->get_range(); effective_range = nav->get_range();

1
src/Instrumentation/navradio.hxx
View file

@ -101,6 +101,7 @@ class FGNavRadio : public SGSubsystem
SGPropertyNode_ptr gs_deflection_norm_node; SGPropertyNode_ptr gs_deflection_norm_node;
SGPropertyNode_ptr gs_rate_of_climb_node; SGPropertyNode_ptr gs_rate_of_climb_node;
SGPropertyNode_ptr gs_dist_node; SGPropertyNode_ptr gs_dist_node;
SGPropertyNode_ptr gs_inrange_node;
SGPropertyNode_ptr nav_id_node; SGPropertyNode_ptr nav_id_node;
SGPropertyNode_ptr id_c1_node; SGPropertyNode_ptr id_c1_node;
SGPropertyNode_ptr id_c2_node; SGPropertyNode_ptr id_c2_node;