Vivian MEAZZA:

[flightgear.git] / src / Instrumentation / navradio.hxx

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 328105d11323eb8456c5f7df06b61907eb30615a..7eb2817f5c5de20dc37210f904d16825a339246f 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -49,6 +49,8 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode *bus_power_node;
 
     // property inputs
+    SGPropertyNode *is_valid_node;   // is station data valid (may be way out
+                                     // of range.)
     SGPropertyNode *power_btn_node;
     SGPropertyNode *freq_node;       // primary freq
     SGPropertyNode *alt_freq_node;   // standby freq
@@ -75,18 +77,23 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode *target_radial_true_node;
                                        // true heading of selected radial
     SGPropertyNode *target_auto_hdg_node;
+                                       // suggested autopilot heading
+                                       // to intercept selected radial
+    SGPropertyNode *time_to_intercept; // estimated time to intecept selected
+                                       // radial at current speed and heading
     SGPropertyNode *to_flag_node;
     SGPropertyNode *from_flag_node;
     SGPropertyNode *inrange_node;
     SGPropertyNode *cdi_deflection_node;
     SGPropertyNode *cdi_xtrack_error_node;
+    SGPropertyNode *cdi_xtrack_hdg_err_node;
     SGPropertyNode *has_gs_node;
     SGPropertyNode *loc_node;
     SGPropertyNode *loc_dist_node;
     SGPropertyNode *gs_deflection_node;
     SGPropertyNode *gs_rate_of_climb_node;
     SGPropertyNode *gs_dist_node;
-    SGPropertyNode *id_node;
+    SGPropertyNode *nav_id_node;
     SGPropertyNode *id_c1_node;
     SGPropertyNode *id_c2_node;
     SGPropertyNode *id_c3_node;
@@ -100,7 +107,7 @@ class FGNavRadio : public SGSubsystem
 
     // internal (private) values
 
-    string last_id;
+    string last_nav_id;
     bool last_nav_vor;
     int play_count;
     time_t last_time;
@@ -112,6 +119,7 @@ class FGNavRadio : public SGSubsystem
     string trans_ident;
     bool is_valid;
     bool has_dme;
+    double radial;
     double target_radial;
     double loc_lon;
     double loc_lat;
@@ -134,6 +142,8 @@ class FGNavRadio : public SGSubsystem
     double twist;
     double horiz_vel;
     double last_x;
+    double last_loc_dist;
+    double last_xtrack_error;
 
     string name;
     int num;
@@ -161,12 +171,6 @@ public:
 
     // Update nav/adf radios based on current postition
     void search ();
-
-    // NavCom Accessors
-    inline bool has_power() const {
-        return power_btn_node->getBoolValue()
-            && (bus_power_node->getDoubleValue() > 1.0);
-    }
 };