Make adf volume and adf on/off seperate properties.

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

diff --git a/src/Cockpit/radiostack.hxx b/src/Cockpit/radiostack.hxx
index 2e96c03050d98a06ed6d8740aadec56f68c6cff4..eb4c32e0a6be1c507165b0473f7314c81c49f6cb 100644 (file)
--- a/src/Cockpit/radiostack.hxx
+++ b/src/Cockpit/radiostack.hxx
@@ -38,6 +38,8 @@
 #include <Sound/beacon.hxx>
 #include <Sound/morse.hxx>
 
+#include "kr_87.hxx"            // ADF
+#include "kt_70.hxx"            // Transponder
 
 class FGRadioStack : public FGSubsystem
 {
@@ -54,6 +56,36 @@ class FGRadioStack : public FGSubsystem
 
     bool need_update;
 
+    string comm1_ident;
+    bool comm1_valid;
+    bool comm1_inrange;
+    double comm1_freq;
+    double comm1_alt_freq;
+    double comm1_vol_btn;
+    bool comm1_ident_btn;
+    double comm1_x;
+    double comm1_y;
+    double comm1_z;
+    double comm1_dist;
+    double comm1_elev;
+    double comm1_range;
+    double comm1_effective_range;
+
+    string comm2_ident;
+    bool comm2_valid;
+    bool comm2_inrange;
+    double comm2_freq;
+    double comm2_alt_freq;
+    double comm2_vol_btn;
+    bool comm2_ident_btn;
+    double comm2_x;
+    double comm2_y;
+    double comm2_z;
+    double comm2_dist;
+    double comm2_elev;
+    double comm2_range;
+    double comm2_effective_range;
+
     string nav1_ident;
     string nav1_trans_ident;
     bool nav1_valid;
@@ -146,25 +178,8 @@ class FGRadioStack : public FGSubsystem
     bool middle_blink;
     bool inner_blink;
 
-    string adf_ident;
-    string adf_trans_ident;
-    bool adf_valid;
-    bool adf_inrange;
-    double adf_freq;
-    double adf_alt_freq;
-    double adf_rotation;
-    double adf_lon;
-    double adf_lat;
-    double adf_elev;
-    double adf_range;
-    double adf_effective_range;
-    double adf_dist;
-    double adf_heading;
-    double adf_x;
-    double adf_y;
-    double adf_z;
-    double adf_vol_btn;
-    bool adf_ident_btn;
+    FGKR_87 adf;                // King KR 87 Digital ADF model
+    FGKT_70 xponder;            // Bendix/King KT 70 Panel-Mounted Transponder
 
     // model standard VOR/DME/TACAN service volumes as per AIM 1-1-8
     double adjustNavRange( double stationElev, double aircraftElev,
@@ -182,11 +197,35 @@ public:
     void init ();
     void bind ();
     void unbind ();
-    void update ();
+    void update (double dt);
 
     // Update nav/adf radios based on current postition
     void search ();
 
+    // COMM1 Setters
+    inline void set_comm1_freq( double freq ) {
+       comm1_freq = freq; need_update = true;
+    }
+    inline void set_comm1_alt_freq( double freq ) { comm1_alt_freq = freq; }
+    inline void set_comm1_vol_btn( double val ) {
+       if ( val < 0.0 ) val = 0.0;
+       if ( val > 1.0 ) val = 1.0;
+       comm1_vol_btn = val;
+    }
+    inline void set_comm1_ident_btn( bool val ) { comm1_ident_btn = val; }
+
+    // COMM2 Setters
+    inline void set_comm2_freq( double freq ) {
+       comm2_freq = freq; need_update = true;
+    }
+    inline void set_comm2_alt_freq( double freq ) { comm2_alt_freq = freq; }
+    inline void set_comm2_vol_btn( double val ) {
+       if ( val < 0.0 ) val = 0.0;
+       if ( val > 1.0 ) val = 1.0;
+       comm2_vol_btn = val;
+    }
+    inline void set_comm2_ident_btn( bool val ) { comm2_ident_btn = val; }
+
     // NAV1 Setters
     inline void set_nav1_freq( double freq ) {
        nav1_freq = freq; need_update = true;
@@ -222,19 +261,13 @@ public:
         dme_freq = freq; need_update = true;
     }
 
-    // ADF Setters
-    inline void set_adf_freq( double freq ) {
-       adf_freq = freq; need_update = true;
-    }
-    inline void set_adf_alt_freq( double freq ) { adf_alt_freq = freq; }
-    inline void set_adf_rotation( double rot ) { adf_rotation = rot; }
-    inline void set_adf_vol_btn( double val ) {
-       if ( val < 0.0 ) val = 0.0;
-       if ( val > 1.0 ) val = 1.0;
-       adf_vol_btn = val;
-    }
-    inline void set_adf_ident_btn( bool val ) { adf_ident_btn = val; }
+    // COMM1 Accessors
+    inline double get_comm1_freq () const { return comm1_freq; }
+    inline double get_comm1_alt_freq () const { return comm1_alt_freq; }
 
+    // COMM2 Accessors
+    inline double get_comm2_freq () const { return comm2_freq; }
+    inline double get_comm2_alt_freq () const { return comm2_alt_freq; }
 
     // NAV1 Accessors
     inline double get_nav1_freq () const { return nav1_freq; }
@@ -249,17 +282,20 @@ public:
     // DME Accessors
     inline double get_dme_freq () const { return dme_freq; }
 
-    // ADF Accessors
-    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; }
-
     // Marker Beacon Accessors
     inline bool get_inner_blink () const { return inner_blink; }
     inline bool get_middle_blink () const { return middle_blink; }
     inline bool get_outer_blink () const { return outer_blink; }
 
     // Calculated values.
+    inline bool get_comm1_inrange() const { return comm1_inrange; }
+    inline double get_comm1_vol_btn() const { return comm1_vol_btn; }
+    inline bool get_comm1_ident_btn() const { return comm1_ident_btn; }
+
+    inline bool get_comm2_inrange() const { return comm2_inrange; }
+    inline double get_comm2_vol_btn() const { return comm2_vol_btn; }
+    inline bool get_comm2_ident_btn() const { return comm2_ident_btn; }
+
     inline bool get_nav1_inrange() const { return nav1_inrange; }
     bool get_nav1_to_flag () const;
     bool get_nav1_from_flag () const;
@@ -314,13 +350,6 @@ public:
     inline double get_dme_dist () const { return dme_dist; }
     inline double get_dme_spd () const { return dme_spd; }
     inline double get_dme_ete () const { return dme_ete; }
-
-    inline bool get_adf_inrange() const { return adf_inrange; }
-    inline double get_adf_lon() const { return adf_lon; }
-    inline double get_adf_lat() const { return adf_lat; }
-    inline double get_adf_heading() const { return adf_heading; }
-    inline double get_adf_vol_btn() const { return adf_vol_btn; }
-    inline bool get_adf_ident_btn() const { return adf_ident_btn; }
 };