Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 12 pull requests

- Pull request #1104 at c039a26: Handle simple adhesion within the axle module
- Pull request #1057 at 1c2bcb4: Switchable brake system
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2391bc0: Automatic speed control
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1123 at dc286f5: Handle null control active locomotive
- Pull request #1125 at 7a4f055: Lift #1096 into 1.6 release
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at 1d765f0: Built-in PBL2 brake controller

Author: openrails-bot

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

@@ -53,7 +53,6 @@ public enum ControllerPosition
         private Timer ResetTimer { get; set; }
 
         // brake controller values
-        private float FirstDepressureBar = 0.5f;
         private float BrakeReleasedDepressureBar = 0.2f;
         private float EpActivationThresholdBar = 0.15f;
 
@@ -151,9 +150,9 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                 return;
             }
 
-            if (!FirstDepression && CurrentPosition == ControllerPosition.Apply && pressureBar > Math.Max(MaxPressureBar() - FirstDepressureBar, 0))
+            if (!FirstDepression && CurrentPosition == ControllerPosition.Apply && pressureBar > Math.Max(MaxPressureBar() - MinReductionBar(), 0))
                 FirstDepression = true;
-            else if (FirstDepression && pressureBar <= Math.Max(MaxPressureBar() - FirstDepressureBar, 0))
+            else if (FirstDepression && pressureBar <= Math.Max(MaxPressureBar() - MinReductionBar(), 0))
                 FirstDepression = false;
 
             if (QuickReleaseButtonPressed())
@@ -179,7 +178,7 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                 CurrentState = State.Apply;
             else if (
                 CurrentPosition == ControllerPosition.Apply && pressureBar > MaxPressureBar() - FullServReductionBar()
-                || FirstDepression && CurrentPosition != ControllerPosition.Release && !QuickRelease && pressureBar > MaxPressureBar() - FirstDepressureBar
+                || FirstDepression && CurrentPosition != ControllerPosition.Release && !QuickRelease && pressureBar > MaxPressureBar() - MinReductionBar()
                 )
                 CurrentState = State.Apply;
             else if (OverchargeElimination && pressureBar > MaxPressureBar())
@@ -199,7 +198,6 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
             else
                 CurrentState = State.Hold;
 
-            float targetPressureBar = pressureBar;
             switch (CurrentState)
             {
                 case State.Overcharge:
@@ -286,6 +284,9 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
 
             if (QuickRelease && pressureBar >= Math.Min(MaxPressureBar(), MainReservoirPressureBar()))
                 QuickRelease = false;
+
+            if (OverchargeElimination && pressureBar <= MaxPressureBar())
+                OverchargeElimination = false;
         }
 
         public override void UpdateEngineBrakePressure(ref float pressureBar, float elapsedClockSeconds)