Skip to content

Commit f49d492

Browse files
committed
Automatic merge of T1.5.1-1321-g597ce24c42 and 18 pull requests
- Pull request #961 at 9ae470f: Improvements for Power Supplies - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #981 at 10d297f: Multiple type trainset lightglows - Pull request #984 at 0f8122e: Player train switching for timetable mode - Pull request #988 at f1d4d18: Conditional sound, blueprint https://blueprints.launchpad.net/or/+spec/conditional-sound - Pull request #989 at 32a9961: Fix: TrainCarOperations-crashes-locales - Pull request #990 at 37d8ea6: Fix TrainDrivingInfo, some texts are misaligned. - Pull request #991 at 220b61e: Fix TrainCarOperations no interacts AltPgDn AltPgUp. - Pull request #994 at 1de8de6: 2 fixes in the OR manual - Pull request #996 at 2ccefab: Replace dynamic brakes by engine brakes at low speeds - Pull request #997 at 0de38ec: Disable independent brake syncing by default - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #995 at 992191c: Fix: TrainCarOperations and TrainOperationsViewer windows overlap.
20 parents 0771605 + 597ce24 + 9ae470f + d00beb9 + 9a1d6b2 + 1f5ba4c + a519452 + e90a2aa + 10d297f + 0f8122e + f1d4d18 + 32a9961 + 37d8ea6 + 220b61e + 1de8de6 + 2ccefab + 0de38ec + c27f32d + f92de76 + 992191c commit f49d492

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,9 +2541,9 @@ present for simplicity.
25412541
single: ORTSDPBrakeSynchronization
25422542

25432543
By default, Open Rails will treat remote groups as manned helpers who typically
2544-
would not assist in train brake operations, so only independent brakes will synchronize.
2545-
To enable train brake synchronization, the token ``engine(ORTSDPBrakeSynchronization(``
2546-
should be used. The valid settings for ``ORTSDPBrakeSynchronization`` are as follows:
2544+
would not assist in train brake operations. To enable brake synchronization,
2545+
the token ``engine(ORTSDPBrakeSynchronization(`` should be used.
2546+
The valid settings for ``ORTSDPBrakeSynchronization`` are as follows:
25472547

25482548
- ``"Apply"``: DP units will reduce the brake pipe pressure locally to match the
25492549
equalizing reservoir pressure of the controlling locomotive. (The controlling
@@ -2558,10 +2558,6 @@ should be used. The valid settings for ``ORTSDPBrakeSynchronization`` are as fol
25582558
controlling locomotive, and will automatically bail-off automatic brake
25592559
applications if needed. (The controlling locomotive must also have the
25602560
``"Independent"`` setting.)
2561-
- NOTE: Although ``"Independent"`` is enabled by default,
2562-
if ``ORTSDPBrakeSynchronization`` is present in the .eng
2563-
file but ``"Independent"`` is not specified as an option,
2564-
independent brakes will NOT be synchronized.
25652561

25662562
All settings can be combined as needed, simply place a comma between each setting
25672563
in the string: ``ORTSDPBrakeSynchronization("Apply, Release, Emergency, Independent")``

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public float OdometerM
447447
public bool DPSyncTrainApplication { get; private set; }
448448
public bool DPSyncTrainRelease { get; private set; }
449449
public bool DPSyncEmergency { get; private set; }
450-
public bool DPSyncIndependent { get; private set; } = true;
450+
public bool DPSyncIndependent { get; private set; }
451451

452452
protected const float DefaultCompressorRestartToMaxSysPressureDiff = 35; // Used to check if difference between these two .eng parameters is correct, and to correct it
453453
protected const float DefaultMaxMainResToCompressorRestartPressureDiff = 10; // Used to check if difference between these two .eng parameters is correct, and to correct it
@@ -1160,8 +1160,6 @@ public override void Parse(string lowercasetoken, STFReader stf)
11601160
DPSyncEmergency = true;
11611161
if (dpSyncModes.Contains("independent"))
11621162
DPSyncIndependent = true;
1163-
else // Independent synchronization is assumed to be enabled unless explicitly not enabled
1164-
DPSyncIndependent = false;
11651163
break;
11661164
case "engine(ortsdynamicblendingoverride": DynamicBrakeBlendingOverride = stf.ReadBoolBlock(false); break;
11671165
case "engine(ortsdynamicblendingforcematch": DynamicBrakeBlendingForceMatch = stf.ReadBoolBlock(false); break;

0 commit comments

Comments
 (0)