Trainwise dynamic brake blending table

Author: cesarBLG

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/MSTSLocomotive.cs

@@ -943,6 +943,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                 case "engine(ortstrainbrakescontrollerslowapplicationrate":
                 case "engine(ortstrainbrakecontroller":
                 case "engine(enginecontrollers(brake_train":
+                case "engine(ortstraindynamicblendingtable":
                     TrainBrakeController.Parse(lowercasetoken, stf);
                     TrainBrakeFitted = true;
                     break;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.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/MSTSBrakeController.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;
         }