Automatic merge of T1.6-rc8-48-ga5be12922 and 15 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file
- 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 61c08c3: Built-in PBL2 brake controller
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul
- Pull request #1157 at 71283ab: Dynamic brake authorization by TCS

Author: openrails-bot

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

@@ -86,6 +86,11 @@ internal void AttachToHost(ScriptedBrakeController host)
         /// </summary>
         public bool IsCabPowerSupplyOn() => LocomotivePowerSupply.CabPowerSupplyOn;
 
+        /// <summary>
+        /// True if auxiliary power supply is switched on.
+        /// </summary>
+        public bool IsAuxiliaryPowerSupplyOn() => LocomotivePowerSupply.AuxiliaryPowerSupplyOn;
+
         /// <summary>
         /// Brake pipe pressure
         /// </summary>

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

@@ -136,7 +136,7 @@ public override float Update(float elapsedSeconds)
                     break;
             }
 
-            NeutralModeOn = NeutralModeCommandSwitchOn || EmergencyBrakingPushButton() || TCSEmergencyBraking();
+            NeutralModeOn = NeutralModeCommandSwitchOn || EmergencyBrakingPushButton() || TCSEmergencyBraking() || !IsAuxiliaryPowerSupplyOn();
 
             return CurrentValue();
         }
@@ -266,18 +266,20 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                         break;
                     }
                 case State.Emergency:
-                    SetUpdateValue(1);
-
-                    pressureBar -= EmergencyRateBarpS() * elapsedClockSeconds;
+                    {
+                        SetUpdateValue(1);
 
-                    if (pressureBar < 0)
-                        pressureBar = 0;
-                    break;
+                        float dp =  EmergencyRateBarpS() * elapsedClockSeconds;
+                        if (pressureBar - dp < MaxPressureBar() - FullServReductionBar())
+                            dp = Math.Max(pressureBar - (MaxPressureBar() - FullServReductionBar()), 0);
+                        pressureBar -= dp;
+                        break;
+                    }
             }
 
             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)
+            else if (!NeutralModeOn && BrakePipePressureBar() >= MaxPressureBar() - FullServReductionBar() && BrakePipePressureBar() < Math.Min(MaxPressureBar(), pressureBar) - EpActivationThresholdBar)
                 epPressureBar = 0; // EP release wire
             else
                 epPressureBar = -1;
@@ -391,8 +393,16 @@ public override bool IsValid()
 
         public override ControllerState GetState()
         {
-            if (CurrentState != State.Emergency && NeutralModeOn)
-                return ControllerState.Neutral;
+            if (NeutralModeOn)
+            {
+                switch (CurrentState)
+                {
+                    case State.Emergency:
+                        return ControllerState.Emergency;
+                    default:
+                        return ControllerState.Lap;
+                }
+            }
             switch (CurrentState)
             {
                 case State.Overcharge: