Add two-state controls to increment and decrement selected speed by fixed value. By Paolo

Author: Csantucci

Source/Documentation/Manual/cruisecontrol.rst

@@ -329,7 +329,7 @@ table here below.
    "ORTS_AMPERS_BY_CONTROLLER_VOLTAGE", "Displays the current used for the motive force of the locomotive", "Amperes", 
    "ORTS_ACCELERATION_IN_TIME", "Value of AccelerationBits; some cabs can show 'Arrows' pointing up or down according to speed change", "", 
    "ORTS_ODOMETER", "Displays the odometer value since last odometer reset", "meters or Km", 
-   "ORTS_CC_SELECT_SPEED", "obsolete (maybe)", "", 
+   "ORTS_CC_SELECT_SPEED", "Sets speed to value of second ScaleRange parameter (KpH or MpH depending from eng parameter SpeedIsMpH)", "", "Y" 
    "ORTS_NUMBER_OF_AXES_INCREASE", "Increases the number of axles of the train, when mouse pressed", "", "Y"
    "ORTS_NUMBER_OF_AXES_DECREASE", "Decreases the number of axles of the train, when mouse pressed", "", "Y"
    "ORTS_MULTI_POSITION_CONTROLLER", "Displays and sets the position of the MPC", "", "Y"
@@ -354,6 +354,10 @@ table here below.
    "ORTS_CC_SPEED_180", "As above, but speed as shown in control name", "", "Y"
    "ORTS_CC_SPEED_190", "As above, but speed as shown in control name", "", "Y"
    "ORTS_CC_SPEED_200", "As above, but speed as shown in control name", "", "Y"
+   "ORTS_CC_SPEED_PLUS5", "As above, but speed incremented by 5", "", "Y"
+   "ORTS_CC_SPEED_MINUS5", "As above, but speed decremented by 5", "", "Y"
+   "ORTS_CC_SPEED_PLUS1", "As above, but speed incremented by 1", "", "Y"
+   "ORTS_CC_SPEED_MINUS1", "As above, but speed decremented by 1", "", "Y"
    "ORTS_SELECTED_SPEED_SELECTOR", "Speed selection done by independent lever ranging from 0 to max speed; UoM may be KpH or MpH.", "", "Y"
 
 

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -312,7 +312,11 @@ public enum CABViewControlTypes
         ORTS_CC_SPEED_180,
         ORTS_CC_SPEED_190,
         ORTS_CC_SPEED_200,
-
+		ORTS_CC_SPEED_PLUS5,
+        ORTS_CC_SPEED_MINUS5,
+        ORTS_CC_SPEED_PLUS1,
+        ORTS_CC_SPEED_MINUS1,
+					
         ORTS_ODOMETER,
         ORTS_ODOMETER_RESET,
         ORTS_ODOMETER_DIRECTION,

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

@@ -71,6 +71,13 @@ public float SetSpeedMpS
                 return selected;
             }
         }
+		public float SetSpeedKpHOrMpH
+        {
+            get
+            {
+                return SpeedIsMph ? MpS.ToMpH(SetSpeedMpS) : MpS.ToKpH(SetSpeedMpS);
+            }
+        } 
         public int SelectedNumberOfAxles = 0;
         public float SpeedRegulatorNominalSpeedStepMpS = 0;
         public float SpeedRegulatorNominalSpeedStepKpHOrMpH = 0;
@@ -173,7 +180,8 @@ public enum SpeedSelectorMode { Parking, Neutral, On, Start }
         public bool Speed0Pressed, Speed10Pressed, Speed20Pressed, Speed30Pressed, Speed40Pressed, Speed50Pressed
             , Speed60Pressed, Speed70Pressed, Speed80Pressed, Speed90Pressed, Speed100Pressed
             , Speed110Pressed, Speed120Pressed, Speed130Pressed, Speed140Pressed, Speed150Pressed
