Fixes to user input

cesarBLG · cesarBLG · commit b78bcceb6a85 · 2025-05-21T20:54:09.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
@@ -145,6 +145,7 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }
         public float ParkingBrakeEngageSpeedMpS = 0;
         public float ParkingBrakePercent = 0;
         public bool DisableZeroForceStep = false;
+        public bool DisableZeroSelectedSpeedStep = false;
         public bool DynamicBrakeIsSelectedForceDependant = false;
         public bool UseThrottleAsSpeedSelector = false;
         public bool UseThrottleAsForceSelector = false;
@@ -212,10 +213,8 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }
         public MSTSNotchController MaxForceSelectorController;
         public MSTSNotchController SpeedSelectorController;
 
-        public bool SelectedSpeedPressed = false;
         public bool EngineBrakePriority = false;
         public int AccelerationBits = 0;
-        public bool Speed0Pressed, SpeedDeltaPressed;
 
         public CruiseControl(MSTSLocomotive locomotive)
         {
@@ -269,6 +268,7 @@ public CruiseControl(CruiseControl other, MSTSLocomotive locomotive)
             ParkingBrakeEngageSpeedMpS = other.ParkingBrakeEngageSpeedMpS;
             ParkingBrakePercent = other.ParkingBrakePercent;
             DisableZeroForceStep = other.DisableZeroForceStep;
+            DisableZeroSelectedSpeedStep = other.DisableZeroSelectedSpeedStep;
             DynamicBrakeIsSelectedForceDependant = other.DynamicBrakeIsSelectedForceDependant;
             UseThrottleAsSpeedSelector = other.UseThrottleAsSpeedSelector;
             UseThrottleAsForceSelector = other.UseThrottleAsForceSelector;
@@ -362,6 +362,7 @@ public void Parse(STFReader stf)
                     case "powerreductiondelaycargotrain": PowerReductionDelayCargoTrain = stf.ReadFloatBlock(STFReader.UNITS.Any, 0.0f); break;
                     case "powerreductionvalue": PowerReductionValue = stf.ReadFloatBlock(STFReader.UNITS.Any, 100.0f); break;
                     case "disablezeroforcestep": DisableZeroForceStep = stf.ReadBoolBlock(false); break;
+                    case "disablezeroselectedspeedstep": DisableZeroSelectedSpeedStep = stf.ReadBoolBlock(false); break;
                     case "dynamicbrakeisselectedforcedependant": DynamicBrakeIsSelectedForceDependant = stf.ReadBoolBlock(false); break;
                     case "defaultforcestep": defaultMaxAccelerationStep = stf.ReadFloatBlock(STFReader.UNITS.Any, 1.0f); break;
                     case "startreducingspeeddelta": StartReducingSpeedDelta = (stf.ReadFloatBlock(STFReader.UNITS.Any, 1.0f) / 10); break;
@@ -525,8 +526,10 @@ public void Initialize()
                 var notches = new List<MSTSNotch>();
                 if (SpeedSelectorIsDiscrete)
                 {
-                    float numNotches = (float)Math.Round(Locomotive.MaxSpeedMpS / SpeedRegulatorNominalSpeedStepMpS);
-                    for (int i=0; i<=numNotches; i++)
+                    if (!DisableZeroSelectedSpeedStep) notches.Add(new MSTSNotch(0, false, 0));
+                    if (MinimumSpeedForCCEffectMpS > 0) notches.Add(new MSTSNotch(float.Epsilon, false, 0));
+                    float numNotches = (float)Math.Round((Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) / SpeedRegulatorNominalSpeedStepMpS);
+                    for (int i = 1; i <= numNotches; i++)
                     {
                         notches.Add(new MSTSNotch(i / numNotches, false, 0));
                     }
@@ -804,6 +807,8 @@ public void UpdateSpeedRegulatorModeChanges()
             var prevMode = SpeedRegMode;
             float throttle = Locomotive.ThrottleController.CurrentValue;
             float dynamic = (Locomotive.DynamicBrakeController?.CurrentValue ?? 0);
+            bool zeroForce = MaxForceSelectorController.CurrentValue == 0 && MaxForceSelectorController.SavedValue == 0;
+            bool zeroSelectedSpeed = SpeedSelectorController.CurrentValue == 0 && SpeedSelectorController.SavedValue == 0;
             if (DisableCruiseControlOnThrottleAndZeroSpeed)
             {
                 if (throttle > 0 && Locomotive.AbsSpeedMpS == 0)
@@ -813,33 +818,33 @@ public void UpdateSpeedRegulatorModeChanges()
             }
             if (DisableCruiseControlOnThrottleAndZeroForce)
             {
-                if ((throttle > 0 || UseThrottleAsForceSelector) && SelectedMaxAccelerationPercent == 0)
+                if ((throttle > 0 || UseThrottleAsForceSelector) && zeroForce)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Manual;
                 }
             }
             if (DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)
             {
-                if ((throttle > 0 || UseThrottleAsForceSelector) && SelectedMaxAccelerationPercent == 0 && SelectedSpeedMpS == 0)
+                if ((throttle > 0 || UseThrottleAsForceSelector) && zeroForce && zeroSelectedSpeed)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Manual;
                 }
             }
             if (ForceRegulatorAutoWhenNonZeroSpeedSelected)
             {
-                if (SelectedSpeedMpS == 0 && (!ASCSpeedTakesPriorityOverSpeedSelector || !ASCSetSpeedMpS.HasValue))
+                if (zeroSelectedSpeed && (!ASCSpeedTakesPriorityOverSpeedSelector || !ASCSetSpeedMpS.HasValue))
                 {
                     SpeedRegMode = SpeedRegulatorMode.Manual;
                 }
-                else
+                else if (SelectedSpeedMpS > 0)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Auto;
                 }
             }
             if (ForceRegulatorAutoWhenNonZeroSpeedSelectedAndThrottleAtZero)
             {
                 if (SelectedSpeedMpS > 0 && throttle == 0 && dynamic == 0 &&
-                    SelectedMaxAccelerationPercent == 0 && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)
+                    zeroForce && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Auto;
                 }
