More magvar fixes relating to vor/ils.

[flightgear.git] / src / Cockpit / radiostack.hxx

diff --git a/src/Cockpit/radiostack.hxx b/src/Cockpit/radiostack.hxx
index 41129d08fef03672902df60f2f090c06cb683bfa..f66529e09ef9249335f2571a982a8977e318b550 100644 (file)
--- a/src/Cockpit/radiostack.hxx
+++ b/src/Cockpit/radiostack.hxx
@@ -27,12 +27,17 @@
 
 #include <simgear/compiler.h>
 
+#include <Navaids/ilslist.hxx>
+#include <Navaids/navlist.hxx>
+
 
 class FGRadioStack {
 
     bool need_update;
 
+    bool nav1_valid;
     bool nav1_inrange;
+    bool nav1_dme;
     bool nav1_loc;
     double nav1_freq;
     double nav1_alt_freq;
@@ -41,11 +46,17 @@ class FGRadioStack {
     double nav1_lon;
     double nav1_lat;
     double nav1_elev;
+    double nav1_effective_range;
     double nav1_dist;
     double nav1_heading;
     double nav1_target_gs;
+    double nav1_x;
+    double nav1_y;
+    double nav1_z;
 
+    bool nav2_valid;
     bool nav2_inrange;
+    bool nav2_dme;
     bool nav2_loc;
     double nav2_freq;
     double nav2_alt_freq;
@@ -54,10 +65,15 @@ class FGRadioStack {
     double nav2_lon;
     double nav2_lat;
     double nav2_elev;
+    double nav2_effective_range;
     double nav2_dist;
     double nav2_heading;
     double nav2_target_gs;
+    double nav2_x;
+    double nav2_y;
+    double nav2_z;
 
+    bool adf_valid;
     bool adf_inrange;
     double adf_freq;
     double adf_alt_freq;
@@ -65,13 +81,21 @@ class FGRadioStack {
     double adf_lon;
     double adf_lat;
     double adf_elev;
+    double adf_effective_range;
+    double adf_dist;
     double adf_heading;
+    double adf_x;
+    double adf_y;
+    double adf_z;
 
 public:
 
     FGRadioStack();
     ~FGRadioStack();
 
+    // Update nav/adf radios based on current postition
+    void search( double lon, double lat, double elev );
+
     // Update nav/adf radios based on current postition
     void update( double lon, double lat, double elev );
 
@@ -118,6 +142,7 @@ public:
 
     // Calculated values.
     inline bool get_nav1_inrange() const { return nav1_inrange; }
+    inline bool get_nav1_dme() const { return nav1_dme; }
     inline bool get_nav1_loc() const { return nav1_loc; }
     inline double get_nav1_lon() const { return nav1_lon; }
     inline double get_nav1_lat() const { return nav1_lat; }
@@ -128,6 +153,7 @@ public:
     inline double get_nav1_target_gs() const { return nav1_target_gs; }
 
     inline bool get_nav2_inrange() const { return nav2_inrange; }
+    inline bool get_nav2_dme() const { return nav2_dme; }
     inline bool get_nav2_loc() const { return nav2_loc; }
     inline double get_nav2_lon() const { return nav2_lon; }
     inline double get_nav2_lat() const { return nav2_lat; }
@@ -147,4 +173,8 @@ public:
 extern FGRadioStack *current_radiostack;
 
 
+// periodic radio station search wrapper
+void fgRadioSearch( void );
+
+
 #endif // _FG_RADIOSTACK_HXX