Fixes for default chase view values.

[flightgear.git] / src / Autopilot / newauto.hxx

diff --git a/src/Autopilot/newauto.hxx b/src/Autopilot/newauto.hxx
index feeca7ab4b3b2080c782f2aa4148d2130620b00b..252280adeec9cf35d7c467d2fcb76cf38393901c 100644 (file)
--- a/src/Autopilot/newauto.hxx
+++ b/src/Autopilot/newauto.hxx
@@ -27,8 +27,10 @@
 #define _NEWAUTO_HXX
 
 
+#include <simgear/misc/props.hxx>
 #include <simgear/route/waypoint.hxx>
 
+#include <Main/fg_props.hxx>
 
 // Structures
 class FGAutopilot {
@@ -36,17 +38,19 @@ class FGAutopilot {
 public:
 
     enum fgAutoHeadingMode {
-       FG_HEADING_LOCK = 0,
-       FG_HEADING_NAV1 = 1,
-       FG_HEADING_NAV2 = 2,
-        FG_HEADING_WAYPOINT = 3
+       FG_DG_HEADING_LOCK = 0,   // follow bug on directional gryo
+       FG_TC_HEADING_LOCK = 1,   // keep turn coordinator zero'd
+       FG_TRUE_HEADING_LOCK = 2, // lock to true heading (i.e. a perfect world)
+       FG_HEADING_NAV1 = 3,      // follow nav1 radial
+       FG_HEADING_NAV2 = 4,      // follow nav2 radial
+        FG_HEADING_WAYPOINT = 5   // track next waypoint
     };
 
     enum fgAutoAltitudeMode {
-       FG_ALTITUDE_LOCK = 0,
-       FG_ALTITUDE_TERRAIN = 1,
-       FG_ALTITUDE_GS1 = 2,
-       FG_ALTITUDE_GS2 = 3
+       FG_ALTITUDE_LOCK = 0,     // lock to a specific altitude
+       FG_ALTITUDE_TERRAIN = 1,  // try to maintain a specific AGL
+       FG_ALTITUDE_GS1 = 2,      // follow glide slope 1
+       FG_ALTITUDE_GS2 = 3       // follow glide slope 2
     };
 
 private:
@@ -63,12 +67,22 @@ private:
     // double TargetLatitude;  // the latitude the AP should steer to.
     // double TargetLongitude; // the longitude the AP should steer to.
     double TargetDistance;     // the distance to Target.
-    double TargetHeading;      // the heading the AP should steer to.
+    double DGTargetHeading;     // the apparent DG heading to steer towards.
+    double TargetHeading;      // the true heading the AP should steer to.
     double TargetAltitude;     // altitude to hold
     double TargetAGL;          // the terrain separation
-    double TargetClimbRate;    // climb rate to shoot for
+    SGPropertyNode *min_climb;           // minimum climb speed
+    SGPropertyNode *best_climb;          // best climb speed
+    SGPropertyNode *elevator_adj_factor; // factor to optimize altitude hold adjustments
+    SGPropertyNode *integral_contrib;    // amount of contribution of the integral
+                                // component of the pid
+    SGPropertyNode *zero_pitch_throttle; // amount of throttle at which the aircraft does not pitch up
+    SGPropertyNode *zero_pitch_trim_full_throttle; // amount of trim required to level at full throttle
+    SGPropertyNode *TargetClimbRate;   // target climb rate
+    SGPropertyNode *TargetDescentRate; // target decent rate
+    SGPropertyNode *current_throttle; // current throttle (engine 0)
     double TargetSpeed;                // speed to shoot for
-    double alt_error_accum;    // altitude error accumulator
+    double alt_error_accum;     // altitude error accumulator
     double climb_error_accum;  // climb error accumulator (for GS)
     double speed_error_accum;  // speed error accumulator
 
@@ -100,12 +114,28 @@ private:
     char TargetLatitudeStr[64];
     char TargetLongitudeStr[64];
     char TargetLatLonStr[64];
-    char TargetDistanceStr[64];
+    char TargetWP1Str[64];
+    char TargetWP2Str[64];
+    char TargetWP3Str[64];
     char TargetHeadingStr[64];
     char TargetAltitudeStr[64];
 
+    SGPropertyNode *latitude_node;
+    SGPropertyNode *longitude_node;
+    SGPropertyNode *altitude_node;
+    SGPropertyNode *altitude_agl_node;
+    SGPropertyNode *vertical_speed_node;
+    SGPropertyNode *heading_node;
+    SGPropertyNode *roll_node;
+
 public:
 
+    // constructor
+    FGAutopilot();
+
+    // destructor
+    ~FGAutopilot();
+
     // Initialize autopilot system
     void init();
 
@@ -149,14 +179,26 @@ public:
     inline void set_old_lon( double val ) { old_lon = val; }
     inline double get_TargetHeading() const { return TargetHeading; }
     inline void set_TargetHeading( double val ) { TargetHeading = val; }
+    inline double get_DGTargetHeading() const { return DGTargetHeading; }
+    inline void set_DGTargetHeading( double val ) { DGTargetHeading = val; }
     inline double get_TargetDistance() const { return TargetDistance; }
     inline void set_TargetDistance( double val ) { TargetDistance = val; }
     inline double get_TargetAltitude() const { return TargetAltitude; }
     inline void set_TargetAltitude( double val ) { TargetAltitude = val; }
+    inline double get_TargetAGL() const { return TargetAGL; }
+    inline void set_TargetAGL( double val ) { TargetAGL = val; }
+    inline double get_TargetClimbRate() const {
+        return TargetClimbRate->getFloatValue();
+    }
+    inline void set_TargetClimbRate( double val ) {
+        fgSetFloat( "/autopilot/config/target-climb-rate-fpm",  val);
+    }
 
     inline char *get_TargetLatitudeStr() { return TargetLatitudeStr; }
     inline char *get_TargetLongitudeStr() { return TargetLongitudeStr; }
-    inline char *get_TargetDistanceStr() { return TargetDistanceStr; }
+    inline char *get_TargetWP1Str() { return TargetWP1Str; }
+    inline char *get_TargetWP2Str() { return TargetWP2Str; }
+    inline char *get_TargetWP3Str() { return TargetWP3Str; }
     inline char *get_TargetHeadingStr() { return TargetHeadingStr; }
     inline char *get_TargetAltitudeStr() { return TargetAltitudeStr; }
     inline char *get_TargetLatLonStr() { return TargetLatLonStr; }
@@ -165,7 +207,7 @@ public:
     void MakeTargetLatLonStr( double lat, double lon );
     void MakeTargetAltitudeStr( double altitude );
     void MakeTargetHeadingStr( double bearing );
-    void MakeTargetDistanceStr( double distance );
+    void MakeTargetWPStr( double distance );
     void update_old_control_values();
 
     // accessors
@@ -184,5 +226,7 @@ public:
 
 extern FGAutopilot *current_autopilot;
 
+#define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_DG_HEADING_LOCK
+// #define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_TRUE_HEADING_LOCK
 
 #endif // _NEWAUTO_HXX