Cruise control parking mode

Author: cesarBLG

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

@@ -189,7 +189,7 @@ public float IntermediateValue
         /// <summary>
         /// Fraction of train brake demanded by cruise control
         /// </summary>
-        public float CruiseControlBrakeDemand() => Locomotive.CruiseControl != null ? Locomotive.CruiseControl.TrainBrakePercent / 100 : 0;
+        public float CruiseControlBrakeDemand() => Host.CruiseControlBrakeDemand;
 
         /// <summary>
         /// Current notch of the brake controller

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

@@ -152,6 +152,15 @@ public bool OverchargeButtonPressed
         public float FullServReductionPSI { get; private set; }
         public float MinReductionPSI { get; private set; }
         public float TrainDynamicBrakeIntervention { get; set; } = -1;
+        public float CruiseControlBrakeDemand
+        { 
+            get
+            {
+                if (Locomotive.CruiseControl == null) return 0;
+                if (this == Locomotive.EngineBrakeController) return Locomotive.CruiseControl.EngineBrakePercent / 100;
+                else return Locomotive.CruiseControl.TrainBrakePercent / 100;
+            }
+        }
         InterpolatorDiesel2D DynamicBrakeBlendingTable;
 
         /// <summary>

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

@@ -296,11 +296,18 @@ public override void UpdateEngineBrakePressure(ref float pressureBar, float elap
                         DecreasePressure(ref pressureBar, x, ReleaseRateBarpS(), elapsedClockSeconds);
                         break;
                 }
-                if (pressureBar > MaxPressureBar())
-                    pressureBar = MaxPressureBar();
-                if (pressureBar < 0)
-                    pressureBar = 0;
             }
+
+            float ccdemand = CruiseControlBrakeDemand();
+            if (ccdemand > 0)
+            {
+                pressureBar = Math.Max((MaxPressureBar() - FullServReductionBar()) * ccdemand, pressureBar);
+            }
+
+            if (pressureBar > MaxPressureBar())
+                pressureBar = MaxPressureBar();
+            if (pressureBar < 0)
+                pressureBar = 0;
         }
 
         public override void HandleEvent(BrakeControllerEvent evt)

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

@@ -103,7 +103,8 @@ public float SetSpeedKpHOrMpH
         public float DynamicBrakeMaxForceAtSelectorStep = 0;
         public float? ThrottlePercent { get; private set;}
         public float? DynamicBrakePercent { get; private set;}
-        public float TrainBrakePercent { get; private set;}
+        public float TrainBrakePercent { get; private set; }
+        public float EngineBrakePercent { get; private set; }
         protected float trainLength = 0;
         public int TrainLengthMeters = 0;
         public float CurrentSelectedSpeedMpS = 0;
@@ -447,6 +448,7 @@ public void Update(float elapsedClockSeconds)
                 ThrottlePercent = null;
                 DynamicBrakePercent = null;
                 TrainBrakePercent = 0;
+                EngineBrakePercent = 0;
                 return;
             }
 
@@ -477,6 +479,7 @@ public void Update(float elapsedClockSeconds)
                 ThrottlePercent = null;
                 DynamicBrakePercent = null;
                 TrainBrakePercent = 0;
+                EngineBrakePercent = 0;
             }
             else if (SpeedRegMode == SpeedRegulatorMode.Auto)
             {
@@ -500,13 +503,18 @@ public void Update(float elapsedClockSeconds)
                     timeFromEngineMoved = 0;
                     reducingForce = true;
                 }
-                if (SpeedRegulatorOptions.Contains("engageforceonnonzerospeed") && SelectedSpeedMpS > 0)
+                if (SpeedRegulatorOptions.Contains("engageforceonnonzerospeed") && SelectedSpeedMpS > 0 && (SpeedSelMode != SpeedSelectorMode.Parking || !ForceResetRequiredAfterBraking || (WasForceReset && SelectedMaxAccelerationPercent > 0)))
                 {
                     SpeedSelMode = SpeedSelectorMode.On;
                     SpeedRegMode = SpeedRegulatorMode.Auto;
                     SkipThrottleDisplay = true;
                     reducingForce = false;
                 }
