Add RPM gauge for second diesel engine

Author: peternewell

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -136,6 +136,7 @@ public enum CABViewControlTypes
         STEAMHEAT_PRESSURE,
         FIREBOX,
         RPM,
+        RPM_2,
         FIREHOLE,
         CUTOFF,
         VACUUM_RESERVOIR_PRESSURE,

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

@@ -4453,18 +4453,19 @@ public virtual float GetDataOf(CabViewControl cvc)
                         data = ConvertFromPSI(cvc, BrakeSystem.GetVacResPressurePSI());
                         break;
                     }
+
                 case CABViewControlTypes.RPM:
                     {
+
                         if (EngineType == EngineTypes.Control)
                         {
                             FindControlActiveLocomotive();
+
                             if (ControlActiveLocomotive != null)
                             {
                                 var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
                                 if (activeloco.DieselEngines[0] != null)
                                     data = activeloco.DieselEngines[0].RealRPM;
-                          //      Trace.TraceInformation("Data#1 CarID {0}  RPM {1}", CarID, data);
-                                       
                             }
 
                         }
@@ -4473,11 +4474,35 @@ public virtual float GetDataOf(CabViewControl cvc)
                             var mstsDieselLocomotive = this as MSTSDieselLocomotive;
                             if (mstsDieselLocomotive.DieselEngines[0] != null)
                                 data = mstsDieselLocomotive.DieselEngines[0].RealRPM;
+                        }
+                        break;
+                    }
+
+                case CABViewControlTypes.RPM_2:
+                    {
 
-                           // Trace.TraceInformation("Data#2 CarID {0}  RPM {1}", CarID, data);
+                        FindControlActiveLocomotive();
+
+                        if (ControlActiveLocomotive != null)
+                        {
+                            var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
+                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+
+                            if (EngineType == EngineTypes.Control && activeloco.DieselEngines.NumOfActiveEngines > 1)
+                            {
+                             
+                                if (activeloco.DieselEngines[1] != null)
+                                    data = activeloco.DieselEngines[1].RealRPM;
+                            }
+                            else if (EngineType == EngineTypes.Diesel && mstsDieselLocomotive.DieselEngines.NumOfActiveEngines > 1)
+                            {                      
+                                if (mstsDieselLocomotive.DieselEngines[1] != null)
+                                    data = mstsDieselLocomotive.DieselEngines[1].RealRPM;
+                            }
                         }
                         break;
                     }
+
                 case CABViewControlTypes.ORTS_DIESEL_TEMPERATURE:
                     {
                         var mstsDieselLocomotive = this as MSTSDieselLocomotive;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -3284,30 +3284,33 @@ public void FindControlActiveLocomotive()
                 ControlActiveLocomotive = null;
                 return;
             }
-
             var controlIndex = 0;
             var activeIndex = 0;
             bool controlCar = false;
             bool activeLocomotive = false;
 
             // Check to see if this car is an active locomotive, if so then set linkage to relevant control car.
+            // Note this only checks the "closest" locomotive to the control car. Hence it could be "fooled" if there is another locomotive besides the two DMU locomotives.
+
             for (var i = 0; i < Train.Cars.Count; i++)
             {
-                if (Train.Cars[i] == this && activeIndex == 0 && Train.Cars[i].EngineType == TrainCar.EngineTypes.Diesel)
+
+                if (activeIndex == 0 && Train.Cars[i].EngineType == TrainCar.EngineTypes.Diesel)
                 {
                     activeIndex = i;
                     activeLocomotive = true;
                 }
 
-                if (Train.Cars[i] == this && controlIndex == 0 && Train.Cars[i].EngineType == TrainCar.EngineTypes.Control)
+                if (controlIndex == 0 && Train.Cars[i].EngineType == TrainCar.EngineTypes.Control)
                 {
                     controlIndex = i;
                     controlCar = true;
                 }
 
+                // As soon as the control and active locomotive have been identified, then stop loop.
                 if (activeLocomotive && controlCar)
                 {
-                    ControlActiveLocomotive = Train.Cars[activeIndex] as MSTSDieselLocomotive;
+                    ControlActiveLocomotive = Train.Cars[activeIndex] as MSTSDieselLocomotive;                 
                     return;
                 }
             }