Merge branch 'jmt/runway-fix' into next

[flightgear.git] / src / Autopilot / autobrake.cxx

diff --git a/src/Autopilot/autobrake.cxx b/src/Autopilot/autobrake.cxx
index 0eae0fe1b185358866d8336bdd0b6b020526a4ea..ec1fcfc0e1aa67e55ddbf8caddbb3df0328d3784 100644 (file)
--- a/src/Autopilot/autobrake.cxx
+++ b/src/Autopilot/autobrake.cxx
@@ -39,6 +39,7 @@ FGAutoBrake::FGAutoBrake() :
   // default config, close to Boeing 747-400 / 777 values
   _configNumSteps = 4;
   _configRTOStep = -1;
+  _configDisengageStep = 0;
   _configMaxDecel = 11; // ft-sec-sec
   _configRTODecel = 11; // ft-sec-sec
   _configRTOSpeed = 85; // kts
@@ -73,10 +74,12 @@ void FGAutoBrake::init()
   SGPropertyNode_ptr config = _root->getChild("config", 0, true);
   config->tie("num-steps", SGRawValuePointer<int>(&_configNumSteps));
   config->tie("rto-step", SGRawValuePointer<int>(&_configRTOStep));
+  config->tie("disengage-step", SGRawValuePointer<int>(&_configDisengageStep));
   config->tie("rto-decel-fts-sec", SGRawValuePointer<double>(&_configRTODecel));
   config->tie("max-decel-fts-sec", SGRawValuePointer<double>(&_configMaxDecel));
   config->tie("rto-engage-kts", SGRawValuePointer<double>(&_configRTOSpeed));
   
+  
   // outputs
   _root->tie("target-decel-fts-sec", 
     SGRawValueMethods<FGAutoBrake,double>(*this, &FGAutoBrake::getTargetDecel));
@@ -93,6 +96,10 @@ void FGAutoBrake::postinit()
 {  
   _weightOnWheelsNode = fgGetNode("/gear/gear/wow");
   _groundspeedNode = fgGetNode("/velocities/groundspeed-kt");
+  if (!_weightOnWheelsNode) {
+    return; // don't crash if we're using an acft (UFO, ATC, with no WoW flag)
+  }
+  
   _lastWoW = _weightOnWheelsNode->getBoolValue();
 }
 
@@ -170,6 +177,12 @@ void FGAutoBrake::updateEngaged(double dt)
     return;
   }
 
+  if (!throttlesAtIdle()) {
+    SG_LOG(SG_AUTOPILOT, SG_INFO, "auto-brake, throttles not at idle, disengaing");
+    disengage();
+    return;
+  }
+
   // update the target deceleration; note step can be changed while engaged
   if (_rto) {
     _targetDecel = _configRTODecel;
@@ -189,6 +202,11 @@ bool FGAutoBrake::shouldEngage()
     return false;
   }
 
+
+  if (!throttlesAtIdle()) {
+    return false;
+  }
+  
   SG_LOG(SG_AUTOPILOT, SG_INFO, "Autobrake, should enage");
   return true;
 }
@@ -205,10 +223,22 @@ bool FGAutoBrake::shouldEngageRTO()
     }
     
     if (!_weightOnWheelsNode->getBoolValue()) {
+      if (airborne()) {
+        SG_LOG(SG_AUTOPILOT, SG_INFO, "FGAutoBrake: RTO, airbone, disengaging");
+        _rtoArmed = false;
+        _armed = false;
+        _step = _configDisengageStep;
+      }
+            
       return false;
     }
     
-    return throttlesAtIdle();
+    if (throttlesAtIdle()) {
+      SG_LOG(SG_AUTOPILOT, SG_INFO, "FGAutoBrake: RTO, throttles at idle, will engage");
+      return true;
+    } else {
+      return false;
+    }
   } else {
     // RTO arming case
     if (speed > _configRTOSpeed) {
@@ -228,12 +258,19 @@ void FGAutoBrake::disengage()
   
   SG_LOG(SG_AUTOPILOT, SG_INFO, "FGAutoBrake: disengage");
   _engaged = false;
+  _fcsBrakeControl = 0.0;
   _armed = false;
   _rtoArmed = false;
   _targetDecel = 0.0;
+  _step = _configDisengageStep;
 }
 
-bool FGAutoBrake::throttlesAtIdle()
+bool FGAutoBrake::airborne() const
+{
+  return !_weightOnWheelsNode->getBoolValue();
+}
+
+bool FGAutoBrake::throttlesAtIdle() const
 {
   SGPropertyNode_ptr e;
   const double IDLE_THROTTLE = 0.05; // 5% margin for idle setting
@@ -244,7 +281,6 @@ bool FGAutoBrake::throttlesAtIdle()
     }
   } // of engines iteration
   
-  SG_LOG(SG_AUTOPILOT, SG_INFO, "FGAutoBrake: throttles at idle");
   return true;
 }
 
@@ -263,7 +299,16 @@ void FGAutoBrake::setRTO(bool aRTO)
   if (aRTO) {
     // ensure we meet RTO selection criteria: 
     if (!_weightOnWheelsNode->getBoolValue()) {
-      SG_LOG(SG_AUTOPILOT, SG_WARN, "auto-brake: cannot select RTO mode, no weight on wheels");
+      // some systems combine RTO with a standard step, selecting RTO if on
+      // the ground. Handle that case by setting _rto = false, and letting
+      // setStep() do the rest of the work as normal.
+      if ((_configRTOStep > 0) && (_configRTOStep <= _configNumSteps)) {
+        // RTO is combined with a normal step, select that
+      } else {
+        SG_LOG(SG_AUTOPILOT, SG_WARN, "auto-brake: cannot select RTO mode, no weight on wheels");
+      }
+      
+      _rto = false;
       return;
     }