@@ -1173,8 +1178,8 @@ public void SpeedSelectorIncreaseStep()
 
             if (SpeedSelectorController.CurrentValue > 0 || MinimumSpeedForCCEffectMpS == 0)
             {
-                float speed = (SpeedSelectorController.CurrentValue * (Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) + MinimumSpeedForCCEffectMpS) + SpeedRegulatorNominalSpeedStepMpS;
-                SelectedSpeedMpS = Math.Min((float)Math.Round(speed / SpeedRegulatorNominalSpeedStepMpS) * SpeedRegulatorNominalSpeedStepMpS, Locomotive.MaxSpeedMpS);
+                float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) + SpeedRegulatorNominalSpeedStepMpS;
+                SelectedSpeedMpS = Math.Min(speed, Locomotive.MaxSpeedMpS);
             }
             else
             {
@@ -1189,26 +1194,20 @@ public void SpeedSelectorDecreaseStep()
             if (time >= selectedSpeedLeverHoldTime && time < selectedSpeedLeverHoldTime + SpeedSelectorStepTimeSeconds) return;
             selectedSpeedLeverHoldTime = time;
 
-            float speed = SpeedSelectorController.CurrentValue * (Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) + MinimumSpeedForCCEffectMpS - SpeedRegulatorNominalSpeedStepMpS;
+            float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) - SpeedRegulatorNominalSpeedStepMpS;
             if (speed < MinimumSpeedForCCEffectMpS)
             {
                 SelectedSpeedMpS = 0;
             }
             else
             {
-                SelectedSpeedMpS = Math.Max((float)Math.Round(speed / SpeedRegulatorNominalSpeedStepMpS) * SpeedRegulatorNominalSpeedStepMpS, MinimumSpeedForCCEffectMpS);
+                SelectedSpeedMpS = speed;
             }
             ConfirmSelectedSpeed();
         }
         public void ConfirmSelectedSpeed()
         {
-            float val = SpeedSelectorController.CurrentValue;
-            if (val > 0)
-            {
-                float min = MinimumSpeedForCCEffectMpS;
-                float max = Locomotive.MaxSpeedMpS;
-                val = val * (max - min) + min;
-            }
+            float val = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue);
             if (SpeedIsMph)
                 Simulator.Confirmer.Message(ConfirmLevel.Information, Simulator.Catalog.GetStringFmt("Selected speed changed to {0} mph", Math.Round(MpS.FromMpS(val, false), 0, MidpointRounding.AwayFromZero).ToString()));
             else
@@ -1501,19 +1500,6 @@ public float GetDataOf(CabViewControl cvc)
                         data = AccelerationBits;
                         break;
                     }
-                case CABViewControlTypes.ORTS_CC_SELECTED_SPEED:
-                    data = SelectedSpeedPressed ? 1 : 0;
-                    break;
-                case CABViewControlTypes.ORTS_CC_SPEED_0:
-                    {
-                        data = Speed0Pressed ? 1 : 0;
-                        break;
-                    }
- 				case CABViewControlTypes.ORTS_CC_SPEED_DELTA:
-                    {
-                        data = SpeedDeltaPressed ? 1 : 0;
-                        break;
-                    }
                 default:
                     data = 0;
                     break;
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -2303,13 +2303,15 @@ public virtual int GetDrawIndex()
                 case CABViewControlTypes.ORTS_TRAIN_TYPE_PAX_OR_CARGO:
                 case CABViewControlTypes.ORTS_CONTROLLER_VOLTAGE:
                 case CABViewControlTypes.ORTS_AMPERS_BY_CONTROLLER_VOLTAGE:
-                case CABViewControlTypes.ORTS_CC_SELECTED_SPEED:
                 case CABViewControlTypes.ORTS_MULTI_POSITION_CONTROLLER:
                 case CABViewControlTypes.ORTS_ACCELERATION_IN_TIME:
-				case CABViewControlTypes.ORTS_CC_SPEED_DELTA:											  
-                case CABViewControlTypes.ORTS_CC_SPEED_0:
                     index = (int)data;
                     break;
+                case CABViewControlTypes.ORTS_CC_SPEED_DELTA:
+                case CABViewControlTypes.ORTS_CC_SPEED_0:
+                case CABViewControlTypes.ORTS_CC_SELECTED_SPEED:
+                    index = ButtonState ? 1 : 0;
+                    break;
                 case CABViewControlTypes.ORTS_SELECTED_SPEED_SELECTOR:
                     var fraction = data / (float)(ControlDiscrete.MaxValue);
                     index = (int)MathHelper.Clamp(0, (int)(fraction * ((ControlDiscrete as CVCDiscrete).FramesCount - 1)), (ControlDiscrete as CVCDiscrete).FramesCount - 1);
@@ -2663,16 +2665,13 @@ public void HandleUserInput()
                 case CABViewControlTypes.ORTS_CC_SELECTED_SPEED:
                     if (Locomotive.CruiseControl == null)
                         break;
-                    var p = ChangedValue(0);
-                    if (p == 1)
-                    {
+                    buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
+                    if (!ButtonState && buttonState)
                         Locomotive.CruiseControl.SetSpeed(Control.Parameter1);
-                        Locomotive.CruiseControl.SelectedSpeedPressed = true;
-                    }
-                    else if (p == 0) Locomotive.CruiseControl.SelectedSpeedPressed = false;
+                    ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_SELECTED_SPEED_REGULATOR_MODE:
-                    p = ChangedValue(0);
+                    var p = ChangedValue(0);
                     if (Control.ControlStyle == CABViewControlStyles.ONOFF)
                     {
                         if (ChangedValue(0) == 1)
@@ -2773,85 +2772,74 @@ public void HandleUserInput()
                         break;
                     }
                 case CABViewControlTypes.ORTS_CC_SPEED_0:
-                    {
-                        p = ChangedValue(0);
-                        if (p == 1)
-                        {
-                            Locomotive.CruiseControl.SetSpeed(0);
-                            Locomotive.CruiseControl.Speed0Pressed = true;
-                        }
-                        else if (p == 0) Locomotive.CruiseControl.Speed0Pressed = false;
-
-                        break;
-                    }
-					case CABViewControlTypes.ORTS_CC_SPEED_DELTA:
-                    {
-                        p = ChangedValue(0);
-                        if (p == 1)
-                        {
-                            Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH + Control.Parameter1);
-                            Locomotive.CruiseControl.SpeedDeltaPressed = true;
-                        }
-                        else if (p == 0) Locomotive.CruiseControl.SpeedDeltaPressed = false;
-                        break;
-                    }
+                    buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
+                    if (!ButtonState && buttonState)
+                        Locomotive.CruiseControl.SetSpeed(0);
+                    ButtonState = buttonState;
+                    break;
+				case CABViewControlTypes.ORTS_CC_SPEED_DELTA:
+                    buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
+                    if (!ButtonState && buttonState)
+                        Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH + Control.Parameter1);
+                    ButtonState = buttonState;
+                    break;
                 case CABViewControlTypes.ORTS_DP_MOVE_TO_FRONT:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPMoveToFrontCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_MOVE_TO_BACK:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPMoveToBackCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_IDLE:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPIdleCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_TRACTION:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPTractionCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_BRAKE:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPDynamicBrakeCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_MORE:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPMoreCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_DP_LESS:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new DPLessCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_EOT_COMM_TEST:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new EOTCommTestCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_EOT_DISARM:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new EOTDisarmCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;
                 case CABViewControlTypes.ORTS_EOT_ARM_TWO_WAY:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;
