Fix line endings

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

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 77cf5651bc2d9d55855711df8198823a547d7f64..623ba784d879ac5b29d69fea18621f63618e4b40 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -48,7 +48,9 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode *alt_node;
     SGPropertyNode *bus_power_node;
 
-    // inputs
+    // 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
@@ -56,8 +58,12 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode *vol_btn_node;
     SGPropertyNode *ident_btn_node;
     SGPropertyNode *audio_btn_node;
+    SGPropertyNode *nav_serviceable_node;
+    SGPropertyNode *cdi_serviceable_node;
+    SGPropertyNode *gs_serviceable_node;
+    SGPropertyNode *tofrom_serviceable_node;
 
-    // outputs
+    // property outputs
     SGPropertyNode *fmt_freq_node;     // formated frequency
     SGPropertyNode *fmt_alt_freq_node; // formated alternate frequency
     SGPropertyNode *heading_node;      // true heading to nav station
@@ -71,68 +77,73 @@ 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;
     SGPropertyNode *id_c4_node;
 
-    // unfiled
-    SGPropertyNode *nav_serviceable_node;
-    SGPropertyNode *cdi_serviceable_node;
-    SGPropertyNode *gs_serviceable_node;
-    SGPropertyNode *tofrom_serviceable_node;
+    // gps slaving support
     SGPropertyNode *nav_slaved_to_gps_node;
     SGPropertyNode *gps_cdi_deflection_node;
     SGPropertyNode *gps_to_flag_node;
     SGPropertyNode *gps_from_flag_node;
 
-    string last_id;
+    // internal (private) values
+
+    string last_nav_id;
     bool last_nav_vor;
-    int nav_play_count;
-    time_t nav_last_time;
+    int play_count;
+    time_t last_time;
 
     int index;                  // used for property binding
     string nav_fx_name;
     string dme_fx_name;
 
-    // internal (unexported) values
-    string nav_trans_ident;
-    bool nav_valid;
-    bool nav_has_dme;
-    double nav_target_radial;
-    double nav_loclon;
-    double nav_loclat;
+    string trans_ident;
+    bool is_valid;
+    bool has_dme;
+    double radial;
+    double target_radial;
+    double loc_lon;
+    double loc_lat;
     double nav_x;
     double nav_y;
     double nav_z;
-    double nav_gslon;
-    double nav_gslat;
+    double gs_lon;
+    double gs_lat;
     double nav_elev;            // use gs elev if available
-    double nav_gs_x;
-    double nav_gs_y;
-    double nav_gs_z;
+    double gs_x;
+    double gs_y;
+    double gs_z;
     sgdVec3 gs_base_vec;
-    double nav_gs_dist_signed;
+    double gs_dist_signed;
     SGTimeStamp prev_time;
     SGTimeStamp curr_time;
-    double nav_range;
-    double nav_effective_range;
-    double nav_target_gs;
-    double nav_twist;
+    double range;
+    double effective_range;
+    double target_gs;
+    double twist;
     double horiz_vel;
     double last_x;
+    double last_loc_dist;
+    double last_xtrack_error;
 
     string name;
     int num;
@@ -160,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);
-    }
 };