Skip to content

Commit

Permalink
I cannot explain how confused I am by this commit but the only real a…
Browse files Browse the repository at this point in the history 
…dditon here would be the resistance smoothing max value being set to 100 from 500 because 100 is the real max, anything above that was just placebo
  • Loading branch information
@cosmii02
cosmii02 committed Aug 21, 2024
1 parent 1c2ab84 commit 704ea52
Show file tree
Hide file tree
Showing 12 changed files with 155 additions and 175 deletions.
224 changes: 112 additions & 112 deletions App.config
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="RacingDSX.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<RacingDSX.Properties.Settings>
<setting name="_grip_Loss_Val" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="_throttle_Grip_Loss_Val" serializeAs="String">
<value>0.2</value>
</setting>
<setting name="_max_Brake_Vibration" serializeAs="String">
<value>35</value>
</setting>
<setting name="_min_Brake_Vibration" serializeAs="String">
<value>3</value>
</setting>
<setting name="_turn_Accel_Mod" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="_ewma_Alpha_Throttle" serializeAs="String">
<value>0.01</value>
</setting>
<setting name="_ewma_Alpha_Brake" serializeAs="String">
<value>1</value>
</setting>
<setting name="_ewma_Alpha_Brake_Freq" serializeAs="String">
<value>1</value>
</setting>
<setting name="_ewma_Alpha_Throttle_Freq" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="_forward_Accel_Mod" serializeAs="String">
<value>1</value>
</setting>
<setting name="_max_Accel_Griploss_Vibration" serializeAs="String">
<value>35</value>
</setting>
<setting name="_min_Accel_Griploss_Vibration" serializeAs="String">
<value>3</value>
</setting>
<setting name="_min_Accel_Griploss_Stiffness" serializeAs="String">
<value>200</value>
</setting>
<setting name="_max_Accel_Griploss_Stiffness" serializeAs="String">
<value>75</value>
</setting>
<setting name="_min_Brake_Stiffness" serializeAs="String">
<value>200</value>
</setting>
<setting name="_max_Brake_Stiffness" serializeAs="String">
<value>1</value>
</setting>
<setting name="_brake_Vibration_Start" serializeAs="String">
<value>20</value>
</setting>
<setting name="_brake_Vibration_Mode_Start" serializeAs="String">
<value>10</value>
</setting>
<setting name="_throttle_Vibration_Mode_Start" serializeAs="String">
<value>5</value>
</setting>
<setting name="_max_Throttle_Resistance" serializeAs="String">
<value>6</value>
</setting>
<setting name="_max_Brake_Resistance" serializeAs="String">
<value>6</value>
</setting>
<setting name="_min_Throttle_Resistance" serializeAs="String">
<value>1</value>
</setting>
<setting name="_min_Brake_Resistance" serializeAs="String">
<value>1</value>
</setting>
<setting name="_acceleration_Limit" serializeAs="String">
<value>10</value>
</setting>
<setting name="_rpm_Redline_Ratio" serializeAs="String">
<value>0.9</value>
</setting>
<setting name="_disable_App_Check" serializeAs="String">
<value>False</value>
</setting>
<setting name="_dsx_PORT" serializeAs="String">
<value>6969</value>
</setting>
<setting name="_forza_PORT" serializeAs="String">
<value>5300</value>
</setting>
<setting name="_left_Trigger_Effect_Intensity" serializeAs="String">
<value>0.7</value>
</setting>
<setting name="_right_Trigger_Effect_Intensity" serializeAs="String">
<value>0.7</value>
</setting>
<setting name="_verbose" serializeAs="String">
<value>0</value>
</setting>
<setting name="ThrottleTriggerMode" serializeAs="String">
<value>2</value>
</setting>
<setting name="BrakeTriggerMode" serializeAs="String">
<value>2</value>
</setting>
</RacingDSX.Properties.Settings>
</userSettings>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="RacingDSX.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<RacingDSX.Properties.Settings>
<setting name="_grip_Loss_Val" serializeAs="String">
<value>0.6</value>
</setting>
<setting name="_throttle_Grip_Loss_Val" serializeAs="String">
<value>0.2</value>
</setting>
<setting name="_max_Brake_Vibration" serializeAs="String">
<value>35</value>
</setting>
<setting name="_min_Brake_Vibration" serializeAs="String">
<value>3</value>
</setting>
<setting name="_turn_Accel_Mod" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="_ewma_Alpha_Throttle" serializeAs="String">
<value>0.01</value>
</setting>
<setting name="_ewma_Alpha_Brake" serializeAs="String">
<value>1</value>
</setting>
<setting name="_ewma_Alpha_Brake_Freq" serializeAs="String">
<value>1</value>
</setting>
<setting name="_ewma_Alpha_Throttle_Freq" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="_forward_Accel_Mod" serializeAs="String">
<value>1</value>
</setting>
<setting name="_max_Accel_Griploss_Vibration" serializeAs="String">
<value>35</value>
</setting>
<setting name="_min_Accel_Griploss_Vibration" serializeAs="String">
<value>3</value>
</setting>
<setting name="_min_Accel_Griploss_Stiffness" serializeAs="String">
<value>200</value>
</setting>
<setting name="_max_Accel_Griploss_Stiffness" serializeAs="String">
<value>75</value>
</setting>
<setting name="_min_Brake_Stiffness" serializeAs="String">
<value>200</value>
</setting>
<setting name="_max_Brake_Stiffness" serializeAs="String">
<value>1</value>
</setting>
<setting name="_brake_Vibration_Start" serializeAs="String">
<value>20</value>
</setting>
<setting name="_brake_Vibration_Mode_Start" serializeAs="String">
<value>10</value>
</setting>
<setting name="_throttle_Vibration_Mode_Start" serializeAs="String">
<value>5</value>
</setting>
<setting name="_max_Throttle_Resistance" serializeAs="String">
<value>6</value>
</setting>
<setting name="_max_Brake_Resistance" serializeAs="String">
<value>6</value>
</setting>
<setting name="_min_Throttle_Resistance" serializeAs="String">
<value>1</value>
</setting>
<setting name="_min_Brake_Resistance" serializeAs="String">
<value>1</value>
</setting>
<setting name="_acceleration_Limit" serializeAs="String">
<value>10</value>
</setting>
<setting name="_rpm_Redline_Ratio" serializeAs="String">
<value>0.9</value>
</setting>
<setting name="_disable_App_Check" serializeAs="String">
<value>False</value>
</setting>
<setting name="_dsx_PORT" serializeAs="String">
<value>6969</value>
</setting>
<setting name="_forza_PORT" serializeAs="String">
<value>5300</value>
</setting>
<setting name="_left_Trigger_Effect_Intensity" serializeAs="String">
<value>0.7</value>
</setting>
<setting name="_right_Trigger_Effect_Intensity" serializeAs="String">
<value>0.7</value>
</setting>
<setting name="_verbose" serializeAs="String">
<value>0</value>
</setting>
<setting name="ThrottleTriggerMode" serializeAs="String">
<value>2</value>
</setting>
<setting name="BrakeTriggerMode" serializeAs="String">
<value>2</value>
</setting>
</RacingDSX.Properties.Settings>
</userSettings>
</configuration>
2 changes: 1 addition & 1 deletion Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace RacingDSX
{
public class Program
{
public const String VERSION = "0.6.0";
public const String VERSION = "0.6.2";

[STAThread]
static void Main(string[] args)
Expand Down
5 changes: 2 additions & 3 deletions Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="UTF-8"?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="RacingDSX.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="_grip_Loss_Val" Type="System.Single" Scope="User">
<Value Profile="(Default)">0.5</Value>
<Value Profile="(Default)">0.6</Value>
</Setting>
<Setting Name="_throttle_Grip_Loss_Val" Type="System.Single" Scope="User">
<Value Profile="(Default)">0.2</Value>
Expand Down Expand Up @@ -102,4 +102,5 @@
<Value Profile="(Default)">2</Value>
</Setting>
</Settings>
</SettingsFile>
</SettingsFile>

5 changes: 5 additions & 0 deletions RacingDSX.sln.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FNameForm/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FProperties_002FResources/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=RacingDSX_002FUI/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions UI.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions UI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,12 +448,12 @@ void SwitchDisplayedProfile(String profileName = "")
this.brakeVibrationModeTrackBar.Value = brakeSettings.VibrationModeStart;
this.minBrakeVibrationTrackBar.Value = brakeSettings.MinVibration;
this.maxBrakeVibrationTrackBar.Value = brakeSettings.MaxVibration;
this.vibrationSmoothingTrackBar.Value = DenormalizeValue(brakeSettings.VibrationSmoothing, 500.0f);
this.vibrationSmoothingTrackBar.Value = DenormalizeValue(brakeSettings.VibrationSmoothing, 100.0f);
this.minBrakeStiffnessTrackBar.Value = brakeSettings.MinStiffness;
this.maxBrakeStiffnessTrackBar.Value = brakeSettings.MaxStiffness;
this.minBrakeResistanceTrackBar.Value = brakeSettings.MinResistance;
this.maxBrakeResistanceTrackBar.Value = brakeSettings.MaxResistance;
this.brakeResistanceSmoothingTrackBar.Value = DenormalizeValue(brakeSettings.ResistanceSmoothing, 500.0f);
this.brakeResistanceSmoothingTrackBar.Value = DenormalizeValue(brakeSettings.ResistanceSmoothing, 100.0f);

this.brakeEffectNumericUpDown.Value = this.brakeEffectIntensityTrackBar.Value;
this.gripLossNumericUpDown.Value = this.gripLossTrackBar.Value;
Expand Down Expand Up @@ -680,15 +680,15 @@ private void maxBrakeVibrationNumericUpDown_ValueChanged(object sender, EventArg

private void vibrationSmoothingTrackBar_Scroll(object sender, EventArgs e)
{
selectedProfile.brakeSettings.VibrationSmoothing = NormalizeValue(vibrationSmoothingTrackBar.Value, 500);
selectedProfile.brakeSettings.VibrationSmoothing = NormalizeValue(vibrationSmoothingTrackBar.Value, 100);
brakeVibrationSmoothNumericUpDown.Value = vibrationSmoothingTrackBar.Value;


}

private void brakeVibrationSmoothNumericUpDown_ValueChanged(object sender, EventArgs e)
{
selectedProfile.brakeSettings.VibrationSmoothing = NormalizeValue((float)brakeVibrationSmoothNumericUpDown.Value, 500);
selectedProfile.brakeSettings.VibrationSmoothing = NormalizeValue((float)brakeVibrationSmoothNumericUpDown.Value, 100);
vibrationSmoothingTrackBar.Value = (int)Math.Floor(brakeVibrationSmoothNumericUpDown.Value);


Expand Down Expand Up @@ -785,15 +785,15 @@ private void maxBrakeResistanceNumericUpDown_ValueChanged(object sender, EventAr

private void brakeResistanceSmoothingTrackBar_Scroll(object sender, EventArgs e)
{
selectedProfile.brakeSettings.ResistanceSmoothing = NormalizeValue(brakeResistanceSmoothingTrackBar.Value, 500);
selectedProfile.brakeSettings.ResistanceSmoothing = NormalizeValue(brakeResistanceSmoothingTrackBar.Value, 100);
brakeResistanceSmoothNumericUpDown.Value = brakeResistanceSmoothingTrackBar.Value;


}

private void brakeResistanceSmoothNumericUpDown_ValueChanged(object sender, EventArgs e)
{
selectedProfile.brakeSettings.ResistanceSmoothing = NormalizeValue((float)brakeResistanceSmoothNumericUpDown.Value, 500);
selectedProfile.brakeSettings.ResistanceSmoothing = NormalizeValue((float)brakeResistanceSmoothNumericUpDown.Value, 100);
brakeResistanceSmoothingTrackBar.Value = (int)Math.Floor(brakeResistanceSmoothNumericUpDown.Value);


Expand Down
16 changes: 8 additions & 8 deletions appsettings.ini
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
;The point at which the brake will begin to become choppy
_grip_Loss_Val=0.5
_grip_Loss_Val=0.05
;The point at which the throttle will begin to become choppy
_throttle_Grip_Loss_Val=0.2
_throttle_Grip_Loss_Val=0.6
;The maximum brake frequency in Hz (avoid over 40). COrrelates to better grip
_max_Brake_Vibration=15
_max_Brake_Vibration=40
;How to scale turning acceleration in determining throttle stiffness.
TURN_ACCEL_MOD=0.5
TURN_ACCEL_MOD=0.25
;How to scale Forward acceleration in determining throttle stiffness.
_forward_Accel_Mod=1.0
_forward_Accel_Mod=0.5
;On a scale of 1-255 with 1 being most stiff
_min_Brake_Stiffness=180
_min_Brake_Stiffness=150
;On a scale of 1-255 with 1 being most stiff
_max_Brake_Stiffness=5
;The position (0-255) at which the brake should feel engaged with low grip surfaces
Expand All @@ -28,7 +28,7 @@ DISABLE_APP_CHECK=true
_dsx_PORT=6969
FORZA_PORT=5300
;Smoothing for Throttle Resistance output. Lower = smoother. Must be greater than 0 { 0.01 - 0.99 }
_ewma_Alpha_Throttle = 0.5
_ewma_Alpha_Throttle = 0.9
;Smoothing for Brake Resistance output. Lower = smoother. Must be greater than 0 { 0.01 - 0.99 }
_ewma_Alpha_Brake = 0.9
;Smoothing for Brake Resistance output. Lower = smoother. Must be greater than 0 { 0.01 - 0.99 }
Expand All @@ -38,7 +38,7 @@ BRAKE_VIBRATION__MODE_START = 1
;The depression of the throttle lever at which the program should switch to vibration mode rather than smooth resistance. This helps to avoid clicking as vibration mode clicks when no force is applied.
_throttle_Vibration_Mode_Start = 5
;The Minimum brake frequency in Hz (avoid over 40). Helps avoid clicking in controller
_min_Brake_Vibration = 1
_min_Brake_Vibration = 20
;Smoothing for Brake Resistance output. Lower = smoother. Must be greater than 0
_ewma_Alpha_Throttle_Freq = 1
;The maximum acceleration frequency in Hz (avoid over 40). COrrelates to better grip
Expand Down
Loading

0 comments on commit 704ea52

Please sign in to comment.