Do not move brake lever when applying brakes

Author: cesarBLG

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

@@ -120,6 +120,10 @@ public abstract class BrakeController : AbstractTrainScriptClass
         /// Gives the list of notches
         /// </summary>
         public Func<List<MSTSNotch>> Notches;
+        /// <summary>
+        /// Fraction of train brake demanded by cruise control
+        /// </summary>
+        public Func<float> CruiseControlBrakeDemand;
 
         /// <summary>
         /// Sets the current value of the brake controller lever

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

@@ -4134,7 +4134,7 @@ public void StartTrainBrakeIncrease(float? target)
             AlerterReset(TCSEvent.TrainBrakeChanged);
             TrainBrakeController.StartIncrease(target);
             TrainBrakeController.CommandStartTime = Simulator.ClockTime;
-            if (CruiseControl != null)
+            if (CruiseControl != null && CruiseControl.TrainBrakeCommandHasPriorityOverCruiseControl)
             {
                 CruiseControl.TrainBrakePriority = true;
             }
@@ -4223,7 +4223,7 @@ public void SetTrainBrakeValue(float value)
             if (change != 0)
             {
                 new TrainBrakeCommand(Simulator.Log, change > 0, controller.CurrentValue, Simulator.ClockTime);
-                if (change > 0 && CruiseControl != null) CruiseControl.TrainBrakePriority = true;
+                if (change > 0 && CruiseControl != null && CruiseControl.TrainBrakeCommandHasPriorityOverCruiseControl) CruiseControl.TrainBrakePriority = true;
                 SignalEvent(Event.TrainBrakeChange);
                 AlerterReset(TCSEvent.TrainBrakeChanged);
             }

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

@@ -389,6 +389,7 @@ public void Initialize()
                 Script.StepSize = () => StepSize;
                 Script.UpdateValue = () => UpdateValue;
                 Script.Notches = () => Notches;
+                Script.CruiseControlBrakeDemand = () => Locomotive.CruiseControl != null ? Locomotive.CruiseControl.TrainBrakePercent/100 : 0;
 
                 Script.SetCurrentValue = (value) => CurrentValue = value;
                 Script.SetUpdateValue = (value) => UpdateValue = value;

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

@@ -225,8 +225,16 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                 }
             }
 
+            float ccdemand = CruiseControlBrakeDemand();
+            if (ccdemand > 0)
+            {
+                pressureBar = Math.Min(MaxPressureBar() - MinReductionBar() * (1 - ccdemand) - FullServReductionBar() * ccdemand, pressureBar);
+                epState = ccdemand;
+            }
+
             if (pressureBar < 0)
                 pressureBar = 0;
+
             epControllerState = epState;
         }
 

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

@@ -80,7 +80,8 @@ public float SetSpeedMpS
         public bool AntiWheelSpinEquipped = false;
         public float AntiWheelSpinSpeedDiffThreshold = 0.5f;
         public float DynamicBrakeMaxForceAtSelectorStep = 0;
-        protected float trainBrakePercent = 0;
+        float trainBrakePercent;
+        public float TrainBrakePercent { get { return trainBrakePercent; }}
         protected float trainLength = 0;
         public int TrainLengthMeters = 0;
         public float CurrentSelectedSpeedMpS = 0;
@@ -131,6 +132,7 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }
         public bool ForceResetIncludeDynamicBrake = false;
         public bool ZeroSelectedSpeedWhenPassingToThrottleMode = false;
         public bool DynamicBrakeCommandHasPriorityOverCruiseControl = true;
+        public bool TrainBrakeCommandHasPriorityOverCruiseControl = true;
         public bool HasIndependentThrottleDynamicBrakeLever = false;
         public bool HasProportionalSpeedSelector = false;
         public bool SpeedSelectorIsDiscrete = false;
@@ -248,6 +250,7 @@ public CruiseControl(CruiseControl other, MSTSLocomotive locomotive)
             ForceResetIncludeDynamicBrake = other.ForceResetIncludeDynamicBrake;
             ZeroSelectedSpeedWhenPassingToThrottleMode = other.ZeroSelectedSpeedWhenPassingToThrottleMode;
             DynamicBrakeCommandHasPriorityOverCruiseControl = other.DynamicBrakeCommandHasPriorityOverCruiseControl;
+            TrainBrakeCommandHasPriorityOverCruiseControl = other.TrainBrakeCommandHasPriorityOverCruiseControl;
             HasIndependentThrottleDynamicBrakeLever = other.HasIndependentThrottleDynamicBrakeLever;
             HasProportionalSpeedSelector = other.HasProportionalSpeedSelector;
             DisableManualSwitchToManualWhenSetForceNotAtZero = other.DisableManualSwitchToManualWhenSetForceNotAtZero;
@@ -347,6 +350,7 @@ public void Parse(STFReader stf)
                     case "forceresetincludedynamicbrake": ForceResetIncludeDynamicBrake = stf.ReadBoolBlock(false); break;
                     case "zeroselectedspeedwhenpassingtothrottlemode": ZeroSelectedSpeedWhenPassingToThrottleMode = stf.ReadBoolBlock(false); break;
                     case "dynamicbrakecommandhaspriorityovercruisecontrol": DynamicBrakeCommandHasPriorityOverCruiseControl = stf.ReadBoolBlock(true); break;
+                    case "trainbrakecommandhaspriorityovercruisecontrol": TrainBrakeCommandHasPriorityOverCruiseControl = stf.ReadBoolBlock(true); break;
                     case "hasindependentthrottledynamicbrakelever": HasIndependentThrottleDynamicBrakeLever = stf.ReadBoolBlock(false); break;
                     case "hasproportionalspeedselector": HasProportionalSpeedSelector = stf.ReadBoolBlock(false); break;
                     case "speedselectorisdiscrete": SpeedSelectorIsDiscrete = stf.ReadBoolBlock(false); break;
@@ -540,10 +544,6 @@ public void Update(float elapsedClockSeconds)
                         Locomotive.ThrottlePercent = 0;
                         Locomotive.DynamicBrakePercent = -CCThrottleOrDynBrakePercent;
                     }
-                    if (prevTrainBrakePercent != trainBrakePercent && !TrainBrakePriority)
-                    {
-                        Locomotive.TrainBrakeController.SetPercent(trainBrakePercent); // TODO: do not move actual train brake lever
-                    }
                     IsActive = true;
                 }
                 if (!IsActive && wasActive)