Propogate colocated dme flag.

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

diff --git a/src/Cockpit/radiostack.hxx b/src/Cockpit/radiostack.hxx
index 23701c5db51aa97668a1e19ab9b7eccd34752634..f66529e09ef9249335f2571a982a8977e318b550 100644 (file)
--- a/src/Cockpit/radiostack.hxx
+++ b/src/Cockpit/radiostack.hxx
@@ -27,37 +27,53 @@
 
 #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;
-    double nav1_selected_radial;
     double nav1_radial;
+    double nav1_sel_radial;
     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;
-    double nav2_selected_radial;
     double nav2_radial;
+    double nav2_sel_radial;
     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 );
 
@@ -81,7 +105,7 @@ public:
     }
     inline void set_nav1_alt_freq( double freq ) { nav1_alt_freq = freq; }
     inline void set_nav1_sel_radial( double radial ) {
-       nav1_selected_radial = radial; need_update = true;
+       nav1_sel_radial = radial; need_update = true;
     }
 
     // NAV2 Setters
@@ -90,7 +114,7 @@ public:
     }
     inline void set_nav2_alt_freq( double freq ) { nav2_alt_freq = freq; }
     inline void set_nav2_sel_radial( double radial ) {
-       nav2_selected_radial = radial; need_update = true;
+       nav2_sel_radial = radial; need_update = true;
     }
 
     // ADF Setters
@@ -102,39 +126,41 @@ public:
 
 
     // NAV1 Accessors
-    inline double get_nav1_freq () { return nav1_freq; }
-    inline double get_nav1_alt_freq () { return nav1_alt_freq; }
-    inline double get_nav1_sel_radial () { return nav1_selected_radial; }
+    inline double get_nav1_freq () const { return nav1_freq; }
+    inline double get_nav1_alt_freq () const { return nav1_alt_freq; }
+    inline double get_nav1_sel_radial() const { return nav1_sel_radial; }
 
     // NAV2 Accessors
-    inline double get_nav2_freq () { return nav2_freq; }
-    inline double get_nav2_alt_freq () { return nav2_alt_freq; }
-    inline double get_nav2_sel_radial () { return nav2_selected_radial; }
+    inline double get_nav2_freq () const { return nav2_freq; }
+    inline double get_nav2_alt_freq () const { return nav2_alt_freq; }
+    inline double get_nav2_sel_radial() const { return nav2_sel_radial; }
 
     // ADF Accessors
-    inline double get_adf_freq () { return adf_freq; }
-    inline double get_adf_alt_freq () { return adf_alt_freq; }
-    inline double get_adf_rotation () { return adf_rotation; }
+    inline double get_adf_freq () const { return adf_freq; }
+    inline double get_adf_alt_freq () const { return adf_alt_freq; }
+    inline double get_adf_rotation () const { return adf_rotation; }
 
     // 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_radial() const { return nav1_radial; }
     inline double get_nav1_lon() const { return nav1_lon; }
     inline double get_nav1_lat() const { return nav1_lat; }
     inline double get_nav1_elev() const { return nav1_elev; }
     inline double get_nav1_dist() const { return nav1_dist; }
     inline double get_nav1_heading() const { return nav1_heading; }
+    inline double get_nav1_radial() const { return nav1_radial; }
     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_radial() const { return nav2_radial; }
     inline double get_nav2_lon() const { return nav2_lon; }
     inline double get_nav2_lat() const { return nav2_lat; }
     inline double get_nav2_elev() const { return nav2_elev; }
     inline double get_nav2_dist() const { return nav2_dist; }
     inline double get_nav2_heading() const { return nav2_heading; }
+    inline double get_nav2_radial() const { return nav2_radial; }
     inline double get_nav2_target_gs() const { return nav2_target_gs; }
 
     inline bool get_adf_inrange() const { return adf_inrange; }
@@ -147,4 +173,8 @@ public:
 extern FGRadioStack *current_radiostack;
 
 
+// periodic radio station search wrapper
+void fgRadioSearch( void );
+
+
 #endif // _FG_RADIOSTACK_HXX