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

- 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 01c0838: Do not activate ETS switch if no suitable cars are attached
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1104 at f40920a: Handle simple adhesion within the axle module
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs

@@ -207,6 +207,25 @@ protected float ThrottleReductionPercent
         /// </summary>
         protected float ElectricTrainSupplyPowerW => LpsHost.ElectricTrainSupplyPowerW;
 
+        /// <summary>
+        /// Number of cars that require energy from the electric train supply
+        /// </summary>
+        protected int NumberOfElectricTrainSupplyConnectedCars
+        {
+            get
+            {
+                int count = 0;
+                foreach (var car in Train.Cars)
+                {
+                    if (car == null) continue;
+                    if (!(car is MSTSWagon wagon)) continue;
+                    if (!(wagon.PassengerCarPowerSupply?.ElectricTrainSupplyConnectedLocomotives.Contains(Locomotive) ?? false)) continue;
+                    count++;
+                }
+                return count;
+            }
+        }
+
         /// <summary>
         /// Returns the index of the current locomotive in the train (taking into account only locomotives)
         /// </summary>

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

@@ -201,6 +201,7 @@ public override void Update(float elapsedClockSeconds)
                             {
                                 QuickPowerOn = false;
                                 SignalEventToTractionCutOffRelay(PowerSupplyEvent.CloseTractionCutOffRelay);
+                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
                             }
 
                             if (PowerOnTimer.Started)
@@ -215,7 +216,11 @@ public override void Update(float elapsedClockSeconds)
 
                         case TractionCutOffRelayState.Closed:
                             // If traction cut-off relay is closed, quick power-on sequence has finished
-                            QuickPowerOn = false;
+                            if (QuickPowerOn)
+                            {
+                                QuickPowerOn = false;
+                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
+                            }
 
                             if (!PowerOnTimer.Started)
                                 PowerOnTimer.Start();
@@ -311,7 +316,6 @@ public override void HandleEvent(PowerSupplyEvent evt)
                     SignalEventToBatterySwitch(PowerSupplyEvent.QuickPowerOn);
                     SignalEventToMasterKey(PowerSupplyEvent.TurnOnMasterKey);
                     SignalEventToDieselEngines(PowerSupplyEvent.StartEngine);
-                    SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
                     break;
 
                 case PowerSupplyEvent.QuickPowerOff:

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

@@ -230,6 +230,7 @@ public override void Update(float elapsedClockSeconds)
                             if (QuickPowerOn)
                             {
                                 QuickPowerOn = false;
+                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
                                 SignalEventToCircuitBreaker(PowerSupplyEvent.QuickPowerOn);
                             }
 
@@ -253,7 +254,11 @@ public override void Update(float elapsedClockSeconds)
 
                         case CircuitBreakerState.Closed:
                             // If circuit breaker is closed, quick power-on sequence has finished
-                            QuickPowerOn = false;
+                            if (QuickPowerOn)
+                            {
+                                QuickPowerOn = false;
+                                if (NumberOfElectricTrainSupplyConnectedCars > 0) SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
+                            }
 
                             if (!PowerOnTimer.Started)
                                 PowerOnTimer.Start();
@@ -309,7 +314,6 @@ public override void HandleEvent(PowerSupplyEvent evt)
                     SignalEventToMasterKey(PowerSupplyEvent.TurnOnMasterKey);
                     SignalEventToPantograph(PowerSupplyEvent.RaisePantograph, 1);
                     SignalEventToOtherTrainVehiclesWithId(PowerSupplyEvent.RaisePantograph, 1);
-                    SignalEventToElectricTrainSupplySwitch(PowerSupplyEvent.SwitchOnElectricTrainSupply);
                     break;
 
                 case PowerSupplyEvent.QuickPowerOff: