Correct display of throttle and dynamic brake with delays

Author: cesarBLG

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

@@ -4232,23 +4232,18 @@ public void StartThrottleToZero(float? target)
         /// whether it is used for cruise control or not
         /// </summary>
         /// <param name="intermediateValue">Whather asking for intermediate (for mouse operation) or notched (for displaying) value.</param>
-        /// <returns>Combined position into 0-1 range</returns>
-        public float GetThrottleHandleValue(float data)
+        /// <returns>Position into 0-1 range</returns>
+        public float GetThrottleHandleValue(bool intermediateValue)
         {
             if (CruiseControl?.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto && CruiseControl.SelectedMaxAccelerationPercent != 0
                 && CruiseControl.HasIndependentThrottleDynamicBrakeLever)
-                return ThrottleController.CurrentValue;
+                return intermediateValue ? ThrottleController.CurrentValue : ThrottleController.IntermediateValue;
             if (CruiseControl?.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto && CruiseControl.UseThrottleAsForceSelector)
                 return CruiseControl.SelectedMaxAccelerationPercent / 100;
             if (CruiseControl?.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto && CruiseControl.UseThrottleAsSpeedSelector)
                 return CruiseControl.SelectedSpeedMpS / MaxSpeedMpS;
 
-
-            if (CruiseControl == null || CruiseControl.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Manual)
-                return data;
-            else
-                return ThrottleController.CurrentValue;
-
+            return intermediateValue ? ThrottleController.CurrentValue : ThrottleController.IntermediateValue;
         }
 
         #endregion
@@ -5777,7 +5772,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                 case CABViewControlTypes.THROTTLE:
                     {
                         if (CruiseControl != null && CruiseControl.SkipThrottleDisplay) break;
-                        data = GetThrottleHandleValue((Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING || Train.Autopilot) ? ThrottlePercent / 100f : LocalThrottlePercent / 100f);
+                        data = GetThrottleHandleValue(false);
                         break;
                     }
                 case CABViewControlTypes.THROTTLE_DISPLAY:
@@ -5872,10 +5867,13 @@ public virtual float GetDataOf(CabViewControl cvc)
                         break;
                     }
                 case CABViewControlTypes.DYNAMIC_BRAKE:
+                    {
+                        data = DynamicBrakeController?.CurrentValue ?? 0;
+                        break;   
+                    }
                 case CABViewControlTypes.DYNAMIC_BRAKE_DISPLAY:
-                    //case CABViewControlTypes.CP_HANDLE:
                     {
-                        data = DynamicBrakePercent / 100f;
+                        data = (Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING || Train.Autopilot) ? DynamicBrakePercent / 100 : LocalDynamicBrakePercent / 100;
                         break;
                     }
                 case CABViewControlTypes.WIPERS:

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2138,26 +2138,17 @@ public virtual int GetDrawIndex()
                 case CABViewControlTypes.FIREHOLE:
                 case CABViewControlTypes.THROTTLE:
                 case CABViewControlTypes.THROTTLE_DISPLAY:
+                case CABViewControlTypes.DYNAMIC_BRAKE_DISPLAY:
                     index = PercentToIndex(data);
                     break;
                 case CABViewControlTypes.FRICTION_BRAKING:
                     index = data > 0.001 ? 1 : 0;
                     break;
                 case CABViewControlTypes.DYNAMIC_BRAKE:
-                case CABViewControlTypes.DYNAMIC_BRAKE_DISPLAY:
-                    var dynBrakePercent = (Locomotive.Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING || Locomotive.Train.Autopilot) ?
-                        Locomotive.DynamicBrakePercent : Locomotive.LocalDynamicBrakePercent;
-                    if (dynBrakePercent <= 0)
-                        index = 0;
-                    else if (Locomotive.DynamicBrakeController != null)
-                    {
-                        if (!Locomotive.HasSmoothStruc)
-                            index = Locomotive.DynamicBrakeController.CurrentNotch;
-                        else
-                            index = PercentToIndex(Locomotive.DynamicBrakeController.CurrentValue);
-                    }
+                    if (Locomotive.DynamicBrakeController != null && !Locomotive.HasSmoothStruc)
+                        index = Locomotive.DynamicBrakeController.CurrentNotch;
                     else
-                        index = PercentToIndex(dynBrakePercent);
+                        index = PercentToIndex(data);
                     break;
                 case CABViewControlTypes.CPH_DISPLAY:
                 case CABViewControlTypes.CP_HANDLE: