Merge pull request #828 from cesarBLG/braking-enhancement2

Harmless part of "Improvements for braking systems"

Author: cesarBLG

Source/ORTS.Common/Input/UserCommand.cs

@@ -133,6 +133,8 @@ public enum UserCommand
         [GetString("Control Dynamic Brake Increase")] ControlDynamicBrakeIncrease,
         [GetString("Control Dynamic Brake Decrease")] ControlDynamicBrakeDecrease,
         [GetString("Control Bail Off")] ControlBailOff,
+        [GetString("Control Brake Quick Release")] ControlBrakeQuickRelease,
+        [GetString("Control Brake Overcharge")] ControlBrakeOvercharge,
         [GetString("Control Initialize Brakes")] ControlInitializeBrakes,
         [GetString("Control Handbrake Full")] ControlHandbrakeFull,
         [GetString("Control Handbrake None")] ControlHandbrakeNone,

Source/ORTS.Settings/InputSettings.cs

@@ -344,6 +344,8 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.ControlAlerter] = new UserCommandKeyInput(0x2C);
             Commands[(int)UserCommand.ControlBackwards] = new UserCommandKeyInput(0x1F);
             Commands[(int)UserCommand.ControlBailOff] = new UserCommandKeyInput(0x35);
+            Commands[(int)UserCommand.ControlBrakeQuickRelease] = new UserCommandKeyInput(0x35, KeyModifiers.Control);
+            Commands[(int)UserCommand.ControlBrakeOvercharge] = new UserCommandKeyInput(0x35, KeyModifiers.Control | KeyModifiers.Shift);
             Commands[(int)UserCommand.ControlBatterySwitchClose] = new UserCommandKeyInput(0x52);
             Commands[(int)UserCommand.ControlBatterySwitchOpen] = new UserCommandKeyInput(0x52, KeyModifiers.Control);
             Commands[(int)UserCommand.ControlBell] = new UserCommandKeyInput(0x30);

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

@@ -75,6 +75,11 @@ internal void AttachToHost(ScriptedBrakeController host)
         /// </summary>
         public bool IsCabPowerSupplyOn() => LocomotivePowerSupply.CabPowerSupplyOn;
 
+        /// <summary>
+        /// Brake pipe pressure
+        /// </summary>
+        public float BrakePipePressureBar() => Bar.FromPSI(Host.Locomotive.BrakeSystem.BrakeLine1PressurePSI);
+
         /// <summary>
         /// Main reservoir pressure
         /// </summary>
@@ -135,7 +140,6 @@ public float MainReservoirPressureBar()
         /// Release rate of the equalizing reservoir
         /// </summary>
         public float MinReductionBar() => Bar.FromPSI(Host.MinReductionPSI);
-        
         /// <summary>
         /// Current value of the brake controller
         /// </summary>

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

@@ -349,6 +349,7 @@ public float OdometerM
         public float TrainBrakePipeLeakPSIorInHgpS = 0.0f;    // Air leakage from train brake pipe - should normally be no more then 5psi/min - default off
         public float CompressorRestartPressurePSI = 110;
         public float CompressorChargingRateM3pS = 0.075f;
+        public bool CompressorIsMUControlled = false;
         public float MainResChargingRatePSIpS = 0.4f;
         public float EngineBrakeReleaseRatePSIpS = 12.5f;
         public float EngineBrakeApplyRatePSIpS = 12.5f;
@@ -984,6 +985,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                         CompressorIsMechanical = true;
                     }
                     break;
+                case "engine(ortscompressorismucontrolled": CompressorIsMUControlled = stf.ReadBoolBlock(false); break;
                 case "engine(trainpipeleakrate": TrainBrakePipeLeakPSIorInHgpS = stf.ReadFloatBlock(STFReader.UNITS.PressureRateDefaultPSIpS, null); break;
                 case "engine(vacuumbrakesvacuumpumpresistance": VacuumPumpResistanceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); break;
 
@@ -1172,6 +1174,7 @@ public override void Copy(MSTSWagon copy)
 
             CompressorIsMechanical = locoCopy.CompressorIsMechanical;
             CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
+            CompressorIsMUControlled = locoCopy.CompressorIsMUControlled;
             TrainBrakePipeLeakPSIorInHgpS = locoCopy.TrainBrakePipeLeakPSIorInHgpS;
             MaxMainResPressurePSI = locoCopy.MaxMainResPressurePSI;
             MainResPressurePSI = locoCopy.MaxMainResPressurePSI;
@@ -2645,9 +2648,20 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
 
             // Turn compressor on and off
             if (MainResPressurePSI < CompressorRestartPressurePSI && LocomotivePowerSupply.AuxiliaryPowerSupplyState == PowerSupplyState.PowerOn && !CompressorIsOn)
+            {
                 SignalEvent(Event.CompressorOn);
+                foreach (var car in Train.Cars)
+                {
+                    if (car is MSTSLocomotive loco && loco.RemoteControlGroup == 0 && loco.LocomotivePowerSupply.AuxiliaryPowerSupplyOn && !loco.CompressorIsOn && loco.CompressorIsMUControlled)
+                    {
+                        loco.SignalEvent(Event.CompressorOn);
+                    }
+                }
+            }
             else if ((MainResPressurePSI >= MaxMainResPressurePSI || LocomotivePowerSupply.AuxiliaryPowerSupplyState != PowerSupplyState.PowerOn) && CompressorIsOn)
+            {
                 SignalEvent(Event.CompressorOff);
+            }
 
             if (CompressorIsOn)
                 MainResPressurePSI += elapsedClockSeconds * reservoirChargingRate;

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -162,6 +162,8 @@ public override void InitializeUserInputCommands()
             UserInputCommands.Add(UserCommand.ControlSteamHeatIncrease, new Action[] { () => Locomotive.StopSteamHeatIncrease(), () => Locomotive.StartSteamHeatIncrease(null) });
             UserInputCommands.Add(UserCommand.ControlSteamHeatDecrease, new Action[] { () => Locomotive.StopSteamHeatDecrease(), () => Locomotive.StartSteamHeatDecrease(null) });
             UserInputCommands.Add(UserCommand.ControlBailOff, new Action[] { () => new BailOffCommand(Viewer.Log, false), () => new BailOffCommand(Viewer.Log, true) });
+            UserInputCommands.Add(UserCommand.ControlBrakeQuickRelease, new Action[] { () => new QuickReleaseCommand(Viewer.Log, false), () => new QuickReleaseCommand(Viewer.Log, true) });
+            UserInputCommands.Add(UserCommand.ControlBrakeOvercharge, new Action[] { () => new BrakeOverchargeCommand(Viewer.Log, false), () => new BrakeOverchargeCommand(Viewer.Log, true) });
             UserInputCommands.Add(UserCommand.ControlInitializeBrakes, new Action[] { Noop, () => new InitializeBrakesCommand(Viewer.Log) });
             UserInputCommands.Add(UserCommand.ControlHandbrakeNone, new Action[] { Noop, () => new HandbrakeCommand(Viewer.Log, false) });
             UserInputCommands.Add(UserCommand.ControlHandbrakeFull, new Action[] { Noop, () => new HandbrakeCommand(Viewer.Log, true) });