Set up RpM on active locomotive

Author: peternewell

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

@@ -2850,7 +2850,7 @@ public override bool GetSanderOn()
         {
             return Sander;
         }
-
+                                 
         #region Reverser
         public void SetDirection(Direction direction)
         {
@@ -4455,9 +4455,27 @@ public virtual float GetDataOf(CabViewControl cvc)
                     }
                 case CABViewControlTypes.RPM:
                     {
-                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                        if (mstsDieselLocomotive.DieselEngines[0] != null)
-                            data = mstsDieselLocomotive.DieselEngines[0].RealRPM;
+                        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);
+                                       
+                            }
+
+                        }
+                        else
+                        {
+                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                            if (mstsDieselLocomotive.DieselEngines[0] != null)
+                                data = mstsDieselLocomotive.DieselEngines[0].RealRPM;
+
+                           // Trace.TraceInformation("Data#2 CarID {0}  RPM {1}", CarID, data);
+                        }
                         break;
                     }
                 case CABViewControlTypes.ORTS_DIESEL_TEMPERATURE:

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

@@ -246,6 +246,11 @@ public class MSTSWagon : TrainCar
         /// </summary>
         public bool AuxiliaryReservoirPresent;
 
+        /// <summary>
+        /// Active locomotive for a control trailer
+        /// </summary>
+        public MSTSLocomotive ControlActiveLocomotive { get; private set; }
+
         /// <summary>
         /// Attached steam locomotive in case this wagon is a tender
         /// </summary>
@@ -3271,6 +3276,42 @@ public void ToggleMirrors()
             if (Simulator.PlayerLocomotive == this) Simulator.Confirmer.Confirm(CabControl.Mirror, MirrorOpen ? CabSetting.On : CabSetting.Off);
         }
 
+        public void FindControlActiveLocomotive()
+        {
+            // Find the active locomotive associated with a control car
+            if (Train == null || Train.Cars == null || Train.Cars.Count == 1)
+            {
+                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.
+            for (var i = 0; i < Train.Cars.Count; i++)
+            {
+                if (Train.Cars[i] == this && 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)
+                {
+                    controlIndex = i;
+                    controlCar = true;
+                }
+
+                if (activeLocomotive && controlCar)
+                {
+                    ControlActiveLocomotive = Train.Cars[activeIndex] as MSTSDieselLocomotive;
+                    return;
+                }
+            }
+        }
 
         public void FindTendersSteamLocomotive()
         {