X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fradiostack.cxx;h=09986f09621f052ec3d6e1d44db55863031ee3f8;hb=fee003e8cc17f0aa9a1e9280dd823d20e231e967;hp=e29364a8c1bc5371d1570c06a6cc32950b190878;hpb=b5420977d744cc607db4a691b03a520c1ee57ae5;p=flightgear.git

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index e29364a8c..09986f096 100644
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -21,81 +21,111 @@
 // $Id$
 
 
-#include <Navaids/ilslist.hxx>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdio.h>	// snprintf
+
+#include <simgear/compiler.h>
+#include <simgear/math/sg_random.h>
+
+#include <Aircraft/aircraft.hxx>
 #include <Navaids/navlist.hxx>
 
 #include "radiostack.hxx"
 
+#include <string>
+SG_USING_STD(string);
+
 
 FGRadioStack *current_radiostack;
 
 
 // Constructor
 FGRadioStack::FGRadioStack() {
-    need_update = true;
 }
 
 
 // Destructor
-FGRadioStack::~FGRadioStack() {
+FGRadioStack::~FGRadioStack() 
+{
+    //adf.unbind();
+    //beacon.unbind();
+    navcom1.unbind();
+    navcom2.unbind();
+    //xponder.unbind();
 }
 
 
-// Update nav/adf radios based on current postition
-void FGRadioStack::update( double lon, double lat, double elev ) {
-    need_update = false;
-
-    // nav1
-    FGILS ils;
-    if ( current_ilslist->query( lon, lat, elev, nav1_freq,
-				 &ils, &nav1_heading, &nav1_dist) ) {
-	nav1_inrange = true;
-	nav1_lon = ils.get_loclon();
-	nav1_lat = ils.get_loclat();
-	nav1_elev = ils.get_gselev();
-	nav1_target_gs = ils.get_gsangle();
-	nav1_radial = ils.get_locheading();
-	// cout << "Found a vor station in range" << endl;
-	// cout << " id = " << ils.get_locident() << endl;
-	// cout << " heading = " << nav1_heading
-	//      << " dist = " << nav1_dist << endl;
-    } else {
-	nav1_inrange = false;
-	cout << "not picking up vor. :-(" << endl;
-    }
-
-    // nav1
-    FGNav nav;
-    if ( current_navlist->query( lon, lat, elev, nav2_freq,
-				 &nav, &nav2_heading, &nav2_dist) ) {
-	nav2_inrange = true;
-	nav2_lon = nav.get_lon();
-	nav2_lat = nav.get_lat();
-	nav2_elev = nav.get_elev();
-	// cout << "Found a vor station in range" << endl;
-	// cout << " id = " << nav.get_ident() << endl;
-	// cout << " heading = " << nav2_heading
-	//      << " dist = " << nav2_dist << endl;
-    } else {
-	nav2_inrange = false;
-	cout << "not picking up vor. :-(" << endl;
-    }
-
-    // adf
-    double junk;
-    if ( current_navlist->query( lon, lat, elev, adf_freq,
-				 &nav, &adf_heading, &junk) ) {
-	adf_inrange = true;
-	adf_lon = nav.get_lon();
-	adf_lat = nav.get_lat();
-	adf_elev = nav.get_elev();
-	// cout << "Found an adf station in range" << endl;
-	// cout << " id = " << nav.get_ident() << endl;
-	// cout << " heading = " << adf_heading
-	//      << " dist = " << junk << endl;
-    } else {
-	adf_inrange = false;
-	cout << "not picking up adf. :-(" << endl;
-    }
+void
+FGRadioStack::init ()
+{
+    navcom1.set_bind_index( 0 );
+    navcom1.init();
+
+    navcom2.set_bind_index( 1 );
+    navcom2.init();
+
+    //adf.init();
+    //beacon.init();
+    //xponder.init();
+
+    search();
+    update(0);			// FIXME: use dt
+
+    // Search radio database once per second
+    globals->get_event_mgr()->addTask( "fgRadioSearch()", current_radiostack,
+                                       &FGRadioStack::search, 1 );
 }
 
+
+void
+FGRadioStack::bind ()
+{
+    //adf.bind();
+    //beacon.bind();
+    //dme.bind();
+    navcom1.set_bind_index( 0 );
+    navcom1.bind();
+    navcom2.set_bind_index( 1 );
+    navcom2.bind();
+    //xponder.bind();
+}
+
+
+void
+FGRadioStack::unbind ()
+{
+    //adf.unbind();
+    //beacon.unbind();
+    //dme.unbind();
+    navcom1.unbind();
+    navcom2.unbind();
+    //xponder.unbind();
+}
+
+
+// Update the various nav values based on position and valid tuned in navs
+void 
+FGRadioStack::update(double dt) 
+{
+    //adf.update( dt );
+    //beacon.update( dt );
+    navcom1.update( dt );
+    navcom2.update( dt );
+    //dme.update( dt );           // dme is updated after the navcom's
+    //xponder.update( dt );
+}
+
+
+// Update current nav/adf radio stations based on current postition
+void FGRadioStack::search() 
+{
+    //adf.search();
+    //beacon.search();
+    navcom1.search();
+    navcom2.search();
+    //dme.search();
+    //xponder.search();
+}