-            , Speed160Pressed, Speed170Pressed, Speed180Pressed, Speed190Pressed, Speed200Pressed;
+            , Speed160Pressed, Speed170Pressed, Speed180Pressed, Speed190Pressed, Speed200Pressed, SpeedPlus5Pressed, SpeedMinus5Pressed
+            , SpeedPlus1Pressed, SpeedMinus1Pressed;
 
         public CruiseControl(MSTSLocomotive locomotive)
         {
@@ -1583,6 +1591,26 @@ public float GetDataOf(CabViewControl cvc)
                     {
                         data = Speed200Pressed ? 1 : 0;
                         break;
+                    }
+				case CABViewControlTypes.ORTS_CC_SPEED_PLUS5:
+                    {
+                        data = SpeedPlus5Pressed ? 1 : 0;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS5:
+                    {
+                        data = SpeedMinus5Pressed ? 1 : 0;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_PLUS1:
+                    {
+                        data = SpeedPlus1Pressed ? 1 : 0;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS1:
+                    {
+                        data = SpeedMinus1Pressed ? 1 : 0;
+                        break;
                     }
                 default:
                     data = 0;

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2314,6 +2314,10 @@ public virtual int GetDrawIndex()
                 case CABViewControlTypes.ORTS_CC_SELECT_SPEED:
                 case CABViewControlTypes.ORTS_MULTI_POSITION_CONTROLLER:
                 case CABViewControlTypes.ORTS_ACCELERATION_IN_TIME:
+				case CABViewControlTypes.ORTS_CC_SPEED_PLUS5:
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS5:											 
+				case CABViewControlTypes.ORTS_CC_SPEED_PLUS1:
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS1:											  
                 case CABViewControlTypes.ORTS_CC_SPEED_0:
                 case CABViewControlTypes.ORTS_CC_SPEED_10:
                 case CABViewControlTypes.ORTS_CC_SPEED_20:
@@ -2988,6 +2992,50 @@ public void HandleUserInput()
                         }
                         else if (p == 0) Locomotive.CruiseControl.Speed200Pressed = false;
                         break;
+                    }
+					case CABViewControlTypes.ORTS_CC_SPEED_PLUS5:
+                    {
+                        p = ChangedValue(0);
+                        if (p == 1)
+                        {
+                            Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH + 5);
+                            Locomotive.CruiseControl.SpeedPlus5Pressed = true;
+                        }
+                        else if (p == 0) Locomotive.CruiseControl.SpeedPlus5Pressed = false;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS5:
+                    {
+                        p = ChangedValue(0);
+                        if (p == 1)
+                        {
+                            Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH- 5);
+                            Locomotive.CruiseControl.SpeedMinus5Pressed = true;
+                        }
+                        else if (p == 0) Locomotive.CruiseControl.SpeedMinus5Pressed = false;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_PLUS1:
+                    {
+                        p = ChangedValue(0);
+                        if (p == 1)
+                        {
+                            Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH + 1);
+                            Locomotive.CruiseControl.SpeedPlus1Pressed = true;
+                        }
+                        else if (p == 0) Locomotive.CruiseControl.SpeedPlus1Pressed = false;
+                        break;
+                    }
+                case CABViewControlTypes.ORTS_CC_SPEED_MINUS1:
+                    {
+                        p = ChangedValue(0);
+                        if (p == 1)
+                        {
+                            Locomotive.CruiseControl.SetSpeed(Locomotive.CruiseControl.SetSpeedKpHOrMpH - 1);
+                            Locomotive.CruiseControl.SpeedMinus1Pressed = true;
+                        }
+                        else if (p == 0) Locomotive.CruiseControl.SpeedMinus1Pressed = false;
+                        break;
                     }
                 case CABViewControlTypes.ORTS_DP_MOVE_TO_FRONT:
                     buttonState = ChangedValue(ButtonState ? 1 : 0) > 0;