Boris Koenig:

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

diff --git a/src/Cockpit/navcom.hxx b/src/Cockpit/navcom.hxx
index 5d18a118eb94fa88eeb784c2b9ec1f78636f24e1..6f7d61bf505efeaea18d435266fb14535088d18c 100644 (file)
--- a/src/Cockpit/navcom.hxx
+++ b/src/Cockpit/navcom.hxx
@@ -32,7 +32,6 @@
 #include <simgear/math/interpolater.hxx>
 #include <simgear/timing/timestamp.hxx>
 
-#include <Navaids/ilslist.hxx>
 #include <Navaids/navlist.hxx>
 #include <Sound/morse.hxx>
 
@@ -96,6 +95,8 @@ class FGNavCom : public SGSubsystem
                                 // exactly.)
     double nav_sel_radial;
     double nav_target_radial;
+    double nav_target_radial_true;
+    double nav_target_auto_hdg;
     double nav_loclon;
     double nav_loclat;
     double nav_x;
@@ -104,21 +105,24 @@ class FGNavCom : public SGSubsystem
     double nav_loc_dist;
     double nav_gslon;
     double nav_gslat;
+    double nav_elev;            // use gs elev if available
     double nav_gs_x;
     double nav_gs_y;
     double nav_gs_z;
     sgdVec3 gs_base_vec;
     double nav_gs_dist;
     double nav_gs_dist_signed;
+    double nav_gs_rate_of_climb;
     SGTimeStamp prev_time;
     SGTimeStamp curr_time;
-    double nav_elev;
     double nav_range;
     double nav_effective_range;
     double nav_target_gs;
     double nav_twist;
     double nav_vol_btn;
     bool nav_ident_btn;
+    double horiz_vel;
+    double last_x;
 
     // model standard VOR/DME/TACAN service volumes as per AIM 1-1-8
     double adjustNavRange( double stationElev, double aircraftElev,
@@ -194,6 +198,12 @@ public:
     inline double get_nav_alt_freq () const { return nav_alt_freq; }
     inline double get_nav_sel_radial() const { return nav_sel_radial; }
     inline double get_nav_target_radial() const { return nav_target_radial; }
+    inline double get_nav_target_radial_true() const {
+        return nav_target_radial_true;
+    }
+    inline double get_nav_target_auto_hdg() const {
+        return nav_target_auto_hdg;
+    }
 
     // Calculated values.
     inline bool get_comm_inrange() const { return comm_inrange; }
@@ -216,6 +226,9 @@ public:
     inline double get_nav_gslat() const { return nav_gslat; }
     inline double get_nav_gs_dist() const { return nav_gs_dist; }
     inline double get_nav_gs_dist_signed() const { return nav_gs_dist_signed; }
+    inline double get_nav_gs_rate_of_climb() const {
+        return nav_gs_rate_of_climb;
+    }
     inline double get_nav_elev() const { return nav_elev; }
     double get_nav_heading() const;
     double get_nav_radial() const;
@@ -223,6 +236,7 @@ public:
     inline double get_nav_target_gs() const { return nav_target_gs; }
     inline double get_nav_twist() const { return nav_twist; }
     double get_nav_cdi_deflection() const;
+    double get_nav_cdi_xtrack_error() const;
     double get_nav_gs_deflection() const;
     inline double get_nav_vol_btn() const { return nav_vol_btn; }
     inline bool get_nav_ident_btn() const { return nav_ident_btn; }