X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fadf.cxx;h=053812a0df61c6a4845a545458b3fc03c3f72074;hb=43880b201cea2b120fefd99696ae0b43227358dc;hp=83757887dbb10e07941bf73f8f2b2089553467fa;hpb=57971cbd9bbf49e0b219871e99cb0d1b1f7f2a2c;p=flightgear.git

diff --git a/src/Instrumentation/adf.cxx b/src/Instrumentation/adf.cxx
index 83757887d..053812a0d 100644
--- a/src/Instrumentation/adf.cxx
+++ b/src/Instrumentation/adf.cxx
@@ -3,9 +3,14 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
+#include <simgear/timing/sg_time.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
@@ -13,6 +18,10 @@
 
 #include "adf.hxx"
 
+#include <iostream>
+#include <string>
+#include <sstream>
+
 
 // Use a bigger number to be more responsive, or a smaller number
 // to be more sluggish.
@@ -48,15 +57,19 @@ adjust_range (double transmitter_elevation_ft, double aircraft_altitude_ft,
 }
 
 
-ADF::ADF ()
-    : _time_before_search_sec(0),
-      _last_frequency_khz(-1),
-      _transmitter_valid(false),
-      _transmitter_elevation_ft(0),
-      _transmitter_range_nm(0),
-      _ident_count(0),
-      _last_ident_time(0),
-      _last_volume(-1)
+ADF::ADF (SGPropertyNode *node )
+    :
+    _name(node->getStringValue("name", "adf")),
+    _num(node->getIntValue("number", 0)),
+    _time_before_search_sec(0),
+    _last_frequency_khz(-1),
+    _transmitter_valid(false),
+    _transmitter_pos(SGGeod::fromDeg(0, 0)),
+    _transmitter_cart(0, 0, 0),
+    _transmitter_range_nm(0),
+    _ident_count(0),
+    _last_ident_time(0),
+    _last_volume(-1)
 {
 }
 
