Skip to content

Commit f1ffbf6

Browse files
committed
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 e241a0d: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1157 at 9d79d0f: Dynamic brake authorization by TCS
17 parents 91b0dc5 + a5be129 + e10390b + 2e06f85 + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + ba9e40a + 66dfd09 + 40f8c34 + 5845a1a + 689494b + e241a0d + 1d7643d + 9d79d0f commit f1ffbf6

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ internal void AttachToHost(ScriptedBrakeController host)
8686
/// </summary>
8787
public bool IsCabPowerSupplyOn() => LocomotivePowerSupply.CabPowerSupplyOn;
8888

89-
/// <summary>
90-
/// True if auxiliary power supply is switched on.
91-
/// </summary>
92-
public bool IsAuxiliaryPowerSupplyOn() => LocomotivePowerSupply.AuxiliaryPowerSupplyOn;
93-
9489
/// <summary>
9590
/// Brake pipe pressure
9691
/// </summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public override float Update(float elapsedSeconds)
136136
break;
137137
}
138138

139-
NeutralModeOn = NeutralModeCommandSwitchOn || EmergencyBrakingPushButton() || TCSEmergencyBraking() || !IsAuxiliaryPowerSupplyOn();
139+
NeutralModeOn = NeutralModeCommandSwitchOn || EmergencyBrakingPushButton() || TCSEmergencyBraking();
140140

141141
return CurrentValue();
142142
}

0 commit comments

Comments
 (0)