Improvements to the PBL2 controller

Author: cesarBLG

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

@@ -367,7 +367,8 @@ public void Initialize()
         {
             if (!Activated)
             {
-                if (ScriptName != null && ScriptName != "MSTS")
+                if (ScriptName == "PBL2") Script = new PBL2BrakeController();
+                else if (ScriptName != null && ScriptName != "MSTS")
                 {
                     var pathArray = new string[] { Path.Combine(Path.GetDirectoryName(Locomotive.WagFilePath), "Script") };
                     Script = Simulator.ScriptManager.Load(pathArray, ScriptName) as BrakeController;

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

@@ -16,10 +16,9 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
-using Orts.Simulation.RollingStocks.SubSystems.Controllers;
 using ORTS.Scripting.Api;
 
-namespace ORTS.Scripting.Script
+namespace Orts.Simulation.RollingStocks.SubSystems.Controllers
 {
     public class PBL2BrakeController : BrakeController
     {
@@ -54,10 +53,9 @@ public enum ControllerPosition
         private Timer ResetTimer { get; set; }
 
         // brake controller values
-        private float OverchargePressureBar = 0.4f;
-        private float OverchargeEleminationPressureRateBarpS = 0.0025f;
         private float FirstDepressureBar = 0.5f;
         private float BrakeReleasedDepressureBar = 0.2f;
+        private float EpActivationThresholdBar = 0.15f;
 
         private State CurrentState;
         private ControllerPosition CurrentPosition = ControllerPosition.Hold;
@@ -67,8 +65,6 @@ public enum ControllerPosition
         private bool OverchargeElimination = false;
         private bool QuickRelease = false;
 
-        private float RegulatorPressureBar = 0.0f;
-
         private float? AiBrakeTargetPercent = null;
 
         public override void Initialize()
@@ -84,8 +80,10 @@ public override void Initialize()
                         ReleaseValue = notch.Value;
                         ReleaseNotch = Notches().IndexOf(notch);
                         break;
-                    case ControllerState.FullQuickRelease:
+                    case ControllerState.Overcharge:
                         OverchargeValue = notch.Value;
+                        break;
+                    case ControllerState.FullQuickRelease:
                         QuickReleaseValue = notch.Value;
                         break;
                     case ControllerState.Lap:
@@ -146,104 +144,129 @@ public override float Update(float elapsedSeconds)
 
         public override void UpdatePressure(ref float pressureBar, float elapsedClockSeconds, ref float epPressureBar)
         {
-            RegulatorPressureBar = Math.Min(MaxPressureBar(), MainReservoirPressureBar());
-
             if (AiBrakeTargetPercent != null)
             {
-                pressureBar = RegulatorPressureBar - (float)AiBrakeTargetPercent * FullServReductionBar();
-                epPressureBar = (float)AiBrakeTargetPercent * MaxPressureBar();
+                pressureBar = MaxPressureBar() - (float)AiBrakeTargetPercent / 100 * FullServReductionBar();
+                epPressureBar = (float)AiBrakeTargetPercent / 100;
                 return;
             }
 
-            if (!FirstDepression && CurrentPosition == ControllerPosition.Apply && pressureBar > Math.Max(RegulatorPressureBar - FirstDepressureBar, 0))
+            if (!FirstDepression && CurrentPosition == ControllerPosition.Apply && pressureBar > Math.Max(MaxPressureBar() - FirstDepressureBar, 0))
                 FirstDepression = true;
-            else if (FirstDepression && pressureBar <= Math.Max(RegulatorPressureBar - FirstDepressureBar, 0))
+            else if (FirstDepression && pressureBar <= Math.Max(MaxPressureBar() - FirstDepressureBar, 0))
                 FirstDepression = false;
 
+            if (QuickReleaseButtonPressed())
+                QuickRelease = true;
+            if (OverchargeButtonPressed())
+            {
+                Overcharge = true;
+                OverchargeElimination = false;
+            }
+            else if (Overcharge)
+            {
+                Overcharge = false;
+                OverchargeElimination = true;
+            }
             if (CurrentPosition == ControllerPosition.Apply && Overcharge)
                 Overcharge = false;
             if (CurrentPosition == ControllerPosition.Apply && QuickRelease)
                 QuickRelease = false;
 
             if (EmergencyBrakingPushButton() || TCSEmergencyBraking())
                 CurrentState = State.Emergency;
+            else if (TCSFullServiceBraking() && pressureBar > MaxPressureBar() - FullServReductionBar())
+                CurrentState = State.Apply;
             else if (
-                CurrentPosition == ControllerPosition.Apply && pressureBar > RegulatorPressureBar - FullServReductionBar()
-                || FirstDepression && CurrentPosition != ControllerPosition.Release && !QuickRelease && pressureBar > RegulatorPressureBar - FirstDepressureBar
+                CurrentPosition == ControllerPosition.Apply && pressureBar > MaxPressureBar() - FullServReductionBar()
+                || FirstDepression && CurrentPosition != ControllerPosition.Release && !QuickRelease && pressureBar > MaxPressureBar() - FirstDepressureBar
                 )
                 CurrentState = State.Apply;
-            else if (OverchargeElimination && pressureBar > RegulatorPressureBar)
+            else if (OverchargeElimination && pressureBar > MaxPressureBar())
                 CurrentState = State.OverchargeElimination;
-            else if (Overcharge && pressureBar <= RegulatorPressureBar + OverchargePressureBar)
+            else if (Overcharge && pressureBar <= Math.Min(MaxOverchargePressureBar(), MainReservoirPressureBar()))
                 CurrentState = State.Overcharge;
-            else if (QuickRelease && !NeutralModeOn && pressureBar < RegulatorPressureBar)
+            else if (QuickRelease && !NeutralModeOn && pressureBar < Math.Min(MaxPressureBar(), MainReservoirPressureBar()))
                 CurrentState = State.QuickRelease;
             else if (
                 !NeutralModeOn && (
-                    CurrentPosition == ControllerPosition.Release && pressureBar < RegulatorPressureBar
-                    || !FirstDepression && pressureBar > RegulatorPressureBar - BrakeReleasedDepressureBar && pressureBar < RegulatorPressureBar
-                    || pressureBar < RegulatorPressureBar - FullServReductionBar()
+                    CurrentPosition == ControllerPosition.Release && pressureBar < Math.Min(MaxPressureBar(), MainReservoirPressureBar())
+                    || !FirstDepression && pressureBar > MaxPressureBar() - BrakeReleasedDepressureBar && pressureBar < Math.Min(MaxPressureBar(), MainReservoirPressureBar())
+                    || pressureBar < MaxPressureBar() - FullServReductionBar()
                     )
                 )
                 CurrentState = State.Release;
             else
                 CurrentState = State.Hold;
 
+            float targetPressureBar = pressureBar;
             switch (CurrentState)
             {
                 case State.Overcharge:
-                    SetUpdateValue(-1);
-
-                    pressureBar += QuickReleaseRateBarpS() * elapsedClockSeconds;
-                    epPressureBar -= QuickReleaseRateBarpS() * elapsedClockSeconds;
+                    {
+                        SetUpdateValue(-1);
 
-                    if (pressureBar > MaxPressureBar() + OverchargePressureBar)
-                        pressureBar = MaxPressureBar() + OverchargePressureBar;
-                    break;
+                        float dp = QuickReleaseRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar + dp > MaxOverchargePressureBar())
+                            dp = MaxOverchargePressureBar() - pressureBar;
+                        if (pressureBar + dp > MainReservoirPressureBar())
+                            dp = Math.Max(MainReservoirPressureBar() - pressureBar, 0);
+                        pressureBar += dp;
 
+                        break;
+                    }
                 case State.OverchargeElimination:
-                    SetUpdateValue(-1);
-
-                    pressureBar -= OverchargeEleminationPressureRateBarpS * elapsedClockSeconds;
+                    {
+                        SetUpdateValue(-1);
 
-                    if (pressureBar < MaxPressureBar())
-                        pressureBar = MaxPressureBar();
-                    break;
+                        float dp = OverchargeEliminationRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar - dp < MaxPressureBar())
+                            dp = Math.Max(pressureBar - MaxPressureBar(), 0);
+                        pressureBar -= dp;
 
+                        break;
+                    }
                 case State.QuickRelease:
-                    SetUpdateValue(-1);
-
-                    pressureBar += QuickReleaseRateBarpS() * elapsedClockSeconds;
-                    epPressureBar -= QuickReleaseRateBarpS() * elapsedClockSeconds;
+                    {
+                        SetUpdateValue(-1);
 
-                    if (pressureBar > RegulatorPressureBar)
-                        pressureBar = RegulatorPressureBar;
-                    break;
+                        float dp = QuickReleaseRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar + dp > MaxPressureBar())
+                            dp = MaxPressureBar() - pressureBar;
+                        if (pressureBar + dp > MainReservoirPressureBar())
+                            dp = Math.Max(MainReservoirPressureBar() - pressureBar, 0);
+                        pressureBar += dp;
 
+                        break;
+                    }
                 case State.Release:
-                    SetUpdateValue(-1);
+                    {
+                        SetUpdateValue(-1);
 
-                    pressureBar += ReleaseRateBarpS() * elapsedClockSeconds;
-                    epPressureBar -= ReleaseRateBarpS() * elapsedClockSeconds;
-
-                    if (pressureBar > RegulatorPressureBar)
-                        pressureBar = RegulatorPressureBar;
-                    break;
+                        float dp = ReleaseRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar + dp > MaxPressureBar())
+                            dp = MaxPressureBar() - pressureBar;
+                        if (pressureBar + dp > MainReservoirPressureBar())
+                            dp = Math.Max(MainReservoirPressureBar() - pressureBar, 0);
+                        pressureBar += dp;
 
+                        break;
+                    }
                 case State.Hold:
                     SetUpdateValue(0);
                     break;
 
                 case State.Apply:
-                    SetUpdateValue(1);
-
-                    pressureBar -= ApplyRateBarpS() * elapsedClockSeconds;
-                    epPressureBar += ApplyRateBarpS() * elapsedClockSeconds;
+                    {
+                        SetUpdateValue(1);
 
-                    if (pressureBar < Math.Max(RegulatorPressureBar - FullServReductionBar(), 0.0f))
-                        pressureBar = Math.Max(RegulatorPressureBar - FullServReductionBar(), 0.0f);
-                    break;
+                        float dp = ApplyRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar - dp < MaxPressureBar() - FullServReductionBar())
+                            dp = Math.Max(pressureBar - (MaxPressureBar() - FullServReductionBar()), 0);
+                        pressureBar -= dp;
 
+                        break;
+                    }
                 case State.Emergency:
                     SetUpdateValue(1);
 
@@ -254,12 +277,14 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                     break;
             }
 
-            if (epPressureBar > MaxPressureBar())
-                epPressureBar = MaxPressureBar();
-            if (epPressureBar < 0)
-                epPressureBar = 0;
+            if (BrakePipePressureBar() > Math.Max(MaxPressureBar() - FullServReductionBar(), pressureBar) + EpActivationThresholdBar)
+                epPressureBar = 1; // EP application wire
+            else if (CurrentState != State.Emergency && BrakePipePressureBar() >= MaxPressureBar() - FullServReductionBar() && BrakePipePressureBar() < Math.Min(MaxPressureBar(), pressureBar) - EpActivationThresholdBar)
+                epPressureBar = 0; // EP release wire
+            else
+                epPressureBar = -1;
 
-            if (QuickRelease && pressureBar == RegulatorPressureBar)
+            if (QuickRelease && pressureBar >= Math.Min(MaxPressureBar(), MainReservoirPressureBar()))
                 QuickRelease = false;
         }
 
@@ -365,6 +390,8 @@ public override bool IsValid()
 
         public override ControllerState GetState()
         {
+            if (CurrentState != State.Emergency && NeutralModeOn)
+                return ControllerState.Neutral;
             switch (CurrentState)
             {
                 case State.Overcharge:
@@ -383,15 +410,16 @@ public override ControllerState GetState()
                     return ControllerState.Hold;
 
                 case State.Apply:
-                    return ControllerState.Apply;
+                    if (TCSFullServiceBraking())
+                        return ControllerState.TCSFullServ;
+                    else
+                        return ControllerState.Apply;
 
                 case State.Emergency:
                     if (EmergencyBrakingPushButton())
                         return ControllerState.EBPB;
                     else if (TCSEmergencyBraking())
                         return ControllerState.TCSEmergency;
-                    else if (TCSFullServiceBraking())
-                        return ControllerState.TCSFullServ;
                     else
                         return ControllerState.Emergency;