+                else if (SpeedRegulatorOptions.Contains("engageparkingonzerospeed") && SelectedSpeedMpS == 0 && Locomotive.AbsWheelSpeedMpS <= (SpeedIsMph ? MpS.FromMpH(ParkingBrakeEngageSpeed) : MpS.FromKpH(ParkingBrakeEngageSpeed)) && SpeedSelMode != SpeedSelectorMode.Parking)
+                {
+                    SpeedSelMode = SpeedSelectorMode.Parking;
+                    WasForceReset = false;
+                }
                 if (Locomotive.TrainBrakeController.MaxPressurePSI - Locomotive.BrakeSystem.BrakeLine1PressurePSI < 1 && Locomotive.Train.BrakeLine4 <= 0)
                 {
                     if (TrainBrakePercent == 0) CCIsUsingTrainBrake = false;
@@ -542,9 +550,6 @@ public void Update(float elapsedClockSeconds)
                     (ForceResetRequiredAfterBraking && (TrainBrakeCommandHasPriorityOverAcceleratingCruiseControl && (CCThrottleOrDynBrakePercent > 0 || TrainBrakeCommandHasPriorityOverCruiseControl)) &&
                         (!WasForceReset || (WasBraking && SelectedMaxAccelerationPercent > 0))))
                 {
-                    if (SpeedSelMode == SpeedSelectorMode.Parking)
-                        if (Locomotive.AbsWheelSpeedMpS < (SpeedIsMph ? MpS.FromMpH(ParkingBrakeEngageSpeed) : MpS.FromKpH(ParkingBrakeEngageSpeed)))
-                            Locomotive.SetEngineBrakePercent(ParkingBrakePercent);
                     CCThrottleOrDynBrakePercent = 0;
                     TrainBrakePercent = 0;
                 }
@@ -567,6 +572,15 @@ public void Update(float elapsedClockSeconds)
                 }
                 else if (CCThrottleOrDynBrakePercent < 0) DynamicBrakePercent = -CCThrottleOrDynBrakePercent;
                 else DynamicBrakePercent = -1;
+                if (SpeedSelMode == SpeedSelectorMode.Parking && !EngineBrakePriority)
+                {
+                    if (Locomotive.AbsWheelSpeedMpS <= (SpeedIsMph ? MpS.FromMpH(ParkingBrakeEngageSpeed) : MpS.FromKpH(ParkingBrakeEngageSpeed)))
+                        EngineBrakePercent = ParkingBrakePercent;
+                }
+                else
+                {
+                    EngineBrakePercent = 0;
+                }
                 if (!IsActive && wasActive)
                 {
                     CCIsUsingTrainBrake = false;
@@ -724,7 +738,6 @@ public void SpeedSelectorModeStartIncrease()
             while (!test)
             {
                 SpeedSelMode++;
-                if (SpeedSelMode != SpeedSelectorMode.Parking && !EngineBrakePriority) Locomotive.SetEngineBrakePercent(0);
                 switch (SpeedSelMode)
                 {
                     case SpeedSelectorMode.Neutral: if (SpeedRegulatorOptions.Contains("selectorneutral")) test = true; break;
@@ -1194,9 +1207,6 @@ public void CalculateRequiredForce(float elapsedClockSeconds, float AbsWheelSpee
                 {
                     CCThrottleOrDynBrakePercent = 0;
                 }
-
-                if (AbsWheelSpeedMpS < (SpeedIsMph ? MpS.FromMpH(ParkingBrakeEngageSpeed) : MpS.FromKpH(ParkingBrakeEngageSpeed)))
-                    Locomotive.SetEngineBrakePercent(ParkingBrakePercent);
             }
             else if (SpeedSelMode == SpeedSelectorMode.Neutral || SpeedSelMode < SpeedSelectorMode.Start && !SpeedRegulatorOptions.Contains("startfromzero") && AbsWheelSpeedMpS < SafeSpeedForAutomaticOperationMpS)
             {