GPS data validity clean-up; it was a mess, now it's more robust. Thanks to Dave Luff...

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

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index d8cf7c29a6d36bffb75ccbca884fbc821240df89..0619962c044b1079aff66a19f5b1170fd7ef8c17 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -90,12 +90,15 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode_ptr inrange_node;
     SGPropertyNode_ptr signal_quality_norm_node;
     SGPropertyNode_ptr cdi_deflection_node;
+    SGPropertyNode_ptr cdi_deflection_norm_node;
     SGPropertyNode_ptr cdi_xtrack_error_node;
     SGPropertyNode_ptr cdi_xtrack_hdg_err_node;
     SGPropertyNode_ptr has_gs_node;
     SGPropertyNode_ptr loc_node;
     SGPropertyNode_ptr loc_dist_node;
     SGPropertyNode_ptr gs_deflection_node;
+    SGPropertyNode_ptr gs_deflection_deg_node;
+    SGPropertyNode_ptr gs_deflection_norm_node;
     SGPropertyNode_ptr gs_rate_of_climb_node;
     SGPropertyNode_ptr gs_dist_node;
     SGPropertyNode_ptr nav_id_node;
@@ -110,7 +113,10 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode_ptr gps_to_flag_node;
     SGPropertyNode_ptr gps_from_flag_node;
     SGPropertyNode_ptr gps_has_gs_node;
-
+    SGPropertyNode_ptr gps_course_node;
+    SGPropertyNode_ptr gps_xtrack_error_nm_node;
+    SGPropertyNode_ptr _magvarNode;
+    
     // internal (private) values
 
     int play_count;
@@ -123,8 +129,6 @@ class FGNavRadio : public SGSubsystem
 
     bool has_dme;
     double target_radial;
-    SGVec3d gs_base_vec;
-    double gs_dist_signed;
     SGTimeStamp prev_time;
     SGTimeStamp curr_time;
     double effective_range;
@@ -134,13 +138,23 @@ class FGNavRadio : public SGSubsystem
     double last_x;
     double last_loc_dist;
     double last_xtrack_error;
-
+    double _localizerWidth; // cached localizer width in degrees
+    
     string _name;
     int _num;
 
     // internal periodic station search timer
     double _time_before_search_sec;
 
+    SGVec3d _gsCart, _gsAxis, _gsVertical;
+
+    // CDI properties
+    bool _toFlag, _fromFlag;
+    double _cdiDeflection;
+    double _cdiCrossTrackErrorM;
+    double _gsNeedleDeflection;
+    double _gsNeedleDeflectionNorm;
+    
     bool updateWithPower(double aDt);
 
     // model standard VOR/DME/TACAN service volumes as per AIM 1-1-8
@@ -151,9 +165,21 @@ class FGNavRadio : public SGSubsystem
     double adjustILSRange( double stationElev, double aircraftElev,
                           double offsetDegrees, double distance );
 
-    void updateAudio(bool aInRange);
+    void updateAudio();
     void audioNavidChanged();
 
+    void updateReceiver(double dt);
+    void updateGlideSlope(double dt, const SGVec3d& aircraft, double signal_quality_norm);
+    void updateGPSSlaved();
+    void updateCDI(double dt);
+    
+    void clearOutputs();
+
+    /**
+     * Compute the localizer width in degrees - see implementation for 
+     * more information on the relevant standards and formulae.
+     */
+    double localizerWidth(FGNavRecord* aLOC);
     FGNavRecord* findPrimaryNavaid(const SGGeod& aPos, double aFreqMHz);
 public: