Add StepSize and SnapTo10s to ETS2LA.State. Bump 3.3.2.

Author: Tumppi066

ETS2LA.State/Program.cs

@@ -4,7 +4,7 @@
 using ETS2LA.Telemetry;
 using ETS2LA.Settings.Global;
 using ETS2LA.Game;
-using ETS2LA.Notifications;
+using ETS2LA.Logging;
 
 namespace ETS2LA.State;
 
@@ -151,6 +151,31 @@ private void RoundToNearestUnit()
                 DesiredSpeed = (float)Math.Round(DesiredSpeed); // Round to nearest m/s
                 break;
         }
+
+        if (DesiredSpeed < 0)
+            DesiredSpeed = 0;
+    }
+    
+    private float SnapTo10s(float increase)
+    {
+        if (!stateSettings.SnapTo10s)
+            return DesiredSpeed + increase;
+
+        float currentSpeedInDisplayUnits = UnitConversions.FromScientificUnits(UnitType.Speed, DesiredSpeed, DisplayUnits);
+        float newSpeedInDisplayUnits = currentSpeedInDisplayUnits + UnitConversions.FromScientificUnits(UnitType.Speed, increase, DisplayUnits);
+        // When increasing by 2 from 37 we go:
+        // 37 -> 39 -> 40 -> 42 -> 44
+        float currentSpeed10s = (float)(Math.Floor((currentSpeedInDisplayUnits + 0.1f) / 10) * 10);
+        float newSpeed10s = (float)(Math.Floor((newSpeedInDisplayUnits + 0.1f) / 10) * 10);
+        
+        if (currentSpeed10s != newSpeed10s && newSpeed10s > currentSpeed10s)
+        {
+            return UnitConversions.ToScientificUnits(UnitType.Speed, newSpeed10s, DisplayUnits);
+        }
+        else
+        {
+            return DesiredSpeed + increase;
+        }
     }
 
     private void HandleSet(object sender, ControlChangeEventArgs e)
@@ -191,13 +216,15 @@ private void HandleIncrease(object sender, ControlChangeEventArgs e)
         switch (DisplayUnits)
         {
             case Units.Metric:
-                DesiredSpeed += UnitConversions.ToScientificUnits(UnitType.Speed, 1.0f, Units.Metric); // 1 km/h in m/s
+                float increaseMetric = UnitConversions.ToScientificUnits(UnitType.Speed, stateSettings.SpeedControlStepSize, Units.Metric);
+                DesiredSpeed = SnapTo10s(increaseMetric);
                 break;
             case Units.Imperial:
-                DesiredSpeed += UnitConversions.ToScientificUnits(UnitType.Speed, 1.0f, Units.Imperial); // 1 mph in m/s
+                float increaseImperial = UnitConversions.ToScientificUnits(UnitType.Speed, stateSettings.SpeedControlStepSize, Units.Imperial);
+                DesiredSpeed = SnapTo10s(increaseImperial);
                 break;
             case Units.Scientific:
-                DesiredSpeed += 1f; // 1 m/s
+                DesiredSpeed += stateSettings.SpeedControlStepSize;
                 break;
         }
 
@@ -219,13 +246,15 @@ private void HandleDecrease(object sender, ControlChangeEventArgs e)
         switch (DisplayUnits)
         {
             case Units.Metric:
-                DesiredSpeed -= UnitConversions.ToScientificUnits(UnitType.Speed, 1.0f, Units.Metric); // 1 km/h in m/s
+                float decreaseMetric = UnitConversions.ToScientificUnits(UnitType.Speed, stateSettings.SpeedControlStepSize, Units.Metric);
+                DesiredSpeed = SnapTo10s(-decreaseMetric);
                 break;
             case Units.Imperial:
-                DesiredSpeed -= UnitConversions.ToScientificUnits(UnitType.Speed, 1.0f, Units.Imperial); // 1 mph in m/s
+                float decreaseImperial = UnitConversions.ToScientificUnits(UnitType.Speed, stateSettings.SpeedControlStepSize, Units.Imperial);
+                DesiredSpeed = SnapTo10s(-decreaseImperial);
                 break;
             case Units.Scientific:
-                DesiredSpeed -= 1f; // 1 m/s
+                DesiredSpeed -= stateSettings.SpeedControlStepSize;
                 break;
         }
 

