Further refinements to cruise control

Author: cesarBLG

Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs

@@ -356,11 +356,15 @@ internal void AttachToHost(ScriptedTrainControlSystem host)
         /// Set dynamic brake controller to position in range [0-1].
         /// </summary>
         public Action<float> SetDynamicBrakeController;
+        /// <summary>
+        /// Sets the target speed of the automatic traction/braking system
+        /// Gets the current speed enforced by the automatic traction/braking system
+        /// </summary>
         public float? SetSpeedMpS
         {
             get
             {
-                if (Locomotive?.CruiseControl.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto) return Locomotive.CruiseControl.SetSpeedMpS;
+                if (Locomotive.CruiseControl?.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto) return Locomotive.CruiseControl.SetSpeedMpS;
                 return null;
             }
             set
@@ -369,6 +373,20 @@ public float? SetSpeedMpS
             }
         }
         /// <summary>
+        /// Controls the target acceleration of the automatic traction/braking system when a braking curve is active
+        /// </summary>
+        public float SetSpeedAccelerationMpSS
+        {
+            get
+            {
+                return Locomotive?.CruiseControl.ATOAccelerationMpSS ?? 0;
+            }
+            set
+            {
+                if (Locomotive.CruiseControl != null) Locomotive.CruiseControl.ATOAccelerationMpSS = value;
+            }
+        }
+        /// <summary>
         /// Cut power by pull all pantographs down.
         /// </summary>
         public Action SetPantographsDown;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -1773,7 +1773,7 @@ public override void Update(float elapsedClockSeconds)
                                 }
                                 else
                                 {
-                                    var dynforce = loco.DynamicBrakeForceCurves.Get(1.0f, loco.AbsSpeedMpS);
+                                    var dynforce = loco.GetAvailableDynamicBrakeForceN(1.0f);
                                     if ((loco.MaxDynamicBrakeForceN == 0 && dynforce > 0) || dynforce > loco.MaxDynamicBrakeForceN * 0.6)
                                     {
                                         demandedPressurePSI = 0;