X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fgps.hxx;h=27948ecb47e7ffc259724ce28eff798243573f4c;hb=61812ef4b88f5aa74e9cc0630c84d6fc6b4a51cd;hp=8d19afd18955fcda773e926dff539fd445d08982;hpb=2b721e8443fdfd8034f72b1dc48d89e531379876;p=flightgear.git

diff --git a/src/Instrumentation/gps.hxx b/src/Instrumentation/gps.hxx
index 8d19afd18..27948ecb4 100644
--- a/src/Instrumentation/gps.hxx
+++ b/src/Instrumentation/gps.hxx
@@ -12,6 +12,7 @@
 #endif
 
 #include <simgear/props/props.hxx>
+#include <simgear/route/route.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
 
@@ -29,36 +30,44 @@
  * 
  * /instrumentation/gps/wp-longitude-deg
  * /instrumentation/gps/wp-latitude-deg
+ * /instrumentation/gps/wp-altitude-ft
  * /instrumentation/gps/wp-ID
  * /instrumentation/gps/wp-name
- * /instrumentation/gps/course-deg
+ * /instrumentation/gps/desired-course-deg
  * /instrumentation/gps/get-nearest-airport
  * /instrumentation/gps/waypoint-type
+ * /instrumentation/gps/tracking-bug
  *
  * Output properties:
  *
  * /instrumentation/gps/indicated-longitude-deg
  * /instrumentation/gps/indicated-latitude-deg
  * /instrumentation/gps/indicated-altitude-ft
+ * /instrumentation/gps/indicated-vertical-speed-fpm
  * /instrumentation/gps/indicated-track-true-deg
  * /instrumentation/gps/indicated-track-magnetic-deg
  * /instrumentation/gps/indicated-ground-speed-kt
  *
- * /instrumentation/gps/wp-distance-m
+ * /instrumentation/gps/wp-distance-nm
  * /instrumentation/gps/wp-bearing-deg
+ * /instrumentation/gps/wp-bearing-mag-deg
  * /instrumentation/gps/TTW
- * /instrumentation/gps/radials/actual-deg
  * /instrumentation/gps/course-deviation-deg
  * /instrumentation/gps/course-error-nm
  * /instrumentation/gps/to-flag
  * /instrumentation/gps/odometer
  * /instrumentation/gps/trip-odometer
