GPWS: avoid "altitude_callout_voice != NULL" assertion

[flightgear.git] / src / Instrumentation / navradio.cxx

diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index 2aac4b26d1cc4fbdd2c0db4a64c9544f110c2bca..4be95c41600e04ae70b328c9170e48e8c342f970 100644 (file)
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -92,21 +92,37 @@ SGPropertyNode_ptr createServiceableProp(SGPropertyNode* aParent, const char* aN
 
 // Constructor
 FGNavRadio::FGNavRadio(SGPropertyNode *node) :
+    term_tbl(NULL),
+    low_tbl(NULL),
+    high_tbl(NULL),
     lon_node(fgGetNode("/position/longitude-deg", true)),
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
+    _operable(false),
     play_count(0),
     last_time(0),
     target_radial(0.0),
+    effective_range(0.0),
+    target_gs(0.0),
+    twist(0.0),
     horiz_vel(0.0),
     last_x(0.0),
-    last_loc_dist(0.0),
     last_xtrack_error(0.0),
     xrate_ms(0.0),
     _localizerWidth(5.0),
     _name(node->getStringValue("name", "nav")),
     _num(node->getIntValue("number", 0)),
     _time_before_search_sec(-1.0),
+    _gsCart(SGVec3d::zeros()),
+    _gsAxis(SGVec3d::zeros()),
+    _gsVertical(SGVec3d::zeros()),
+    _dmeInRange(false),
+    _toFlag(false),
+    _fromFlag(false),
+    _cdiDeflection(0.0),
+    _cdiCrossTrackErrorM(0.0),
+    _gsNeedleDeflection(0.0),
+    _gsNeedleDeflectionNorm(0.0),
     _sgr(NULL)
 {
     SGPath path( globals->get_fg_root() );
@@ -120,8 +136,7 @@ FGNavRadio::FGNavRadio(SGPropertyNode *node) :
     term_tbl = new SGInterpTable( term.str() );
     low_tbl = new SGInterpTable( low.str() );
     high_tbl = new SGInterpTable( high.str() );
-    
-    
+
     string branch("/instrumentation/" + _name);
     _radio_node = fgGetNode(branch.c_str(), _num, true);
 }
@@ -356,12 +371,7 @@ FGNavRadio::update(double dt)
       && nav_serviceable_node->getBoolValue() )
   {
     _operable = true;
-    if (nav_slaved_to_gps_node->getBoolValue()) {
-      updateGPSSlaved();
-    } else {
-      updateReceiver(dt);
-    }
-    
+    updateReceiver(dt);
     updateCDI(dt);
   } else {
     clearOutputs();
@@ -373,11 +383,13 @@ FGNavRadio::update(double dt)
 void FGNavRadio::clearOutputs()
 {
   inrange_node->setBoolValue( false );
+  signal_quality_norm_node->setDoubleValue( 0.0 );
   cdi_deflection_node->setDoubleValue( 0.0 );
   cdi_deflection_norm_node->setDoubleValue( 0.0 );
   cdi_xtrack_error_node->setDoubleValue( 0.0 );
   cdi_xtrack_hdg_err_node->setDoubleValue( 0.0 );
   time_to_intercept->setDoubleValue( 0.0 );
+  heading_node->setDoubleValue(0.0);
   gs_deflection_node->setDoubleValue( 0.0 );
   gs_deflection_deg_node->setDoubleValue(0.0);
   gs_deflection_norm_node->setDoubleValue(0.0);
@@ -387,6 +399,8 @@ void FGNavRadio::clearOutputs()
   
   to_flag_node->setBoolValue( false );
   from_flag_node->setBoolValue( false );
+  is_valid_node->setBoolValue(false);
+  nav_id_node->setStringValue("");
   
   _dmeInRange = false;
   _operable = false;
@@ -395,6 +409,12 @@ void FGNavRadio::clearOutputs()
 
 void FGNavRadio::updateReceiver(double dt)
 {
+  SGGeod pos = SGGeod::fromDegFt(lon_node->getDoubleValue(),
+                               lat_node->getDoubleValue(),
+                               alt_node->getDoubleValue());
+  SGVec3d aircraft = SGVec3d::fromGeod(pos);
+  double loc_dist = 0;
+
   // Do a nav station search only once a second to reduce
   // unnecessary work. (Also, make sure to do this before caching
   // any values!)
@@ -403,24 +423,33 @@ void FGNavRadio::updateReceiver(double dt)
    search();
   }
 
+  if (_navaid)
+  {
+      loc_dist = dist(aircraft, _navaid->cart());
+      loc_dist_node->setDoubleValue( loc_dist );
+  }
+  updateDME(aircraft);
+
+  if (nav_slaved_to_gps_node->getBoolValue()) {
+    // when slaved to GPS: only allow stuff above: tune NAV station
+    // upate DME. All other data driven by GPS only.
+    updateGPSSlaved();
+    return;
+  }
+
   if (!_navaid) {
     _cdiDeflection = 0.0;
     _cdiCrossTrackErrorM = 0.0;
     _toFlag = _fromFlag = false;
     _gsNeedleDeflection = 0.0;
     _gsNeedleDeflectionNorm = 0.0;
+    heading_node->setDoubleValue(0.0);
     inrange_node->setBoolValue(false);
     return;
   }
 
-  SGGeod pos = SGGeod::fromDegFt(lon_node->getDoubleValue(),
-                               lat_node->getDoubleValue(),
-                               alt_node->getDoubleValue());
-                               
   double nav_elev = _navaid->get_elev_ft();
-  SGVec3d aircraft = SGVec3d::fromGeod(pos);
-  double loc_dist = dist(aircraft, _navaid->cart());
-  loc_dist_node->setDoubleValue( loc_dist );
+
   bool is_loc = loc_node->getBoolValue();
   double signal_quality_norm = signal_quality_norm_node->getDoubleValue();
   
@@ -545,9 +574,6 @@ void FGNavRadio::updateReceiver(double dt)
   _cdiCrossTrackErrorM = loc_dist * sin(r * SGD_DEGREES_TO_RADIANS);
   
   updateGlideSlope(dt, aircraft, signal_quality_norm);
-  updateDME(aircraft);
-  
-  last_loc_dist = loc_dist;
 }
 
 void FGNavRadio::updateGlideSlope(double dt, const SGVec3d& aircraft, double signal_quality_norm)
@@ -653,9 +679,13 @@ void FGNavRadio::valueChanged (SGPropertyNode* prop)
     }
   } else if (prop == nav_slaved_to_gps_node) {
     if (prop->getBoolValue()) {
-      // slaved-to-GPS activated, sync up selected course
+      // slaved-to-GPS activated, clear obsolete NAV outputs and sync up selected course
+      clearOutputs();
       sel_radial_node->setDoubleValue(gps_course_node->getDoubleValue());
     }
+    // slave-to-GPS enabled/disabled, resync NAV station (update all outputs)
+    _navaid = NULL;
+    _time_before_search_sec = 0;
   }
 }
 
@@ -673,6 +703,7 @@ void FGNavRadio::updateGPSSlaved()
     _cdiDeflection = 0.0;
     _cdiCrossTrackErrorM = 0.0;
     _gsNeedleDeflection = 0.0;
+    _gsNeedleDeflectionNorm = 0.0;
     return;
   }