Autopilot now honors tunable altitude hold parameters which are defined in

the aircraft-set.xml file.

diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index a54eaf8fe67ea72395271e73d06fee02a0ea90f6..c427fb93759f888a40d0045ffd5a893e431276c7 100644 (file)
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -48,8 +48,8 @@ FGAutopilot *current_autopilot;
 
 
 // Climb speed constants
-const double min_climb = 70.0; // kts
-const double best_climb = 75.0;        // kts
+// const double min_climb = 70.0;      // kts
+// const double best_climb = 75.0;     // kts
 // const double ideal_climb_rate = 500.0 * SG_FEET_TO_METER; // fpm -> mpm
 // const double ideal_decent_rate = 1000.0 * SG_FEET_TO_METER; // fpm -> mpm
 
@@ -69,10 +69,32 @@ extern char *coord_format_lon(float);
                        
 
 // constructor
-FGAutopilot::FGAutopilot():
-TargetClimbRate(500 * SG_FEET_TO_METER),
-TargetDecentRate(1000 * SG_FEET_TO_METER)
+FGAutopilot::FGAutopilot()
 {
+    TargetClimbRate
+        = fgGetNode("/autopilot/config/target-climb-rate-fpm", true);
+    TargetDescentRate
+        = fgGetNode("/autopilot/config/target-descent-rate-fpm", true);
+    min_climb = fgGetNode("/autopilot/config/min-climb-speed-kt", true);
+    best_climb = fgGetNode("/autopilot/config/best-climb-speed-kt", true);
+    elevator_adj_factor
+        = fgGetNode("/autopilot/config/elevator-adj-factor", true);
+    integral_contrib
+        = fgGetNode("/autopilot/config/integral-contribution", true);
+    cout << "elevadj = " << elevator_adj_factor->getFloatValue() << endl;
+    // initialize with defaults (in case config isn't there)
+    if ( TargetClimbRate->getFloatValue() < 1 )
+        fgSetFloat( "/autopilot/config/target-climb-rate-fpm", 500);
+    if ( TargetDescentRate->getFloatValue() < 1 )
+        fgSetFloat( "/autopilot/config/target-descent-rate-fpm", 1000 );
+    if ( min_climb->getFloatValue() < 1)
+        fgSetFloat( "/autopilot/config/min-climb-speed-kt", 70 );
+    if (best_climb->getFloatValue() < 1)
+        fgSetFloat( "/autopilot/config/best-climb-speed-kt", 120 );
+    if (elevator_adj_factor->getFloatValue() < 1)
+        fgSetFloat( "/autopilot/config/elevator-adj-factor", 5000 );
+    if ( integral_contrib->getFloatValue() < 0.0000001 )
+        fgSetFloat( "/autopilot/config/integral-contribution", 0.01 );
 }
 
 // destructor
@@ -641,29 +663,36 @@ int FGAutopilot::run() {
 
        speed = get_speed();
 
-       if ( speed < min_climb ) {
+       if ( speed < min_climb->getFloatValue() ) {
            max_climb = 0.0;
-       } else if ( speed < best_climb ) {
-           max_climb = ((best_climb - min_climb) - (best_climb - speed)) 
-               * fabs(TargetClimbRate) 
-               / (best_climb - min_climb);
+       } else if ( speed < best_climb->getFloatValue() ) {
+           max_climb = ((best_climb->getFloatValue()
+                          - min_climb->getFloatValue())
+                         - (best_climb->getFloatValue() - speed)) 
+               * fabs(TargetClimbRate->getFloatValue() * SG_FEET_TO_METER) 
+               / (best_climb->getFloatValue() - min_climb->getFloatValue());
        } else {                        
-           max_climb = ( speed - best_climb ) * 10.0 + fabs(TargetClimbRate);
+           max_climb = ( speed - best_climb->getFloatValue() ) * 10.0
+                + fabs(TargetClimbRate->getFloatValue() * SG_FEET_TO_METER);
        }
 
        // this first one could be optional if we wanted to allow
        // better climb performance assuming we have the airspeed to
        // support it.
-       if ( climb_rate > fabs(TargetClimbRate) ) {
-           climb_rate = fabs(TargetClimbRate);
+       if ( climb_rate >
+             fabs(TargetClimbRate->getFloatValue() * SG_FEET_TO_METER) ) {
+           climb_rate
+                = fabs(TargetClimbRate->getFloatValue() * SG_FEET_TO_METER);
        }
 
        if ( climb_rate > max_climb ) {
            climb_rate = max_climb;
        }
 
-       if ( climb_rate < -fabs(TargetDecentRate) ) {
-           climb_rate = -fabs(TargetDecentRate);
+       if ( climb_rate <
+             -fabs(TargetDescentRate->getFloatValue() * SG_FEET_TO_METER) ) {
+           climb_rate
+                = -fabs(TargetDescentRate->getFloatValue() * SG_FEET_TO_METER);
        }
 
        // cout << "Target climb rate = " << TargetClimbRate << endl;
@@ -683,13 +712,14 @@ int FGAutopilot::run() {
        // calculate integral error, and adjustment amount
        int_error = alt_error_accum;
        // printf("error = %.2f  int_error = %.2f\n", error, int_error);
-       int_adj = int_error / 20000.0;
+       int_adj = int_error / elevator_adj_factor->getFloatValue();
 
        // caclulate proportional error
        prop_error = error;
-       prop_adj = prop_error / 2000.0;
+       prop_adj = prop_error / elevator_adj_factor->getFloatValue();
 
-       total_adj = 0.9 * prop_adj + 0.1 * int_adj;
+       total_adj = (1.0 - integral_contrib->getFloatValue()) * prop_adj
+            + integral_contrib->getFloatValue() * int_adj;
        // if ( total_adj > 0.6 ) {
        //     total_adj = 0.6;
        // } else if ( total_adj < -0.2 ) {

diff --git a/src/Autopilot/newauto.hxx b/src/Autopilot/newauto.hxx
index 22af68a6144dcda9497f58e91bd11c51d52da0d6..22c1db947fab8bdbff8a8714810950eadb73c823 100644 (file)
--- a/src/Autopilot/newauto.hxx
+++ b/src/Autopilot/newauto.hxx
@@ -30,6 +30,7 @@
 #include <simgear/misc/props.hxx>
 #include <simgear/route/waypoint.hxx>
 
+#include <Main/fg_props.hxx>
 
 // Structures
 class FGAutopilot {
@@ -70,8 +71,13 @@ private:
     double TargetHeading;      // the true heading the AP should steer to.
     double TargetAltitude;     // altitude to hold
     double TargetAGL;          // the terrain separation
-    double TargetClimbRate;    // target climb rate
-    double TargetDecentRate;   // target decent rate
+    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 *TargetClimbRate;   // target climb rate
+    SGPropertyNode *TargetDescentRate; // target decent rate
     double TargetSpeed;                // speed to shoot for
     double alt_error_accum;    // altitude error accumulator
     double climb_error_accum;  // climb error accumulator (for GS)
@@ -178,8 +184,12 @@ public:
     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; }
-    inline void set_TargetClimbRate( double val ) { TargetClimbRate = 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; }