Tweaks for Mips Irix compilers.

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

diff --git a/src/Cockpit/radiostack.hxx b/src/Cockpit/radiostack.hxx
index 3d05e4bb6df004a917e6bbb1975c18795ec6afb4..c2031790322f9a2ffc9de23e89dbbd0fe9c6368d 100644 (file)
--- a/src/Cockpit/radiostack.hxx
+++ b/src/Cockpit/radiostack.hxx
@@ -25,19 +25,29 @@
 #define _FG_RADIOSTACK_HXX
 
 
+#include <Main/fgfs.hxx>
+#include <Main/fg_props.hxx>
+
 #include <simgear/compiler.h>
 
 #include <Navaids/ilslist.hxx>
 #include <Navaids/navlist.hxx>
 
 
-class FGRadioStack {
+
+class FGRadioStack : public FGSubsystem
+{
+
+    SGValue * latitudeVal;
+    SGValue * longitudeVal;
+    SGValue * altitudeVal;
 
     bool need_update;
 
     bool nav1_valid;
     bool nav1_inrange;
-    bool nav1_dme;
+    bool nav1_has_dme;
+    bool nav1_has_gs;
     bool nav1_loc;
     double nav1_freq;
     double nav1_alt_freq;
@@ -45,6 +55,10 @@ class FGRadioStack {
     double nav1_sel_radial;
     double nav1_loclon;
     double nav1_loclat;
+    double nav1_x;
+    double nav1_y;
+    double nav1_z;
+    double nav1_loc_dist;
     double nav1_gslon;
     double nav1_gslat;
     double nav1_gs_x;
@@ -61,10 +75,12 @@ class FGRadioStack {
     double nav1_effective_range;
     double nav1_heading;
     double nav1_target_gs;
+    double nav1_magvar;
 
     bool nav2_valid;
     bool nav2_inrange;
-    bool nav2_dme;
+    bool nav2_has_dme;
+    bool nav2_has_gs;
     bool nav2_loc;
     double nav2_freq;
     double nav2_alt_freq;
@@ -72,6 +88,10 @@ class FGRadioStack {
     double nav2_sel_radial;
     double nav2_loclon;
     double nav2_loclat;
+    double nav2_x;
+    double nav2_y;
+    double nav2_z;
+    double nav2_loc_dist;
     double nav2_gslon;
     double nav2_gslat;
     double nav2_gs_x;
@@ -88,6 +108,7 @@ class FGRadioStack {
     double nav2_effective_range;
     double nav2_heading;
     double nav2_target_gs;
+    double nav2_magvar;
 
     bool adf_valid;
     bool adf_inrange;
@@ -109,11 +130,13 @@ public:
     FGRadioStack();
     ~FGRadioStack();
 
-    // Update nav/adf radios based on current postition
-    void search( double lon, double lat, double elev );
+    void init ();
+    void bind ();
+    void unbind ();
+    void update ();
 
     // Update nav/adf radios based on current postition
-    void update( double lon, double lat, double elev );
+    void search ();
 
     // NAV1 Setters
     inline void set_nav1_freq( double freq ) {
@@ -158,10 +181,17 @@ public:
 
     // Calculated values.
     inline bool get_nav1_inrange() const { return nav1_inrange; }
-    inline bool get_nav1_dme() const { return nav1_dme; }
+    bool get_nav1_to_flag () const;
+    bool get_nav1_from_flag () const;
+    inline bool get_nav1_has_dme() const { return nav1_has_dme; }
+    inline bool get_nav1_dme_inrange () const {
+       return nav1_inrange && nav1_has_dme;
+    }
+    inline bool get_nav1_has_gs() const { return nav1_has_gs; }
     inline bool get_nav1_loc() const { return nav1_loc; }
     inline double get_nav1_loclon() const { return nav1_loclon; }
     inline double get_nav1_loclat() const { return nav1_loclat; }
+    inline double get_nav1_loc_dist() const { return nav1_loc_dist; }
     inline double get_nav1_gslon() const { return nav1_gslon; }
     inline double get_nav1_gslat() const { return nav1_gslat; }
     inline double get_nav1_gs_dist() const { return nav1_gs_dist; }
@@ -172,12 +202,22 @@ public:
     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 double get_nav1_magvar() const { return nav1_magvar; }
+    double get_nav1_heading_needle_deflection() const;
+    double get_nav1_gs_needle_deflection() const;
 
     inline bool get_nav2_inrange() const { return nav2_inrange; }
-    inline bool get_nav2_dme() const { return nav2_dme; }
+    bool get_nav2_to_flag () const;
+    bool get_nav2_from_flag () const;
+    inline bool get_nav2_has_dme() const { return nav2_has_dme; }
+    inline bool get_nav2_dme_inrange () const {
+       return nav2_inrange && nav2_has_dme;
+    }
+    inline bool get_nav2_has_gs() const { return nav2_has_gs; }
     inline bool get_nav2_loc() const { return nav2_loc; }
     inline double get_nav2_loclon() const { return nav2_loclon; }
     inline double get_nav2_loclat() const { return nav2_loclat; }
+    inline double get_nav2_loc_dist() const { return nav2_loc_dist; }
     inline double get_nav2_gslon() const { return nav2_gslon; }
     inline double get_nav2_gslat() const { return nav2_gslat; }
     inline double get_nav2_gs_dist() const { return nav2_gs_dist; }
@@ -188,6 +228,9 @@ public:
     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 double get_nav2_magvar() const { return nav2_magvar; }
+    double get_nav2_heading_needle_deflection() const;
+    double get_nav2_gs_needle_deflection() const;
 
     inline bool get_adf_inrange() const { return adf_inrange; }
     inline double get_adf_lon() const { return adf_lon; }
@@ -198,9 +241,4 @@ public:
 
 extern FGRadioStack *current_radiostack;
 
-
-// periodic radio station search wrapper
-void fgRadioSearch( void );
-
-
 #endif // _FG_RADIOSTACK_HXX