Automatic merge of T1.5.1-573-g9a8e6af15 and 14 pull requests

- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #831 at 3e672a8: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at d05f581: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #857 at 9afc8c3: Adding Air Flow Meters
- Pull request #863 at a34b857: Alternate preset 3D cabviewpoints
- Pull request #864 at e71bc5a: Fixes for Undesired Emergency Applications
- Pull request #865 at 776d6df: Dispatcher window improvements
- Pull request #866 at c15333e: Fix Articulation For 0-Axle Train Cars
- Pull request #870 at 5cb32fa: Fix water restore
- Pull request #873 at cf0ed99: Reduce allocations in signal script
- Pull request #874 at d500329: Dynamic brake controller refactoring

Author: openrails-bot

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

@@ -226,8 +226,6 @@ public void SetUpdateValue(float value)
         /// </summary>
         public void SetDynamicBrakeIntervention(float value)
         {
-            if (value > 0 && Host.TrainDynamicBrakeIntervention <= 0)
-                Host.TrainDynamicBrakeCommandStartTime = Host.Simulator.ClockTime;
             if (value <= 0)
                 Host.TrainDynamicBrakeIntervention = -1;
             else Host.TrainDynamicBrakeIntervention = Math.Min(value, 1);

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -757,7 +757,7 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
             // Note typically only one of the above will only ever be non-zero at the one time.
             // For flipped locomotives the force is "flipped" elsewhere, whereas dynamic brake force is "flipped" below by the direction of the speed.
 
-            if (DynamicBrakePercent > 0 && DynamicBrakeForceCurves != null && AbsSpeedMpS > 0)
+            if (DynamicBrakePercent > 0 && DynamicBrake && DynamicBrakeForceCurves != null && AbsSpeedMpS > 0)
             {
                 float f = DynamicBrakeForceCurves.Get(.01f * DynamicBrakePercent, AbsTractionSpeedMpS);
                 if (f > 0 && LocomotivePowerSupply.DynamicBrakeAvailable)

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -152,7 +152,7 @@ public bool OverchargeButtonPressed
         public float FullServReductionPSI { get; private set; }
         public float MinReductionPSI { get; private set; }
         public float TrainDynamicBrakeIntervention { get; set; } = -1;
-        public double TrainDynamicBrakeCommandStartTime { get; set; }
+        InterpolatorDiesel2D DynamicBrakeBlendingTable;
 
         /// <summary>
         /// Needed for proper mouse operation in the cabview
@@ -227,6 +227,8 @@ public ScriptedBrakeController(ScriptedBrakeController controller, MSTSLocomotiv
                 (item) => { Notches.Add(new MSTSNotch(item)); }
             );
 
+            DynamicBrakeBlendingTable = controller.DynamicBrakeBlendingTable;
+
             Initialize();
         }
 
@@ -321,6 +323,9 @@ public void Parse(string lowercasetoken, STFReader stf)
                 case "engine(ortsenginebrakecontroller":
                     ScriptName = stf.ReadStringBlock(null);
                     break;
+                case "engine(ortstraindynamicblendingtable":
+                    DynamicBrakeBlendingTable = new InterpolatorDiesel2D(stf, false);
+                    break;
             }
         }
 
@@ -335,8 +340,10 @@ public void Initialize()
                 }
                 if (Script == null)
                 {
-                    Script = new MSTSBrakeController() as BrakeController;
-                    (Script as MSTSBrakeController).ForceControllerReleaseGraduated = Simulator.Settings.GraduatedRelease;
+                    var mstsController = new MSTSBrakeController();
+                    mstsController.ForceControllerReleaseGraduated = Simulator.Settings.GraduatedRelease;
+                    mstsController.DynamicBrakeBlendingTable = DynamicBrakeBlendingTable;
+                    Script = mstsController as BrakeController;
                 }
 
                 Script.AttachToHost(this);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs

@@ -16,6 +16,7 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using Orts.Parsers.Msts;
 using ORTS.Scripting.Api;
 
 namespace Orts.Simulation.RollingStocks.SubSystems.Controllers
@@ -37,9 +38,10 @@ public class MSTSBrakeController: BrakeController
         public bool ForceControllerReleaseGraduated;
         bool BrakeControllerInitialised; // flag to allow PreviousNotchPosition to be initially set.
         MSTSNotch PreviousNotchPosition;