-                    if (!ButtonState && (ButtonState ? 1 : 0) != ChangedValue(ButtonState ? 1 : 0))
+                    if (!ButtonState && buttonState)
                         new EOTArmTwoWayCommand(Viewer.Log);
                     ButtonState = buttonState;
                     break;

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }`
`145`	`145`	`public float ParkingBrakeEngageSpeedMpS = 0;`
`146`	`146`	`public float ParkingBrakePercent = 0;`
`147`	`147`	`public bool DisableZeroForceStep = false;`
	`148`	`+ public bool DisableZeroSelectedSpeedStep = false;`
`148`	`149`	`public bool DynamicBrakeIsSelectedForceDependant = false;`
`149`	`150`	`public bool UseThrottleAsSpeedSelector = false;`
`150`	`151`	`public bool UseThrottleAsForceSelector = false;`
`@@ -212,10 +213,8 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }`
`212`	`213`	`public MSTSNotchController MaxForceSelectorController;`
`213`	`214`	`public MSTSNotchController SpeedSelectorController;`
`214`	`215`
`215`		`- public bool SelectedSpeedPressed = false;`
`216`	`216`	`public bool EngineBrakePriority = false;`
`217`	`217`	`public int AccelerationBits = 0;`
`218`		`- public bool Speed0Pressed, SpeedDeltaPressed;`
`219`	`218`
`220`	`219`	`public CruiseControl(MSTSLocomotive locomotive)`
`221`	`220`	`{`
`@@ -269,6 +268,7 @@ public CruiseControl(CruiseControl other, MSTSLocomotive locomotive)`
`269`	`268`	`ParkingBrakeEngageSpeedMpS = other.ParkingBrakeEngageSpeedMpS;`
`270`	`269`	`ParkingBrakePercent = other.ParkingBrakePercent;`
`271`	`270`	`DisableZeroForceStep = other.DisableZeroForceStep;`
	`271`	`+ DisableZeroSelectedSpeedStep = other.DisableZeroSelectedSpeedStep;`
`272`	`272`	`DynamicBrakeIsSelectedForceDependant = other.DynamicBrakeIsSelectedForceDependant;`
`273`	`273`	`UseThrottleAsSpeedSelector = other.UseThrottleAsSpeedSelector;`
`274`	`274`	`UseThrottleAsForceSelector = other.UseThrottleAsForceSelector;`
`@@ -362,6 +362,7 @@ public void Parse(STFReader stf)`
`362`	`362`	`case "powerreductiondelaycargotrain": PowerReductionDelayCargoTrain = stf.ReadFloatBlock(STFReader.UNITS.Any, 0.0f); break;`
`363`	`363`	`case "powerreductionvalue": PowerReductionValue = stf.ReadFloatBlock(STFReader.UNITS.Any, 100.0f); break;`
`364`	`364`	`case "disablezeroforcestep": DisableZeroForceStep = stf.ReadBoolBlock(false); break;`
	`365`	`+ case "disablezeroselectedspeedstep": DisableZeroSelectedSpeedStep = stf.ReadBoolBlock(false); break;`
`365`	`366`	`case "dynamicbrakeisselectedforcedependant": DynamicBrakeIsSelectedForceDependant = stf.ReadBoolBlock(false); break;`
`366`	`367`	`case "defaultforcestep": defaultMaxAccelerationStep = stf.ReadFloatBlock(STFReader.UNITS.Any, 1.0f); break;`
`367`	`368`	`case "startreducingspeeddelta": StartReducingSpeedDelta = (stf.ReadFloatBlock(STFReader.UNITS.Any, 1.0f) / 10); break;`
`@@ -525,8 +526,10 @@ public void Initialize()`
`525`	`526`	`var notches = new List<MSTSNotch>();`
`526`	`527`	`if (SpeedSelectorIsDiscrete)`
`527`	`528`	`{`
`528`		`- float numNotches = (float)Math.Round(Locomotive.MaxSpeedMpS / SpeedRegulatorNominalSpeedStepMpS);`
`529`		`- for (int i=0; i<=numNotches; i++)`
	`529`	`+ if (!DisableZeroSelectedSpeedStep) notches.Add(new MSTSNotch(0, false, 0));`
	`530`	`+ if (MinimumSpeedForCCEffectMpS > 0) notches.Add(new MSTSNotch(float.Epsilon, false, 0));`
	`531`	`+ float numNotches = (float)Math.Round((Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) / SpeedRegulatorNominalSpeedStepMpS);`
	`532`	`+ for (int i = 1; i <= numNotches; i++)`
`530`	`533`	`{`
`531`	`534`	`notches.Add(new MSTSNotch(i / numNotches, false, 0));`
`532`	`535`	`}`
`@@ -804,6 +807,8 @@ public void UpdateSpeedRegulatorModeChanges()`
`804`	`807`	`var prevMode = SpeedRegMode;`
`805`	`808`	`float throttle = Locomotive.ThrottleController.CurrentValue;`
`806`	`809`	`float dynamic = (Locomotive.DynamicBrakeController?.CurrentValue ?? 0);`
	`810`	`+ bool zeroForce = MaxForceSelectorController.CurrentValue == 0 && MaxForceSelectorController.SavedValue == 0;`
	`811`	`+ bool zeroSelectedSpeed = SpeedSelectorController.CurrentValue == 0 && SpeedSelectorController.SavedValue == 0;`
`807`	`812`	`if (DisableCruiseControlOnThrottleAndZeroSpeed)`
`808`	`813`	`{`
`809`	`814`	`if (throttle > 0 && Locomotive.AbsSpeedMpS == 0)`
`@@ -813,33 +818,33 @@ public void UpdateSpeedRegulatorModeChanges()`
`813`	`818`	`}`
`814`	`819`	`if (DisableCruiseControlOnThrottleAndZeroForce)`
`815`	`820`	`{`
`816`		`- if ((throttle > 0 \|\| UseThrottleAsForceSelector) && SelectedMaxAccelerationPercent == 0)`
	`821`	`+ if ((throttle > 0 \|\| UseThrottleAsForceSelector) && zeroForce)`
`817`	`822`	`{`
`818`	`823`	`SpeedRegMode = SpeedRegulatorMode.Manual;`
`819`	`824`	`}`
`820`	`825`	`}`
`821`	`826`	`if (DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)`
`822`	`827`	`{`
`823`		`- if ((throttle > 0 \|\| UseThrottleAsForceSelector) && SelectedMaxAccelerationPercent == 0 && SelectedSpeedMpS == 0)`
	`828`	`+ if ((throttle > 0 \|\| UseThrottleAsForceSelector) && zeroForce && zeroSelectedSpeed)`
`824`	`829`	`{`
`825`	`830`	`SpeedRegMode = SpeedRegulatorMode.Manual;`
`826`	`831`	`}`
`827`	`832`	`}`
`828`	`833`	`if (ForceRegulatorAutoWhenNonZeroSpeedSelected)`
`829`	`834`	`{`
`830`		`- if (SelectedSpeedMpS == 0 && (!ASCSpeedTakesPriorityOverSpeedSelector \|\| !ASCSetSpeedMpS.HasValue))`
	`835`	`+ if (zeroSelectedSpeed && (!ASCSpeedTakesPriorityOverSpeedSelector \|\| !ASCSetSpeedMpS.HasValue))`
`831`	`836`	`{`
`832`	`837`	`SpeedRegMode = SpeedRegulatorMode.Manual;`
`833`	`838`	`}`
`834`		`- else`
	`839`	`+ else if (SelectedSpeedMpS > 0)`
`835`	`840`	`{`
`836`	`841`	`SpeedRegMode = SpeedRegulatorMode.Auto;`
`837`	`842`	`}`
`838`	`843`	`}`
`839`	`844`	`if (ForceRegulatorAutoWhenNonZeroSpeedSelectedAndThrottleAtZero)`
`840`	`845`	`{`
`841`	`846`	`if (SelectedSpeedMpS > 0 && throttle == 0 && dynamic == 0 &&`
`842`		`- SelectedMaxAccelerationPercent == 0 && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)`
	`847`	`+ zeroForce && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)`
`843`	`848`	`{`
`844`	`849`	`SpeedRegMode = SpeedRegulatorMode.Auto;`
`845`	`850`	`}`
`@@ -1173,8 +1178,8 @@ public void SpeedSelectorIncreaseStep()`
`1173`	`1178`
`1174`	`1179`	`if (SpeedSelectorController.CurrentValue > 0 \|\| MinimumSpeedForCCEffectMpS == 0)`
`1175`	`1180`	`{`
`1176`		`- float speed = (SpeedSelectorController.CurrentValue * (Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) + MinimumSpeedForCCEffectMpS) + SpeedRegulatorNominalSpeedStepMpS;`
`1177`		`- SelectedSpeedMpS = Math.Min((float)Math.Round(speed / SpeedRegulatorNominalSpeedStepMpS) * SpeedRegulatorNominalSpeedStepMpS, Locomotive.MaxSpeedMpS);`
	`1181`	`+ float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) + SpeedRegulatorNominalSpeedStepMpS;`
	`1182`	`+ SelectedSpeedMpS = Math.Min(speed, Locomotive.MaxSpeedMpS);`
`1178`	`1183`	`}`
`1179`	`1184`	`else`
`1180`	`1185`	`{`
`@@ -1189,26 +1194,20 @@ public void SpeedSelectorDecreaseStep()`
`1189`	`1194`	`if (time >= selectedSpeedLeverHoldTime && time < selectedSpeedLeverHoldTime + SpeedSelectorStepTimeSeconds) return;`
`1190`	`1195`	`selectedSpeedLeverHoldTime = time;`
`1191`	`1196`
`1192`		`- float speed = SpeedSelectorController.CurrentValue * (Locomotive.MaxSpeedMpS - MinimumSpeedForCCEffectMpS) + MinimumSpeedForCCEffectMpS - SpeedRegulatorNominalSpeedStepMpS;`
	`1197`	`+ float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) - SpeedRegulatorNominalSpeedStepMpS;`
`1193`	`1198`	`if (speed < MinimumSpeedForCCEffectMpS)`
`1194`	`1199`	`{`
`1195`	`1200`	`SelectedSpeedMpS = 0;`
`1196`	`1201`	`}`
`1197`	`1202`	`else`
`1198`	`1203`	`{`
`1199`		`- SelectedSpeedMpS = Math.Max((float)Math.Round(speed / SpeedRegulatorNominalSpeedStepMpS) * SpeedRegulatorNominalSpeedStepMpS, MinimumSpeedForCCEffectMpS);`
	`1204`	`+ SelectedSpeedMpS = speed;`
`1200`	`1205`	`}`
`1201`	`1206`	`ConfirmSelectedSpeed();`
`1202`	`1207`	`}`
`1203`	`1208`	`public void ConfirmSelectedSpeed()`
`1204`	`1209`	`{`
`1205`		`- float val = SpeedSelectorController.CurrentValue;`
`1206`		`- if (val > 0)`
`1207`		`- {`
`1208`		`- float min = MinimumSpeedForCCEffectMpS;`
`1209`		`- float max = Locomotive.MaxSpeedMpS;`
`1210`		`- val = val * (max - min) + min;`
`1211`		`- }`
	`1210`	`+ float val = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue);`
`1212`	`1211`	`if (SpeedIsMph)`
`1213`	`1212`	`Simulator.Confirmer.Message(ConfirmLevel.Information, Simulator.Catalog.GetStringFmt("Selected speed changed to {0} mph", Math.Round(MpS.FromMpS(val, false), 0, MidpointRounding.AwayFromZero).ToString()));`
`1214`	`1213`	`else`
`@@ -1501,19 +1500,6 @@ public float GetDataOf(CabViewControl cvc)`
`1501`	`1500`	`data = AccelerationBits;`
`1502`	`1501`	`break;`
`1503`	`1502`	`}`
`1504`		`- case CABViewControlTypes.ORTS_CC_SELECTED_SPEED:`
`1505`		`- data = SelectedSpeedPressed ? 1 : 0;`
`1506`		`- break;`
`1507`		`- case CABViewControlTypes.ORTS_CC_SPEED_0:`
`1508`		`- {`
`1509`		`- data = Speed0Pressed ? 1 : 0;`
`1510`		`- break;`
`1511`		`- }`
`1512`		`- case CABViewControlTypes.ORTS_CC_SPEED_DELTA:`
`1513`		`- {`
`1514`		`- data = SpeedDeltaPressed ? 1 : 0;`
`1515`		`- break;`
`1516`		`- }`
`1517`	`1503`	`default:`
`1518`	`1504`	`data = 0;`
`1519`	`1505`	`break;`