+ * /instrumentation/gps/true-bug-error-deg
+ * /instrumentation/gps/magnetic-bug-error-deg
+ * /instrumentation/gps/true-bearing-error-deg
+ * /instrumentation/gps/magnetic-bearing-error-deg
  */
 class GPS : public SGSubsystem
 {
 
 public:
 
+    GPS (SGPropertyNode *node);
     GPS ();
     virtual ~GPS ();
 
@@ -76,29 +85,67 @@ private:
     SGPropertyNode_ptr _magvar_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
-    SGPropertyNode_ptr _wp_longitude_node;
-    SGPropertyNode_ptr _wp_latitude_node;
-    SGPropertyNode_ptr _wp_ID_node;
-    SGPropertyNode_ptr _wp_name_node;
-    SGPropertyNode_ptr _wp_course_node;
+    SGPropertyNode_ptr _wp0_longitude_node;
+    SGPropertyNode_ptr _wp0_latitude_node;
+    SGPropertyNode_ptr _wp0_altitude_node;
+    SGPropertyNode_ptr _wp0_ID_node;
+    SGPropertyNode_ptr _wp0_name_node;
+    SGPropertyNode_ptr _wp0_course_node;
     SGPropertyNode_ptr _get_nearest_airport_node;
-    SGPropertyNode_ptr _waypoint_type_node;
+    SGPropertyNode_ptr _wp0_waypoint_type_node;
+    SGPropertyNode_ptr _wp1_longitude_node;
+    SGPropertyNode_ptr _wp1_latitude_node;
+    SGPropertyNode_ptr _wp1_altitude_node;
+    SGPropertyNode_ptr _wp1_ID_node;
+    SGPropertyNode_ptr _wp1_name_node;
+    SGPropertyNode_ptr _wp1_course_node;
+    SGPropertyNode_ptr _wp1_waypoint_type_node;
+    SGPropertyNode_ptr _tracking_bug_node;
 
     SGPropertyNode_ptr _raim_node;
     SGPropertyNode_ptr _indicated_longitude_node;
     SGPropertyNode_ptr _indicated_latitude_node;
     SGPropertyNode_ptr _indicated_altitude_node;
+    SGPropertyNode_ptr _indicated_vertical_speed_node;
     SGPropertyNode_ptr _true_track_node;
     SGPropertyNode_ptr _magnetic_track_node;
     SGPropertyNode_ptr _speed_node;
-    SGPropertyNode_ptr _wp_distance_node;
-    SGPropertyNode_ptr _wp_ttw_node;
-    SGPropertyNode_ptr _wp_bearing_node;
-    SGPropertyNode_ptr _wp_course_deviation_node;
-    SGPropertyNode_ptr _wp_course_error_nm_node;
-    SGPropertyNode_ptr _wp_to_flag_node;
+    SGPropertyNode_ptr _wp0_distance_node;
+    SGPropertyNode_ptr _wp0_ttw_node;
+    SGPropertyNode_ptr _wp0_bearing_node;
+    SGPropertyNode_ptr _wp0_mag_bearing_node;
+    SGPropertyNode_ptr _wp0_course_deviation_node;
+    SGPropertyNode_ptr _wp0_course_error_nm_node;
+    SGPropertyNode_ptr _wp0_to_flag_node;
+    SGPropertyNode_ptr _wp1_distance_node;
+    SGPropertyNode_ptr _wp1_ttw_node;
+    SGPropertyNode_ptr _wp1_bearing_node;
+    SGPropertyNode_ptr _wp1_mag_bearing_node;
+    SGPropertyNode_ptr _wp1_course_deviation_node;
+    SGPropertyNode_ptr _wp1_course_error_nm_node;
+    SGPropertyNode_ptr _wp1_to_flag_node;
     SGPropertyNode_ptr _odometer_node;
     SGPropertyNode_ptr _trip_odometer_node;
+    SGPropertyNode_ptr _true_bug_error_node;
+    SGPropertyNode_ptr _magnetic_bug_error_node;
+    SGPropertyNode_ptr _true_wp0_bearing_error_node;
+    SGPropertyNode_ptr _magnetic_wp0_bearing_error_node;
+    SGPropertyNode_ptr _true_wp1_bearing_error_node;
+    SGPropertyNode_ptr _magnetic_wp1_bearing_error_node;
+    SGPropertyNode_ptr _leg_distance_node;
+    SGPropertyNode_ptr _leg_course_node;
+    SGPropertyNode_ptr _leg_magnetic_course_node;
+    SGPropertyNode_ptr _alt_dist_ratio_node;
+    SGPropertyNode_ptr _leg_course_deviation_node;
+    SGPropertyNode_ptr _leg_course_error_nm_node;
+    SGPropertyNode_ptr _leg_to_flag_node;
+    SGPropertyNode_ptr _alt_deviation_node;
+
+    SGPropertyNode_ptr _route;
+    SGPropertyNode_ptr addWp;
+    SGPropertyNode_ptr popWp;
+
+    SGRoute *route;
 
     bool _last_valid;
     double _last_longitude_deg;
@@ -106,9 +153,27 @@ private:
     double _last_altitude_m;
     double _last_speed_kts;
 
-    double _wp_latitude;
-    double _wp_longitude;
-    string _last_wp_ID;
+    double _wp0_latitude_deg;
+    double _wp0_longitude_deg;
+    double _wp0_altitude_m;
+    double _wp1_latitude_deg;
+    double _wp1_longitude_deg;
+    double _wp1_altitude_m;
+    string _last_wp0_ID;
+    string _last_wp1_ID;
+
+    double _alt_dist_ratio;
+    double _distance_m;
+    double _course_deg;
+
+    double _bias_length;
+    double _bias_angle;
+    double _azimuth_error;
+    double _range_error;
+    double _elapsed_time;
+
+    string _name;
+    int _num;
 
 };