-
         bool EnforceMinimalReduction = false;
 
+        public InterpolatorDiesel2D DynamicBrakeBlendingTable;
+
         public MSTSBrakeController()
         {
         }
@@ -70,6 +72,10 @@ public override float Update(float elapsedSeconds)
             IntermediateValue = NotchController.IntermediateValue;
             SetUpdateValue(NotchController.UpdateValue);
             CurrentNotch = NotchController.CurrentNotch;
+            if (DynamicBrakeBlendingTable != null)
+            {
+                SetDynamicBrakeIntervention(DynamicBrakeBlendingTable.Get(CurrentValue(), SpeedMpS()));
+            }
             return value;
         }
 

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs

@@ -351,10 +351,7 @@ public void Update(float elapsedClockSeconds)
                     {
                         Locomotive.SetDynamicBrakePercent(Locomotive.DynamicBrakePercent - DynamicBrakeDecreaseStepPerSecond * elapsedClockSeconds);
                         if (Locomotive.DynamicBrakePercent < 2)
-                        {
-                            Locomotive.SetDynamicBrakePercent(0);
-                            Locomotive.DynamicBrakeChangeActiveState(false);
-                        }
+                            Locomotive.SetDynamicBrakePercent(-1);
                     }
                     else
                     {
@@ -370,10 +367,7 @@ public void Update(float elapsedClockSeconds)
                     {
                         Locomotive.SetDynamicBrakePercent(Locomotive.DynamicBrakePercent - DynamicBrakeDecreaseStepPerSecond * 2 * elapsedClockSeconds);
                         if (Locomotive.DynamicBrakePercent < 2)
-                        {
-                            Locomotive.SetDynamicBrakePercent(0);
-                            Locomotive.DynamicBrakeChangeActiveState(false);
-                        }
+                            Locomotive.SetDynamicBrakePercent(-1);
                     }
                     else
                     {
@@ -525,8 +519,6 @@ public void Update(float elapsedClockSeconds)
                     }
                     if (Locomotive.ThrottlePercent < 1 && Locomotive.DynamicBrakePercent < 100)
                     {
-                        if (Locomotive.DynamicBrakePercent < 0)
-                            Locomotive.DynamicBrakeChangeActiveState(true);
                         Locomotive.SetDynamicBrakePercent(Locomotive.DynamicBrakePercent + 1f);
                     }
                 }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MultiPositionController.cs

@@ -541,16 +541,14 @@ public void Update(float elapsedClockSeconds)
                     }
                     else
                     {
-                        if (Locomotive.DynamicBrakePercent < 0) Locomotive.DynamicBrakeCommandStartTime = Locomotive.Simulator.ClockTime;
                         Locomotive.ThrottlePercent = 0;
-                        Locomotive.DynamicBrakePercent = -CCThrottleOrDynBrakePercent;
+                        Locomotive.DynamicBrakePercent = Math.Max(-CCThrottleOrDynBrakePercent, Locomotive.TrainBrakeController?.TrainDynamicBrakeIntervention ?? -1);
                     }
                     IsActive = true;
                 }
                 if (!IsActive && wasActive)
                 {
                     Locomotive.ThrottlePercent = 0;
-                    if (!DynamicBrakePriority) Locomotive.DynamicBrakePercent = -1;
                     CCIsUsingTrainBrake = false;
                     Locomotive.ThrottleController.SetPercent(0);
                 }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

@@ -484,6 +484,7 @@ public float DynamicBrakePercent
         {
             get
             {
+                float percent = -1;
                 if (RemoteControlGroup == 0 && Train != null)
                 {
                     if (Train.LeadLocomotive is MSTSLocomotive locomotive)
@@ -494,16 +495,17 @@ public float DynamicBrakePercent
                         }
                     }
 
-                    return Train.MUDynamicBrakePercent;
+                    percent = Train.MUDynamicBrakePercent;
                 }
                 else if (RemoteControlGroup == 1 && Train != null)
                 {
-                    return Train.DPDynamicBrakePercent;
+                    percent = Train.DPDynamicBrakePercent;
                 }
                 else
                 {
-                    return LocalDynamicBrakePercent;
+                    percent = LocalDynamicBrakePercent;
                 }
+                return Math.Max(percent, this is MSTSLocomotive loco ? loco.DynamicBrakeBlendingPercent : -1);
             }
             set
             {