ETS2LA.State/Settings.cs

@@ -7,6 +7,8 @@ namespace ETS2LA.State;
 public class StateSettings
 {
     public Units DisplayUnits = Units.Metric;
+    public int SpeedControlStepSize = 2;
+    public bool SnapTo10s = true;
 }
 
 public class StateSettingsHandler

ETS2LA.UI/Views/Settings/AssistanceSettings.axaml

@@ -43,6 +43,22 @@
                 </TabStrip>
             </StackPanel>
 
+            <StackPanel Spacing="10">
+                <Grid ColumnDefinitions="*, Auto">
+                    <TextBlock Text="Snap to 10 units" VerticalAlignment="Center" />
+                    <ToggleSwitch Grid.Column="1" IsChecked="{Binding SnapTo10Units}" Classes="primary-toggle" />
+                </Grid>
+                <TextBlock Text="When changing the speed, snap to the nearest 10 units. i.e. 37 -> 39 -> 40 -> 42..." FontSize="12" Classes="Description" />
+            </StackPanel>
+
+            <StackPanel Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="6">
+                    <TextBlock Text="Speed Control Step Size" />
+                    <TextBlock Text="{Binding ElementName=SpeedControlStepSizeSlider, Path=Value, StringFormat='{}{0:0} unit(s)'}" />
+                </StackPanel>
+                <Slider Name="SpeedControlStepSizeSlider" Minimum="1" Maximum="5" TickFrequency="1" IsSnapToTickEnabled="True" Value="{Binding SpeedControlStepSize}" />
+            </StackPanel>
+
             <Separator />
 
             <StackPanel Spacing="10">

ETS2LA.UI/Views/Settings/AssistanceSettings.axaml.cs

@@ -4,6 +4,7 @@
 using ETS2LA.Settings.Global;
 using System.Runtime.CompilerServices;
 using System.Collections.ObjectModel;
+using ETS2LA.State;
 
 namespace ETS2LA.UI.Views.Settings;
 
@@ -29,6 +30,34 @@ public bool SeparateCruiseAndSteering
         }
     }
 
+    public int SpeedControlStepSize
+    {
+        get => (int)StateSettingsHandler.Current.GetSettings().SpeedControlStepSize;
+        set
+        {
+            if (StateSettingsHandler.Current.GetSettings().SpeedControlStepSize != (int)value)
+            {
+                StateSettingsHandler.Current.GetSettings().SpeedControlStepSize = (int)value;
+                StateSettingsHandler.Current.Save();
+            }
+            OnPropertyChanged(nameof(SpeedControlStepSize));
+        }
+    }
+
+    public bool SnapTo10Units
+    {
+        get => StateSettingsHandler.Current.GetSettings().SnapTo10s;
+        set
+        {
+            if (StateSettingsHandler.Current.GetSettings().SnapTo10s != value)
+            {
+                StateSettingsHandler.Current.GetSettings().SnapTo10s = value;
+                StateSettingsHandler.Current.Save();
+            }
+            OnPropertyChanged(nameof(SnapTo10Units));
+        }
+    }
+
     public int SelectedAccelerationOption { get; set; }
     public int SelectedSteeringSensitivityOption { get; set; }
     public int SelectedFollowingDistanceOption { get; set; }

ETS2LA/ETS2LA.csproj

@@ -8,7 +8,7 @@
 
     <Title>ETS2LA</Title>
     <Description>Self driving for ETS2 and ATS.</Description>
-    <Version>3.3.1</Version>
+    <Version>3.3.2</Version>
   </PropertyGroup>
 
   <ItemGroup>