Further adjustments to mechanical compressors

Author: peternewell

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

@@ -2289,18 +2289,15 @@ protected virtual void UpdateVacuumExhauster(float elapsedClockSeconds)
         /// </summary>
         protected virtual void UpdateCompressor(float elapsedClockSeconds)
         {
-            if (MainResPressurePSI < CompressorRestartPressurePSI && LocomotivePowerSupply.AuxiliaryPowerSupplyState == PowerSupplyState.PowerOn && !CompressorIsOn)
-                SignalEvent(Event.CompressorOn);
-            else if ((MainResPressurePSI > MaxMainResPressurePSI || LocomotivePowerSupply.AuxiliaryPowerSupplyState != PowerSupplyState.PowerOn) && CompressorIsOn)
-                SignalEvent(Event.CompressorOff);
-
-            // For a mechanical compressor (typically fitted to a diesel locomotive) the charging rate will be related to the RpM of the diesel engine, and therefore 
-            // derated by an amount equivalent to the diesel RpM.
-            // All other locomotive types it will be the full charging rate for the reservoir
-            var reservoirChargingRate = MainResChargingRatePSIpS;
 
             if (CompressorIsMechanical && (EngineType == EngineTypes.Control || EngineType == EngineTypes.Diesel))
-            {
+            {                
+                // For a mechanical compressor (typically fitted to a diesel locomotive) the charging rate will be related to the RpM of the diesel engine, and therefore 
+                // derated by an amount equivalent to the diesel RpM.
+                // All other locomotive types it will be the full charging rate for the reservoir
+                var reservoirChargingRate = MainResChargingRatePSIpS;
+
+                // Control car uses the attached active locomotive
                 if (EngineType == EngineTypes.Control)
                 {
                     FindControlActiveLocomotive();
@@ -2313,13 +2310,27 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
                 }
                 else
                 {
+                    // Powered locomotive use thereselves
                     var mstsDieselLocomotive = this as MSTSDieselLocomotive;
                     reservoirChargingRate = (mstsDieselLocomotive.DieselEngines[0].RealRPM / mstsDieselLocomotive.DieselEngines[0].MaxRPM) * MainResChargingRatePSIpS;
                 }
-            }
 
-            if (CompressorIsOn)
                 MainResPressurePSI += elapsedClockSeconds * reservoirChargingRate;
+
+                // Compressor runs continuously, and excess air pressure is exhausted to atmosphere once max pressure is reached.
+                MainResPressurePSI = MathHelper.Clamp(MainResPressurePSI, 0.0f, MaxMainResPressurePSI);
+
+            }
+            else // Non-mechanical compressors
+            {
+                if (MainResPressurePSI < CompressorRestartPressurePSI && LocomotivePowerSupply.AuxiliaryPowerSupplyState == PowerSupplyState.PowerOn && !CompressorIsOn)
+                    SignalEvent(Event.CompressorOn);
+                else if ((MainResPressurePSI > MaxMainResPressurePSI || LocomotivePowerSupply.AuxiliaryPowerSupplyState != PowerSupplyState.PowerOn) && CompressorIsOn)
+                    SignalEvent(Event.CompressorOff);
+
+                if (CompressorIsOn)
+                    MainResPressurePSI += elapsedClockSeconds * MainResChargingRatePSIpS;
+            }
         }
 
         /// <summary>

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -840,7 +840,6 @@ void TextPageBrakeInfo(TableData table)
                     var car = train.Cars[i];
                     if (car is MSTSLocomotive && car != Viewer.PlayerLocomotive)
                     {
-
                         if ((car as MSTSLocomotive).EngineType == TrainCar.EngineTypes.Control)
                         {
                             // Control cars typically don't have reservoirs
@@ -849,6 +848,17 @@ void TextPageBrakeInfo(TableData table)
                             car.CarID
                             ));
                         }
+                        else if ((car as MSTSLocomotive).CompressorIsMechanical)
+                        {
+                            // Mechanical compressor run continuously so no point having on and off indication.
+                            TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}",
+                            Viewer.Catalog.GetString("Loco"),
+                            car.CarID,
+
+                            Viewer.Catalog.GetString("Main reservoir"),
+                            FormatStrings.FormatPressure((car as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (car as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true)));
+                        
+                        }
                         else
                         {
                             TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}",
@@ -858,9 +868,7 @@ void TextPageBrakeInfo(TableData table)
                             Viewer.Catalog.GetString("Main reservoir"),
                             FormatStrings.FormatPressure((car as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (car as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true),
                             Viewer.Catalog.GetString("Compressor"),
-                            (car as MSTSLocomotive).CompressorIsOn ? Viewer.Catalog.GetString("on") : Viewer.Catalog.GetString("off")));
-
-
+                            (car as MSTSLocomotive).CompressorIsOn ? Viewer.Catalog.GetString("on") : Viewer.Catalog.GetString("off")));                            
                         }
                     }
                 }