Skip to content

Commit

Permalink
Automatic merge of T1.4-rc6-10-g62fcbfa79 and 7 pull requests
Browse files Browse the repository at this point in the history
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
- Pull request #503 at 69a70cb: Update derailment functionality
- Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls
- Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
- Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled
- Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated.
- Pull request #515 at cd8e29f: Correct issue with compressor not turning off
  • Loading branch information
openrails-bot committed Oct 8, 2021
9 parents ad3a209 + 62fcbfa + 6bc94a9 + 69a70cb + ed80ad6 + d4d3256 + 3aae640 + 8bf4a09 + cd8e29f commit da6cce3
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -2351,7 +2351,7 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
// Turn compressor on and off
if (MainResPressurePSI < CompressorRestartPressurePSI && LocomotivePowerSupply.AuxiliaryPowerSupplyState == PowerSupplyState.PowerOn && !CompressorIsOn)
SignalEvent(Event.CompressorOn);
else if ((MainResPressurePSI > MaxMainResPressurePSI || LocomotivePowerSupply.AuxiliaryPowerSupplyState != PowerSupplyState.PowerOn) && CompressorIsOn)
else if ((MainResPressurePSI >= MaxMainResPressurePSI || LocomotivePowerSupply.AuxiliaryPowerSupplyState != PowerSupplyState.PowerOn) && CompressorIsOn)
SignalEvent(Event.CompressorOff);

if (CompressorIsOn)
Expand Down

0 comments on commit da6cce3

Please sign in to comment.