@@ -67,32 +80,40 @@ ADF::~ADF ()
 void
 ADF::init ()
 {
+    string branch;
+    branch = "/instrumentation/" + _name;
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
     _longitude_node = fgGetNode("/position/longitude-deg", true);
     _latitude_node = fgGetNode("/position/latitude-deg", true);
     _altitude_node = fgGetNode("/position/altitude-ft", true);
     _heading_node = fgGetNode("/orientation/heading-deg", true);
-    _serviceable_node = fgGetNode("/instrumentation/adf/serviceable", true);
-    _error_node = fgGetNode("/instrumentation/adf/error-deg", true);
+    _serviceable_node = node->getChild("serviceable", 0, true);
+    _error_node = node->getChild("error-deg", 0, true);
     _electrical_node = fgGetNode("/systems/electrical/outputs/adf", true);
-    _frequency_node =
-        fgGetNode("/instrumentation/adf/frequencies/selected-khz", true);
-    _mode_node = fgGetNode("/instrumentation/adf/mode", true);
-
-    _in_range_node = fgGetNode("/instrumentation/adf/in-range", true);
-    _bearing_node =
-        fgGetNode("/instrumentation/adf/indicated-bearing-deg", true);
-    _ident_node = fgGetNode("/instrumentation/adf/ident", true);
-    _volume_node = fgGetNode("/instrumentation/adf/volume-norm", true);
-    _ident_audible_node = fgGetNode("/instrumentation/adf/ident-audible", true);
+    branch = branch + "/frequencies";
+    SGPropertyNode *fnode = node->getChild("frequencies", 0, true);
+    _frequency_node = fnode->getChild("selected-khz", 0, true);
+    _mode_node = node->getChild("mode", 0, true);
+    _volume_node = node->getChild("volume-norm", 0, true);
+    _in_range_node = node->getChild("in-range", 0, true);
+    _bearing_node = node->getChild("indicated-bearing-deg", 0, true);
+    _ident_node = node->getChild("ident", 0, true);
+    _ident_audible_node = node->getChild("ident-audible", 0, true);
+
     morse.init();
+
+    std::ostringstream temp;
+    temp << _name << _num;
+    _adf_ident = temp.str();
 }
 
 void
 ADF::update (double delta_time_sec)
 {
                                 // If it's off, don't waste any time.
-    if (!_electrical_node->getBoolValue() ||
-        !_serviceable_node->getBoolValue()) {
+    if (_electrical_node->getDoubleValue() < 1.0
+            || !_serviceable_node->getBoolValue()) {
         set_bearing(delta_time_sec, 90);
         _ident_node->setStringValue("");
         return;
@@ -128,11 +149,11 @@ ADF::update (double delta_time_sec)
     }
 
                                 // Calculate the bearing to the transmitter
-    Point3D location =
-        sgGeodToCart(Point3D(longitude_rad, latitude_rad, altitude_m));
-
-    double distance_nm = _transmitter.distance3D(location) * SG_METER_TO_NM;
-    double range_nm = adjust_range(_transmitter_elevation_ft,
+    SGGeod geod = SGGeod::fromRadM(longitude_rad, latitude_rad, altitude_m);
+    SGVec3d location = SGVec3d::fromGeod(geod);
+    
+    double distance_nm = dist(_transmitter_cart, location) * SG_METER_TO_NM;
+    double range_nm = adjust_range(_transmitter_pos.getElevationFt(),
                                    altitude_m * SG_METER_TO_FEET,
                                    _transmitter_range_nm);
     if (distance_nm <= range_nm) {
@@ -140,11 +161,7 @@ ADF::update (double delta_time_sec)
         double bearing, az2, s;
         double heading = _heading_node->getDoubleValue();
 
-        geo_inverse_wgs_84(altitude_m,
-                           latitude_deg,
-                           longitude_deg,
-                           _transmitter_lat_deg,
-                           _transmitter_lon_deg,
+        geo_inverse_wgs_84(geod, _transmitter_pos,
                            &bearing, &az2, &s);
         _in_range_node->setBoolValue(true);
 
@@ -164,7 +181,7 @@ ADF::update (double delta_time_sec)
             _last_volume = volume;
 
             SGSoundSample *sound;
-            sound = globals->get_soundmgr()->find( "adf-ident" );
+            sound = globals->get_soundmgr()->find( _adf_ident );
             if ( sound != NULL )
                 sound->set_volume( volume );
             else
@@ -178,8 +195,8 @@ ADF::update (double delta_time_sec)
         }
 
         if ( _ident_count < 4 ) {
-            if ( !globals->get_soundmgr()->is_playing("adf-ident") ) {
-                globals->get_soundmgr()->play_once( "adf-ident" );
+            if ( !globals->get_soundmgr()->is_playing(_adf_ident) ) {
+                globals->get_soundmgr()->play_once( _adf_ident );
                 ++_ident_count;
             }
         }
@@ -187,7 +204,7 @@ ADF::update (double delta_time_sec)
         _in_range_node->setBoolValue(false);
         set_bearing(delta_time_sec, 90);
         _ident_node->setStringValue("");
-        globals->get_soundmgr()->stop( "adf-ident" );
+        globals->get_soundmgr()->stop( _adf_ident );
     }
 }
 
@@ -200,18 +217,15 @@ ADF::search (double frequency_khz, double longitude_rad,
     _time_before_search_sec = 1.0;
 
                                 // try the ILS list first
-    FGNavRecord *nav =
-        globals->get_navlist()->findByFreq(frequency_khz, longitude_rad,
-                                           latitude_rad, altitude_m);
+    FGNavRecord *nav = globals->get_navlist()->findByFreq(frequency_khz,
+      SGGeod::fromRadM(longitude_rad, latitude_rad, altitude_m));
 
     _transmitter_valid = (nav != NULL);
     if ( _transmitter_valid ) {
         ident = nav->get_trans_ident();
         if ( ident != _last_ident ) {
-            _transmitter_lon_deg = nav->get_lon();
-            _transmitter_lat_deg = nav->get_lat();
-            _transmitter = Point3D(nav->get_x(), nav->get_y(), nav->get_z());
-            _transmitter_elevation_ft = nav->get_elev_ft();
+            _transmitter_pos = nav->geod();
+            _transmitter_cart = nav->cart();
             _transmitter_range_nm = nav->get_range();
         }
     }
@@ -220,16 +234,16 @@ ADF::search (double frequency_khz, double longitude_rad,
         _last_ident = ident;
         _ident_node->setStringValue(ident.c_str());
 
-        if ( globals->get_soundmgr()->exists( "adf-ident" ) ) {
-            // stop is required! -- remove alone wouldn't stop immediately
-            globals->get_soundmgr()->stop( "adf-ident" );
-            globals->get_soundmgr()->remove( "adf-ident" );
+        if ( globals->get_soundmgr()->exists( _adf_ident ) ) {
+	    // stop is required! -- remove alone wouldn't stop immediately
+            globals->get_soundmgr()->stop( _adf_ident );
+            globals->get_soundmgr()->remove( _adf_ident );
         }
 
         SGSoundSample *sound;
         sound = morse.make_ident( ident, LO_FREQUENCY );
         sound->set_volume(_last_volume = 0);
-        globals->get_soundmgr()->add( sound, "adf-ident" );
+        globals->get_soundmgr()->add( sound, _adf_ident );
 
         int offset = (int)(sg_random() * 30.0);
         _ident_count = offset / 4;
@@ -243,13 +257,11 @@ ADF::set_bearing (double dt, double bearing_deg)
 {
     double old_bearing_deg = _bearing_node->getDoubleValue();
 
-    bearing_deg += _error_node->getDoubleValue();
-
     while ((bearing_deg - old_bearing_deg) >= 180)
         old_bearing_deg += 360;
     while ((bearing_deg - old_bearing_deg) <= -180)
         old_bearing_deg -= 360;
-
+    bearing_deg += _error_node->getDoubleValue();
     bearing_deg =
         fgGetLowPass(old_bearing_deg, bearing_deg, dt * RESPONSIVENESS);