Automatic merge of T1.6-rc2-41-gacd714487 and 10 pull requests

- Pull request #1104 at 03ccdc6: Handle simple adhesion within the axle module
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2391bc0: Automatic speed control
- Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front.
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1114 at 9a4a873: Fix color of DB in DrivingInfo when in setup with DPU fenced.
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1116 at 721d118: Fix Potential Hang in AnimatedPart.SetFrameWrap
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs

@@ -150,7 +150,7 @@ public class DefaultDieselPowerSupply : DieselPowerSupply
         /// </remarks>
         private DieselEngineState PreviousSecondEngineState;
 
-        private bool QuickPowerOn = false;
+        private (bool CloseTractionCutOffRelay, bool SwitchOnElectricTrainSupply) QuickPowerOn = (false, false);
 
         public override void Initialize()
         {
@@ -197,11 +197,10 @@ public override void Update(float elapsedClockSeconds)
                     {
                         case TractionCutOffRelayState.Open:
                             // If traction cut-off relay is open, then it must be closed to finish the quick power-on sequence
-                            if (QuickPowerOn)
+                            if (QuickPowerOn.CloseTractionCutOffRelay)
                             {
-                                QuickPowerOn = false;
+                                QuickPowerOn.CloseTractionCutOffRelay = false;
                                 SignalEventToTractionCutOffRelay(PowerSupplyEvent.CloseTractionCutOffRelay);
-                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
                             }
 
                             if (PowerOnTimer.Started)
@@ -216,11 +215,7 @@ public override void Update(float elapsedClockSeconds)
 
                         case TractionCutOffRelayState.Closed:
                             // If traction cut-off relay is closed, quick power-on sequence has finished
-                            if (QuickPowerOn)
-                            {
-                                QuickPowerOn = false;
-                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
-                            }
+                            if (QuickPowerOn.CloseTractionCutOffRelay) QuickPowerOn.CloseTractionCutOffRelay = false;
 
                             if (!PowerOnTimer.Started)
                                 PowerOnTimer.Start();
@@ -240,6 +235,12 @@ public override void Update(float elapsedClockSeconds)
                     {
                         SignalEvent(Event.PowerConverterOn);
                         SetCurrentAuxiliaryPowerSupplyState(PowerSupplyState.PowerOn);
+
+                        if (QuickPowerOn.SwitchOnElectricTrainSupply)
+                        {
+                            QuickPowerOn.SwitchOnElectricTrainSupply = false;
+                            if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
+                        }
                     }
                     break;
             }
@@ -312,14 +313,14 @@ public override void HandleEvent(PowerSupplyEvent evt)
             switch (evt)
             {
                 case PowerSupplyEvent.QuickPowerOn:
-                    QuickPowerOn = true;
+                    QuickPowerOn = (true, true);
                     SignalEventToBatterySwitch(PowerSupplyEvent.QuickPowerOn);
                     SignalEventToMasterKey(PowerSupplyEvent.TurnOnMasterKey);
                     SignalEventToDieselEngines(PowerSupplyEvent.StartEngine);
                     break;
 
                 case PowerSupplyEvent.QuickPowerOff:
-                    QuickPowerOn = false;
+                    QuickPowerOn = (false, false);
                     SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOffElectricTrainSupply);
                     SignalEventToTractionCutOffRelay(PowerSupplyEvent.OpenTractionCutOffRelay);
                     SignalEventToDieselEngines(PowerSupplyEvent.StopEngine);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs

@@ -176,7 +176,7 @@ public class DefaultElectricPowerSupply : ElectricPowerSupply
         private Timer PowerOnTimer;
         private Timer AuxPowerOnTimer;
 
-        private bool QuickPowerOn = false;
+        private (bool CloseCircuitBreaker, bool SwitchOnElectricTrainSupply) QuickPowerOn;
 
         public override void Initialize()
         {
@@ -227,10 +227,9 @@ public override void Update(float elapsedClockSeconds)
                     {
                         case CircuitBreakerState.Open:
                             // If circuit breaker is open, then it must be closed to finish the quick power-on sequence
-                            if (QuickPowerOn)
+                            if (QuickPowerOn.CloseCircuitBreaker)
                             {
-                                QuickPowerOn = false;
-                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
+                                QuickPowerOn.CloseCircuitBreaker = false;
                                 SignalEventToCircuitBreaker(PowerSupplyEvent.QuickPowerOn);
                             }
 
@@ -254,11 +253,7 @@ public override void Update(float elapsedClockSeconds)
 
                         case CircuitBreakerState.Closed:
                             // If circuit breaker is closed, quick power-on sequence has finished
-                            if (QuickPowerOn)
-                            {
-                                QuickPowerOn = false;
-                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
-                            }
+                            if (QuickPowerOn.CloseCircuitBreaker) QuickPowerOn.CloseCircuitBreaker = false;
 
                             if (!PowerOnTimer.Started)
                                 PowerOnTimer.Start();
@@ -274,6 +269,12 @@ public override void Update(float elapsedClockSeconds)
                             {
                                 SignalEvent(Event.PowerConverterOn);
                                 SetCurrentAuxiliaryPowerSupplyState(PowerSupplyState.PowerOn);
+
+                                if (QuickPowerOn.SwitchOnElectricTrainSupply)
+                                {
+                                    QuickPowerOn.SwitchOnElectricTrainSupply = false;
+                                    if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
+                                }
                             }
                             SetFilterVoltageV(VoltageFilter.Filter(PantographVoltageV(), elapsedClockSeconds));
                             break;
@@ -309,15 +310,15 @@ public override void HandleEvent(PowerSupplyEvent evt)
             switch (evt)
             {
                 case PowerSupplyEvent.QuickPowerOn:
-                    QuickPowerOn = true;
+                    QuickPowerOn = (true, true);
                     SignalEventToBatterySwitch(PowerSupplyEvent.QuickPowerOn);
                     SignalEventToMasterKey(PowerSupplyEvent.TurnOnMasterKey);
                     SignalEventToPantograph(PowerSupplyEvent.RaisePantograph, 1);
                     SignalEventToOtherTrainVehiclesWithId(PowerSupplyEvent.RaisePantograph, 1);
                     break;
 
                 case PowerSupplyEvent.QuickPowerOff:
-                    QuickPowerOn = false;
+                    QuickPowerOn = (false, false);
                     SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOffElectricTrainSupply);
                     SignalEventToCircuitBreaker(PowerSupplyEvent.QuickPowerOff);
                     SignalEventToPantographs(PowerSupplyEvent.LowerPantograph);