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

- Pull request #1104 at 1f7af77: 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 7fc8de1: 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 #1129 at 034b6e2: adds missing es.po files
- Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID.
- Pull request #1131 at d8f0d8c: fix: Skip byte position from compressed files as it is not supported
- Pull request #1132 at 1dd9be8: Fixes For Correct Questionable Braking Parameters
- 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 fab5457: Built-in PBL2 brake controller

Author: openrails-bot

Source/Documentation/Manual/options.rst

@@ -863,21 +863,23 @@ are a problem for OR, which has a more sophisticated braking model. The
 problem usually is that the train brakes require a long time to release,
 and in some times do not release at all.
 
-.. index::
-   single: AirBrakesAirCompressorPowerRating
-
 The following checks and corrections are performed if the option is
-checked (only for single-pipe brake system):
+checked:
 
 - if the compressor restart pressure is smaller or very near to the max
   system pressure, the compressor restart pressure and if necessary the max
-  main reservoir pressure are increased;
+  main reservoir pressure are increased (single pipe air brakes only)
 - if the main reservoir volume is smaller than 0.3 m\ :sup:`3` and the
   engine mass is higher than 20 tons, the reservoir volume is raised to 0.78
-  m\ :sup:`3`;
-- the charging rate of the reservoir is derived from the .eng parameter
-  ``AirBrakesAirCompressorPowerRating`` (if this generates a value greater
-  than 0.5 psi/s) instead of using a default value.
+  m\ :sup:`3`
+- the maximum brake cylinder pressure will be reduced to the maximum pressure
+  possible from a full service train brake application if it was set above this
+  amount
+- any brake pipe leakage specified by ``TrainPipeLeakRate`` is disabled
+- the dynamic brake delay on electric locomotives is reduced to 2 seconds
+  if it was defined to be above 4 seconds
+- dynamic brake force left at the default value of 20kN will be increased to
+  half the locomotive's continuous force, or 150kN, whichever is lower
 
 For a full list of parameters, see :ref:`Developing ORTS Content - Parameters and Tokens<parameters_and_tokens>`
 

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

@@ -389,7 +389,7 @@ public float OdometerM
         public float CompressorRestartPressurePSI = 110;
         public float CompressorChargingRateM3pS = 0.075f;
         public bool CompressorIsMUControlled = false;
-        public float MainResChargingRatePSIpS = 0.4f;
+        public float MainResChargingRatePSIpS = -1.0f;
         public float EngineBrakeReleaseRatePSIpS = 12.5f;
         public float EngineBrakeApplyRatePSIpS = 12.5f;
         public float BrakePipeTimeFactorS = 0.0015f;
@@ -2023,16 +2023,18 @@ protected void CorrectBrakingParams()
                     // correct questionable MaxCylPressurePSI
                     BrakeSystem.CorrectMaxCylPressurePSI(this);
                 }
-                if (MainResChargingRatePSIpS <= 0)
+                // Disable brake pipe leak to prevent stuck brakes
+                if (TrainBrakePipeLeakPSIorInHgpS > 0)
+                    TrainBrakePipeLeakPSIorInHgpS = 0;
+            }
+            // No OR compressor speed defined, use MSTS compressor speed or 0.025 m^3/s (whichever is higher)
+            if (MainResChargingRatePSIpS < 0) 
                 {
-                    MainResChargingRatePSIpS = Math.Max(0.5f, (CompressorChargingRateM3pS * Bar.ToPSI(1)) / MainResVolumeM3);
+                MainResChargingRatePSIpS = Math.Max(0.025f, CompressorChargingRateM3pS) * OneAtmospherePSI / MainResVolumeM3;
                 }
-            }
-            else if (MainResChargingRatePSIpS <= 0) MainResChargingRatePSIpS = 0.4f;
 
             // Corrections for dynamic braking parameters
 
-            if (this is MSTSElectricLocomotive && DynamicBrakeDelayS > 4) DynamicBrakeDelayS = 2; // Electric locomotives have short engaging delays
             if (DynamicBrakeSpeed2MpS > 0 && DynamicBrakeSpeed3MpS > 0 && DynamicBrakeSpeed2MpS > DynamicBrakeSpeed3MpS)
             {
                 // also exchanging DynamicBrakesMaximumEffectiveSpeed with DynamicBrakesFadingSpeed is a frequent error that upsets operation of
@@ -2043,6 +2045,9 @@ protected void CorrectBrakingParams()
             }
             if (Simulator.Settings.CorrectQuestionableBrakingParams)
             {
+                if (this is MSTSElectricLocomotive && DynamicBrakeDelayS > 4)
+                    DynamicBrakeDelayS = 2; // Electric locomotives have short engaging delays
+
                 if (MaxDynamicBrakeForceN > 0 && MaxContinuousForceN > 0 &&
                 (MaxDynamicBrakeForceN / MaxContinuousForceN < 0.3f && MaxDynamicBrakeForceN == 20000))
                     MaxDynamicBrakeForceN = Math.Min (MaxContinuousForceN * 0.5f, 150000); // 20000 is suggested as standard value in the MSTS documentation, but in general it is a too low value