From 8d92d57fb1949d288b12d940267629b43beb25f4 Mon Sep 17 00:00:00 2001
From: kamih <guillaume.stordeur@gmail.com>
Date: Sat, 25 Jan 2025 12:30:28 -0700
Subject: [PATCH 01/18] added first test of new HUD that sends trigger effects
 to dualsense controller via simple dll instead of dsx

---
 .../DualSense/DualSenseConfiguration.cs       | 86 +++++++++++++++++++
 .../Driving/DualSense/DualSenseJob.cs         | 19 ++++
 .../Driving/DualSense/DualSenseOverlay.cs     | 49 +++++++++++
 .../Overlays/Driving/DualSense/Resources.cs   | 27 ++++++
 .../Driving/DualSense/TriggerHaptics.cs       | 77 +++++++++++++++++
 5 files changed, 258 insertions(+)
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs
new file mode 100644
index 000000000..1f13af5ed
--- /dev/null
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
@@ -0,0 +1,86 @@
+using RaceElement.HUD.Overlay.Configuration;
+
+namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
+
+internal sealed class DualSenseConfiguration : OverlayConfiguration
+{
+    public DualSenseConfiguration()
+    {
+        GenericConfiguration.AlwaysOnTop = false;
+        GenericConfiguration.Window = false;
+        GenericConfiguration.Opacity = 1.0f;
+        GenericConfiguration.AllowRescale = false;
+    }
+
+
+    [ConfigGrouping("Brake Slip", "Adjust the slip effect whilst applying the brakes.")]
+    public BrakeSlipHaptics BrakeSlip { get; init; } = new();
+    public sealed class BrakeSlipHaptics
+    {
+        /// <summary>
+        /// The brake in percentage (divide by 100f if you want 0-1 value)
+        /// </summary>
+        [ToolTip("The minimum brake percentage before any effects are applied. See this like a deadzone.")]
+        [FloatRange(0.1f, 99f, 0.1f, 1)]
+        public float BrakeThreshold { get; init; } = 3f;
+
+        [FloatRange(0.05f, 6f, 0.002f, 3)]
+        public float FrontSlipThreshold { get; init; } = 0.25f;
+
+        [FloatRange(0.05f, 6f, 0.002f, 3)]
+        public float RearSlipThreshold { get; init; } = 0.25f;
+
+        [ToolTip("Higher is stronger dynamic feedback.")]
+        [IntRange(5, 8, 1)]
+        public int FeedbackStrength { get; init; } = 7;
+
+        [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
+        [IntRange(1, 10, 1)]
+        public int MinFrequency { get; init; } = 10;
+
+        [ToolTip("Sets the max frequency of the vibration effect in the trigger.")]
+        [IntRange(20, 150, 1)]
+        public int MaxFrequency { get; init; } = 100;
+
+        [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
+        [IntRange(1, 8, 1)]
+        public int Amplitude { get; init; } = 1;
+    }
+
+    [ConfigGrouping("Throttle Slip", "Adjust the slip effect whilst applying the throttle.\nModify the threshold to increase or decrease sensitivity in different situations.")]
+    public ThrottleSlipHaptics ThrottleSlip { get; init; } = new();
+    public sealed class ThrottleSlipHaptics
+    {
+        /// <summary>
+        /// The throttle in percentage (divide by 100f if you want 0-1 value)
+        /// </summary>
+        [ToolTip("The minimum throttle percentage before any effects are applied. See this like a deadzone.")]
+        [FloatRange(0.1f, 99f, 0.1f, 1)]
+        public float ThrottleThreshold { get; init; } = 3f;
+
+        [ToolTip("Decrease this treshold to increase the sensitivity when the front wheels slip (understeer).")]
+        [FloatRange(0.05f, 6f, 0.002f, 3)]
+        public float FrontSlipThreshold { get; init; } = 0.35f;
+
+        [ToolTip("Decrease this treshold to increase the sensitivity when the rear wheels slip (oversteer).")]
+        [FloatRange(0.05f, 10f, 0.002f, 3)]
+        public float RearSlipThreshold { get; init; } = 0.25f;
+
+        [ToolTip("Higher is stronger dynamic feedback.")]
+        [IntRange(5, 8, 1)]
+        public int FeedbackStrength { get; init; } = 8;
+
+        [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
+        [IntRange(1, 10, 1)]
+        public int MinFrequency { get; init; } = 10;
+
+        [ToolTip("Sets the max frequency of the vibration effect in the trigger.")]
+        [IntRange(20, 150, 1)]
+        public int MaxFrequency { get; init; } = 100;
+
+        [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
+        [IntRange(1, 8, 1)]
+        public int Amplitude { get; init; } = 1;
+    }
+
+}
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs
new file mode 100644
index 000000000..1240795af
--- /dev/null
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
@@ -0,0 +1,19 @@
+using RaceElement.Core.Jobs.Loop;
+using static RaceElement.HUD.Common.Overlays.Driving.DualSense.Resources;
+
+namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
+
+internal sealed class DualSenseJob(DualSenseOverlay overlay) : AbstractLoopJob
+{
+    public sealed override void RunAction()
+    {
+        //if (!overlay.ShouldRender())
+        //    return;
+
+        TriggerHaptics.HandleAcceleration(overlay._config);
+        TriggerHaptics.HandleBraking(overlay._config);
+    }
+    public override void AfterCancel()
+    {
+    }
+}
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
new file mode 100644
index 000000000..4c806616c
--- /dev/null
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
@@ -0,0 +1,49 @@
+using RaceElement.Data.Games;
+using RaceElement.HUD.Overlay.Internal;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+
+using static RaceElement.HUD.Common.Overlays.Driving.DualSense.Resources;
+
+namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
+
+[Overlay(Name = "DualSense",
+    Description = "Adds trigger effects to the DualSense Controller.\n See Guide in the Discord of Race Element for instructions.",
+    OverlayCategory = OverlayCategory.Inputs,
+    OverlayType = OverlayType.Drive,
+    Game = Game.RaceRoom | Game.AssettoCorsa1 | Game.AssettoCorsaEvo,
+    Authors = ["Reinier Klarenberg", "Guillaume Stordeur"]
+)]
+internal sealed class DualSenseOverlay : CommonAbstractOverlay
+{
+    internal readonly DualSenseConfiguration _config = new();
+    private DualSenseJob _DualSenseJob;
+
+    public DualSenseOverlay(Rectangle rectangle) : base(rectangle, "DualSense")
+    {
+        Width = 1; Height = 1;
+        RefreshRateHz = 1;
+        AllowReposition = false;
+    }
+
+    public sealed override void BeforeStart()
+    {
+        if (IsPreviewing) return;
+        ds5w_init();
+        _DualSenseJob = new DualSenseJob(this) { IntervalMillis = 1000 / 200 };
+        _DualSenseJob.Run();
+    }
+    public sealed override void BeforeStop()
+    {
+        if (IsPreviewing) return;
+
+        _DualSenseJob?.CancelJoin();
+        ds5w_shutdown();
+    }
+
+    public sealed override bool ShouldRender() => DefaultShouldRender() && !IsPreviewing;
+
+    public sealed override void Render(Graphics g) { }
+
+}
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs
new file mode 100644
index 000000000..f56a188ae
--- /dev/null
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs	
@@ -0,0 +1,27 @@
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
+
+internal static class Resources
+{
+    /*
+        DS5W_CAPI int ds5w_init(void);
+        DS5W_CAPI void ds5w_shutdown(void);
+        DS5W_CAPI int ds5w_set_trigger_effect_off(int left);
+        DS5W_CAPI int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
+    */
+    [DllImport("ds5w_x64.dll", SetLastError = true)]
+    public static extern int ds5w_init();
+
+    [DllImport("ds5w_x64.dll", SetLastError = true)]
+    public static extern void ds5w_shutdown();
+
+    [DllImport("ds5w_x64.dll", SetLastError = true)]
+    public static extern int ds5w_set_trigger_effect_off(int left);
+
+    [DllImport("ds5w_x64.dll", SetLastError = true)]
+    public static extern int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
+}
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
new file mode 100644
index 000000000..b1200d03e
--- /dev/null
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -0,0 +1,77 @@
+using RaceElement.Data.Common;
+using RaceElement.Util.SystemExtensions;
+using static RaceElement.HUD.Common.Overlays.Driving.DualSense.Resources;
+
+namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
+
+internal static class TriggerHaptics
+{
+    public static void HandleBraking(DualSenseConfiguration config)
+    {
+        // TODO: add either an option to threshold it on brake input or based on some curve?
+        if (SimDataProvider.LocalCar.Inputs.Brake <= config.BrakeSlip.BrakeThreshold / 100f)
+            return;
+        float[] slipRatios = SimDataProvider.LocalCar.Tyres.SlipRatio;
+        if (slipRatios.Length != 4)
+            return;
+
+        float slipRatioFront = Math.Max(slipRatios[0], slipRatios[1]);
+        float slipRatioRear = Math.Max(slipRatios[2], slipRatios[3]);
+
+        // TODO: add option for front and rear ratio threshold.
+        if (slipRatioFront > config.BrakeSlip.FrontSlipThreshold || slipRatioRear > config.BrakeSlip.RearSlipThreshold)
+        {
+            float frontslipCoefecient = slipRatioFront * 4f;
+            frontslipCoefecient.ClipMax(10);
+
+            float rearSlipCoefecient = slipRatioFront * 2f;
+            rearSlipCoefecient.ClipMax(7.5f);
+
+            float magicValue = frontslipCoefecient + rearSlipCoefecient;
+            float percentage = magicValue * 1.0f / 17.5f;
+            //if (percentage >= 0.05f)
+            //    p.AddAdaptiveTriggerToPacket(controllerIndex, Trigger.Left, TriggerMode.FEEDBACK, [1, (int)(config.BrakeSlip.FeedbackStrength * percentage)]);
+
+            int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
+            freq.ClipMin(config.BrakeSlip.MinFrequency);
+            ds5w_set_trigger_effect_vibration(1, 0, config.BrakeSlip.Amplitude, freq);
+        }
+        else
+        {
+            ds5w_set_trigger_effect_off(1);
+        }
+    }
+
+    public static void HandleAcceleration(DualSenseConfiguration config)
+    {
+        if (SimDataProvider.LocalCar.Inputs.Throttle <= config.ThrottleSlip.ThrottleThreshold / 100f)
+            return;
+        float[] slipRatios = SimDataProvider.LocalCar.Tyres.SlipRatio;
+        if (slipRatios.Length != 4)
+            return;
+
+        float slipRatioFront = Math.Max(slipRatios[0], slipRatios[1]);
+        float slipRatioRear = Math.Max(slipRatios[2], slipRatios[3]);
+
+        if (slipRatioFront > config.ThrottleSlip.FrontSlipThreshold || slipRatioRear > config.ThrottleSlip.RearSlipThreshold)
+        {
+            float frontslipCoefecient = slipRatioFront * 3f;
+            frontslipCoefecient.ClipMax(5);
+            float rearSlipCoefecient = slipRatioFront * 5f;
+            rearSlipCoefecient.ClipMax(7.5f);
+
+            float magicValue = frontslipCoefecient + rearSlipCoefecient;
+            float percentage = magicValue * 1.0f / 12.5f;
+            //if (percentage >= 0.05f)
+            //    p.AddAdaptiveTriggerToPacket(controllerIndex, Trigger.Right, TriggerMode.FEEDBACK, [1, (int)(config.ThrottleSlip.FeedbackStrength * percentage)]);
+
+            int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
+            freq.ClipMin(config.ThrottleSlip.MinFrequency);
+            ds5w_set_trigger_effect_vibration(0, 0, config.ThrottleSlip.Amplitude, freq);
+        }
+        else
+        {
+            ds5w_set_trigger_effect_off(0);
+        }
+    }
+}

From 7f69c46f849fbf1722dc99dccda4ea53a2acf515 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 22:19:19 +0100
Subject: [PATCH 02/18] embed ds5w_x64.dll

- will require version checking to auto-update the extracted file
- auto extracts the embedded dll at first usage
---
 .../Driving/DualSense/DualSenseOverlay.cs     |  29 ++++++++++++++++++
 .../Overlays/Driving/DualSense/Resources.cs   |  23 ++++++--------
 .../Overlays/Driving/DualSense/ds5w_x64.dll   | Bin 0 -> 19968 bytes
 .../Race Element.HUD.Common.csproj            |   9 ++++--
 4 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 Race Element.HUD.Common/Overlays/Driving/DualSense/ds5w_x64.dll

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
index 4c806616c..df3f5e486 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
@@ -2,6 +2,7 @@
 using RaceElement.HUD.Overlay.Internal;
 using System.Diagnostics;
 using System.Drawing;
+using System.Reflection;
 using System.Text;
 
 using static RaceElement.HUD.Common.Overlays.Driving.DualSense.Resources;
@@ -30,6 +31,9 @@ public DualSenseOverlay(Rectangle rectangle) : base(rectangle, "DualSense")
     public sealed override void BeforeStart()
     {
         if (IsPreviewing) return;
+
+        ExtractDs5ApiDll();
+
         ds5w_init();
         _DualSenseJob = new DualSenseJob(this) { IntervalMillis = 1000 / 200 };
         _DualSenseJob.Run();
@@ -42,6 +46,31 @@ public sealed override void BeforeStop()
         ds5w_shutdown();
     }
 
+    /// <summary>
+    /// Extracts the embbed dll in this namespace folder, to the executing assembly folder.
+    /// only extracts if it does not exists. Does not check for version!!!
+    /// </summary>
+    private static void ExtractDs5ApiDll()
+    {
+        string dllPath = Path.Combine(AppContext.BaseDirectory, Path.GetFileName("ds5w_x64.dll"));
+        FileInfo dllFile = new FileInfo(dllPath);
+        if (dllFile.Exists) return;
+
+        string resourceName = "RaceElement.HUD.Common.Overlays.Driving.DualSense.ds5w_x64.dll";
+        var assembly = Assembly.GetExecutingAssembly();
+        using (var stream = assembly.GetManifestResourceStream(resourceName))
+        {
+            if (stream == null)
+                throw new FileNotFoundException($"Could not find resource: {resourceName}");
+
+            dllFile.Create();
+            using (var fileStream = dllFile.Open(FileMode.Create, FileAccess.Write))
+            {
+                stream.CopyTo(fileStream);
+            }
+        }
+    }
+
     public sealed override bool ShouldRender() => DefaultShouldRender() && !IsPreviewing;
 
     public sealed override void Render(Graphics g) { }
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs
index f56a188ae..7cc8ef70b 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs	
@@ -1,11 +1,8 @@
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text.Json;
-using System.Text.Json.Serialization;
+using System.Runtime.InteropServices;
 
 namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 
-internal static class Resources
+internal static partial class Resources
 {
     /*
         DS5W_CAPI int ds5w_init(void);
@@ -13,15 +10,15 @@ internal static class Resources
         DS5W_CAPI int ds5w_set_trigger_effect_off(int left);
         DS5W_CAPI int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
     */
-    [DllImport("ds5w_x64.dll", SetLastError = true)]
-    public static extern int ds5w_init();
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial int ds5w_init();
 
-    [DllImport("ds5w_x64.dll", SetLastError = true)]
-    public static extern void ds5w_shutdown();
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial void ds5w_shutdown();
 
-    [DllImport("ds5w_x64.dll", SetLastError = true)]
-    public static extern int ds5w_set_trigger_effect_off(int left);
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial int ds5w_set_trigger_effect_off(int left);
 
-    [DllImport("ds5w_x64.dll", SetLastError = true)]
-    public static extern int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
 }
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/ds5w_x64.dll b/Race Element.HUD.Common/Overlays/Driving/DualSense/ds5w_x64.dll
new file mode 100644
index 0000000000000000000000000000000000000000..fb56309a0d2ebb059fec63be5eb2e907cf85c96c
GIT binary patch
literal 19968
zcmeHv3wTpiw*O9>wCRf!Xs{}1z!a+3TAG68(IJPXaEhrE+5+-QOPiKpo7OxiFfax~
zrQsN5#>X(%(Lo)R86Sg!P(U%INLxfH1?8nu8Ak*4jujaMN6G!Ib52Tuaqj<{@6P}K
z|L)A;+h?u4_F8MNz4qGAoKi4n9gAd)DUm`U#+m@>F^ccM|4LLa*6-#W{n(b6_l7np
z%<l~?USxCX>KwIIj<OnEd70f_>(VW>>Ktyn&Suw{rWNUGYAdYi2??=!S@pg@EFSRi
z`${gH)@=PH*NFUYc$M)X5k?!=ijWx}6rsZC1$<|#%IE`p_<a?(6EK!fFp^v>uQWa)
z!oP9^AAbK)5ytXSB7KIfd=b_4V=XJpW31xADE88ek5z?vde|^sTtvUy*f3CLNYuJp
z024*r12;%`1Y=Pm=`v&i5XiZBB3LO{C8035HZM^Ur!lq%9dj7<Z6IO1l2w4~0I9>m
z&nCuh2OgNhSY4R*H=t)S`cyPjE;K@A-~3fF=`QP17ig(EyvSr~yW9?7;-h1%G~H2A
z<|<=s@%11Xk#0a5j@0Kdq9k2nV;4rEpcDzd68Qnbj}gsCuag+XHlnR!os+^G5(J+y
z-QjeUBP;r30}ygN+SvCoihS1US}>B27<?txYo^TQ$H>@KHC!(H-;QavD$K$@rH5;}
zA5CqHFbfAcA#fX~Xq=?bY~>=9p2kTLrrWqkQ{$va5R{FRlmM#6Nh;0O>Cv83JzV4T
zC{WZ~BNq)A1E>a!_I7E!7ozKpX20r}Uxh;adQN!Av$Q{B`H^j*Pd)q8-9tV5BDx2A
z_9?or^XyZ05Af`Z>`w6Pi|JN-_QiKcdiF(;Zcdn_;e1>yr`a}XU?s4AplAUTiE=$r
zk~m?iPH1ipCLuGJ5OqpO!x(bOl#BL!djI(jt}%b8UIFuTVAqG)Q?Fnb$-V4pBKz&A
zZzNP@0A>JYahk1@MvFyb3B6UXfzojz8VD+Zk0<;#kvu^}C2|hoSt!qLS+^8p>ItMZ
zNKYcIM0yD60i>TJ?Ux_k`=#0}?AC1U?>(c^tkz@5de02jtgaCerDk;y-RAvHp=pQ#
z#e_alaGvjCG;214j&6vUpw_H;5jgJ~tY00_tll8f?}=P}LbLiY;FsDAo%(2#X4^i_
z`(3Q_R;W0d>yMwIx!HqK#tAKzd776F9_r#kyZQCr=14xS!+Y_j6`%9M?z~1`!Nb{H
zqfv=0&_tjr2~7qXC84@XuK6^$3M2XEGpStT>=<4ctVdqW?PbHEB?7$B++JfW<Gp*-
zEmUd<piGtTGb+%-#u$+<HP1ik(gaoghf?F}-{;2dUeb<|{7BAoQC+_)Z*{vn>2FDE
zwzffK$`1I6ajiyiGCOq2q<N{c5?M8fjfINJ<}+&UQajKH*cEx%rarEn9SViQt~CQ+
z9dJEzl^chJ-S|)OpXj%tVZV{}G3a3O+<x9SPp_VZsL^S*MexGKN}qxkjw9|O8@UL8
zh(->>cv2JwDNLNCHZ^i15te~?9p~vf=~*6wpb3D`rZKfOP8+#*%J4|f@@S@cEO05%
zIOSG|#5PX34Ir*@%IyI0jZ@M95*nwZpN~+w5_tctSl)lvfMD(qq0sqAwMfx|(l0m)
z6keF8&w!;mON$iXur!r>P0?!7XHdAA{Xljg{u%F2D4fYyaAySKdj(2e6L`P&hv{O;
z7%C~ll;03=rx*fzRmVYBXl4a`s&|2D`m448RQgoS#P8jc+R}u63W->FWcAk1dvcxx
z8*?oq=NSzr__0HtDnfp`A;9~K^*SGHf;p>1l_q@_>e2K!>2*z^ZyDQb(x<B`!J-3}
zslsc7A~=ZpLr9nfEg|joSn_z^kg3Qt4k^I9(l=x@bTtl1A?x4~BMjpuhj?-{WQ#jW
zG`OXqy@}#<2cnZaa;Xr~n!Mfc#HWP%RQmyVzv>79sbB|CjGWWIfXx2=o}9Olzgiy`
zR`?1ED>(?7{n|$e_o<cxKw|?yJ_;}<P@5Gw3{_L3F~WplaeB0<94`Dulc-9~VC);s
zJ#9!G-)L@c20YrR0Jgi4BhZ4-<Ar9if#6TMa0l@xn)IpQgob+#BlVU3NRk%yT%|#?
z6=Ibddz)tKZq3|wV1aKm3lg4(O3hrL_n`LM1C0ubX)5eX<cQjQ4Yk)ciU`<c)~7=G
z)olNuMq|m$SzIw!!p-Dn@vFY1Ei>=0MvwcRN+w)TE$0CY@9@5c06Hqq5Hd9uFtaZ&
zIbXQoD^Ux_d0#<dL#Hd2Z)oQ<rjx$;YHs@gDIT6qCy9WeGo&4OD@KnH<o!It{NfLq
zHL6G&PI;v!-^zGHXKP-mj%0+kJmCvY_%@_Ho=U?<v-)=!VEoP=8XuU}cz>P|63RS7
zJ5NE4)q5-|Y0Wc=;{KA-eBnJ#2!*u2m*pozzOqtt^J=JvCV!sJ>|3Ev4J&|o(5K`5
zB}Pbwv_FNIkf+O0Lrk+~7FF)&6Z3^5{P;FrGvy%P(5YFSLF856(dMr{o%c`D@Z)#a
zNAf}o@9pXd@`F%1vWxfA$Z5bjrT}|u<o^APbzjE|`$F28sDu}e@(lr3Y%BZtW8}Oo
zi6ZX@@Oo>cS~Ru9Xc7u^W}!v280Hbwg|tUTz;!?|>hDsT<kswfNC5Mc4t`}^6TL&)
z(ZnfSxa{@MCB+$VbV&P~;f&Fm+XiCgs+C!0m1diJjHZDOS*tF69*;RDe$}P33GhV2
zZ$U%fkGHCwqdhBW;r$+Sr!AC7u83Tj*sbP;yhL7@aDi_Kxdxd1xyl_%F@g?+w0mI&
zJe-;@Aj65Zx{7$AAeHw&?t$WvRu5thWBr+X6v^MN+15ZER_VQ9bjR#nL%qSe6Og^z
z9V=xOTxgGPTRc?{MIr6k6m;B5rC7yeXbZK%J3Xt$l6QS8mF}pJ_6v~301^%$ZWP#a
zi!lVtC~895dMfV?HSTTHNg>$Kij_fd$A|V(yb2%s-0>oNHrT0n5f#rz`&VL2K#h^q
zpb?QK-w1B}M>ht%T@l?kiA5<W5@*creqvrrdFm=&@COJO-V5gA7{v?H@bf?40V-$V
z7I5>qd6ot9<z-1)9Pl<4(Xd@FYET_8k%m3IZ?)bdQoiGbV;Gj2)v?qQ6uAmQS_9%(
zx|!HRflBWLj=9ex7&WU;k(lpgeE?7#AzSq8fQqqYI4?yN?{n!hkW$0J7Sg`2hZqKT
zsEzktz}TjZ+uk+((Kpz=w`jI{ssF;^(6~m78Q&j>h;fR3^Sn(Yh2W*`^sUKOVnvw7
zH5o~bNsk>HmN_F&zD+_+s{`9<d}vHx3wwD%GL{!4OL^fTy$6N7VSkW@C%<YBIma@$
z#SrN3Y>Ecn{caOH%(@Sg6MOd~MgtcAWBl0dWR+`bpQSatoYEqiC9bLA<usj^)9{+Q
zTMTwVYScTokRNwa#@M)%98u{TPfKYbmQrJQb0PL0b{J^dF}YK&=nr?CXeo)1{qmHR
zA@&B0NtOEJayLw&TIC70eh}{y-Hz>tSL_K%jpzai4YxmWCTzfra5fw*ACUtoS`Gp6
zY$s{vPLw3k1|H%W3$P3JQTuqzKgN)D?l78l-~(9j=m5}7*<R|@rcoea1rKmdcLQsT
z5POvuL`RuGH-yA?i4)rrD8ZHqw#a^534-iLv3l8=yns5%ow6yOonrj(eqkW0<b@B7
zn#WrC$OFN*zNS4Ln9-k?*+n$$TC{{5AwLukx)RABXTtti8y-EYfL!a3+2oJ;EuQU?
z5f~aqatdz-R_Ko1bqj1V346P5T(zAdo90s~wp~$N6ZR&UOM48R{HkVhTW|~xhQ00C
zDYfSVO~ZqtXN4rN?DZ1ksJ+n<!B@_OLQVN;$IqDk38T>aToXnUmb>2dPP27Zi1*)*
zt#uo3I7nw9gYxGfUb=#i?+q&4hlRFA?>uP6S*TH%4@78dKAqScOm6gAkZTkc;N7j^
zg#(fW5y5m+FZY$)>tb)BvE%?<Nc)P8)*rZm$IEy{*FKA)AL&}2I!N{^^&T(vUM~fO
zy}ftMj7S}Mx&8e3gzXb4dimz&#L91*Lm{`Kg>P<8JpEuK?LTRMkIl<i?-_+Fm0p8z
zSaropflM3opgjtWRs|;lV9$oGPHo8-ItZRdPq6|_n~yh(S#iTe=Np<K6GabjG_-UW
zT4v#ELwoQOC<!mPK`UmVwMQE<zZthFyg6JRv}qdN!Mjy83K<$p!A)So`E6S8C2ZM)
zXAnNY{vct?+o>av&;k(bhmeAEZw(em>^hW-{`Dt3O65T;<*llZO!Bo>W@zoZ!PhYt
z8drzh6N49k(Qd?>&0KnH41yuiOjoj5*t-K=&hmx#c_Gp)B-{jLT<Bm(^_QPuWRrp2
z5mMh^$h!2|VrRh@I&MMBcA9I0FXO!qJ<>bRW*FCA6jX0Oz9Ddbf+S4miwsLksLiMP
zH41`vp_!s*bl#lX$Y{4AXhF+@-=WWfA7k?OrVId`p&8w<)zE2NdmyMnRk$1w{VKF{
zzaSYfk_=e4pBJz!&c@cynCvS=-|%Yed#Q7<>+2D|L-#avx;109gHiwe(T2e3KS8~J
zQpkHjQE$X9__3SeBe+=QpRMRtV;w?XIEv2Bpbg%uV1~1VBk)x4ceEWiiupN%R@6uP
z7Dd5+smL2rxW_<WCd3S#Bz6X#<{Qo<n1Tl`(XdkKq&i*w!aO1EQ#ZkHA(zS<igZut
zt?|x2HM&wD`8n8ntxXK`g|rJmm#prNGMpgmv1P?rTZ#@aatkb&)O+JsJfvffj}5-?
zH3o%S6?_ssZWdaFLp%ipq@_+re_KvJ37gT+#v&=;j~Uvr-x^GT^)B`YKtkFsG26By
zM#*R#>E`mGlzBw+nK5R(UuJK=4$cZ`*MWwearAbIz4vZKkdMLEF!(#<c)^4y^QnfQ
zn|PeXvw3d-!%g)H7|`x0BKuVJ6C_Sd!>XU6q*XN?6sopWbr&!S+*VbIj5Udy?Rx_>
znhHp=RY@Cmc9||DxW|)Xvr-o(;?^QzLzoD`6+>WQ2tHVcmSwlV4>QSu2%Tdg?ISmm
zJ)18;Db0@o+Rl{1hav4sDnVPv^4<!4HY_mf7x4m0%|aWwB?Em&#5&5P(wPU#Q%Ji6
zVxd-VC}PEH)N_^vb7>8u!sHTO_!1SPYgB=8P`)$s*^_C%q9gwJ7PpJ{S`$%AL1IWd
zNi+&uc3)mkNW1?AL`HxgMR<pV`wNn#d>iHSk|EZ^H+SiH18_rL4{vDZw~ME;5VYTd
zjNx)syvEcF@8^&Sh?GM9+YV&yloc0Cn3zgImB@Q@?i>uq(Ej`gD!M%L?uT0wj1UN=
zY()Xu=TG=yB4elfp~G+kpg>tmFND6}7qEu+s`bIoB_slMrQ*(s%64KNfTM?6c|n;%
zi!Lwl>TVTIbuQe-_3)b46562L{pU<+j^Cu{{+4`7viD1}(ZOdiF?C-btU?~s<ZmUi
zGBeN}9efIzO$xC>lEGx3hA_iq|G1<ttm_f*tq!<JXh84*DH9!B2BiDTKJsE6!G)KV
z%KeLAuco!drB9Xz=tY{qFh)-Yk76pslrqTsSB1O3IA`#}d%VyZ(pJKM6jrkZGcCp9
z$gRfUp+y-cWB7JLR&48|q7qjkoZUvFiPpLIKnot1w5x*eh^%m|+|IY;{OK(sg7viB
z9lckz3et*T9nIKJqCjqQQt)9Z69W%<fp(vfTOFP|JUKihnQ+Wq<-Mq=UmR3`3q6<G
zaKf#JRhcLajuvT%9)H3(%BM&?>F}zdQd6r^QG>m0p>H(zs}x{B?8O35mLReN0rsjs
z#_XUF4baVP*^VU!YYbjuzhn7pZYr3A?bKM6`v^7;OZoDIjX>zWi9qDORb%P*IJc!K
z4iiS@ST5OJY#zB=vu%13@7<luM;_E{<Dz(fyvOX1-^crs^!eitx{`&d@#gW(j#y!m
zI<nb3KH$LQw>!1_B=&$<geWqSyvy}$C1J6M!zjQAF)Wi?r1^F2v0yhs(a;IM#H~Kz
zj^@{BV`&PcSykro<b*Jpv9-rs%GI6j_~0P44(p``AlzVzDZk3M5aY<35(9aRCz}6D
zc>l|K<6qIlRbK|cFC3F+=JUAOK$S}2-S=+Yj-F+~Js4@Q8&d<<)B%%%^>|S>r2Q3L
zg9uLr!G>f0QKAd)V)hGZ*H8)cObE|<{w}dpWV$@_VQ~9{R6ui|IQsz6(ZaGsRNc@f
z)<q%hYoKb#5Ru3=i6>%lZD?pDJG)>lFGvztnoDtLD%4^F1XxVVK}b6lI)$T{VzI11
zp$Q|yk4X*)AJPt?3Na5GL)r+S7-b0<WiGX!j|?`8tM#w-9q<&6o8++hk{`tp%KL{z
z4<+dw2GBhKJ1J^Arn?SO>TOZ;<4-zHOQVv;;+3)|bfWBGfWESi{fO*t1TXcWG)0uq
z9!Fdc5^)RHu6foZG@FD@Zq-?v-I~v>>an}5)h6Lx6AmEl;>@dgHZQIND+0Ib>nT>d
z+c*DQUfe-n!3E)>ujG68T;7{-Fbm#F>6wVTxK`D6WS9q6H-RVxbEW2#Mny2!(40B~
zH>fsU{2m)9UA>;)uE3&8e&#jLH9M0`g6g?(*h+fa6egc)J<#rG&>jJT!yqSoohKa3
z6OM7-OVKN=oS%y(+hLV(76!py7zA@PJN_8sjDwO0C@F$0Hft-c7te`){yS=HCuATY
zu{Y^aziE8Wih+_RPV_Cra`~x&v7MMl&?jA&T2&t+OBT1PI)KrJ0JFwhKs7tQNOIl?
zrmtF6uU#&B7N~E?Mv37@jdvu3QIVp9Z$72Nk5as^L<iBq8t-}1g*(P!E#q1=V&Dp@
zI>^1=<!w{9s^$ZwvE@_E1;(9k*16_;+jOle6S4>{6ifoP9b6qS`!?XFTiRjI4=`{r
z<;J(WGsOyakK64Y3Z5uXy$Nx68^L$NH{^#*u{nPR=#B=%pMYp~e14rXp4aT?Nrs|B
zpm3TUrv^Hw_Np>+!n^pvh{vfgCB&4>`)RaK^<g$tt!ht&xA<=l^0y@XO4Ob33jlP;
zk~rS`>D#<7;Q?8p)|o^KQBT)EXAHpTDwM#8dHQTR4oFK<B6g#6v=f68&=44_Dg_^w
z)4s>`{h^dI11KIp65pST@9cp@xlMcz7T;0gTYU|k`1kMMq-cSDX`fIaa99@i<qHRc
zI8*iAjnMj(CnV$7D$e`I3ud96JI|E(IodUl6O8JD@<QdeN6nE3`SLdNEeG?<Tc!$0
ziM)`Th;0Ud`n*XIsd2^O_W?yDE{V;NZDs?iX`g%g9^6r2Chq(6Ilp?pOf+NRFw?wT
zU^rpM)-l;UvZFvV>5$bd3{FXel?CGuIR{m8t4^_=0{@c?cjesPNTRxX%mQTLS}ZYp
z5?ewk`}<RiuYNAq7wWpYjPiZTQ*MCIjC4by<ApP83lLCybn{PFTtp-KkafWspwMPm
zhi>dGkeFM(4Krh#idz<ifawZzybnKS;UZ%Z8ekUk>Vy*Pg$qi9O0bhA+_8`*QNqx^
zDjQ=Vpn0rWXa*f#`1kX_&;vKklo}N;!|zL^{AV)UC&MNghFx%GwuG&f;b9r>kl}Z;
zr1E}peuAu@mtnCC7s~KynJ+cWFGF^Zq-VCAUm`=ZOdlh|8)O)^&o0|LQ-;|xd{BnT
zG7R%SA=~jY8E%zf=~a3^m+7C#Ff9L&+}^=593#V68GbMG_sGyC(`U;ttf%uTy%{5!
zhgQijth+<Xue%C{<?oj1;r#y;+)ygjYb=vsSg&+Gz5EW-!_fa#MCXksRnI^3aQuWj
zcg5ZH*vQ%sB5qvtY}3@T@#)Je&2Lv7`{>qLpS<*F)R9cpn2x*`p4)OF<I&A8uid?4
z^x(5^O*$QV<G}p~UT=Em>77H1UVU?B&-kNlm2oHE{%FpJ!>2AjIQ>Muy}4kDZR@v#
zO7AEeUNw97=E%LpUgc|l?o3EsdMehEccA+8q0qfg+g@E59eUbYH!n`{=Y8X&epR<v
z!#<y*uCJf6?Tb(AH?5mHe0$7$gLeJQ?mgahVe`kooOJ4Nzr&q}mJL05;@q~cKJq5)
z`rw8qAMUKlzH#d}ua10eb<*;tArDM_d-1?o?7N1lX#d19{gQqc6;mGjXw475es1yF
z;b+SSZrWW@G33=xek(kE?9iwK9aCQn9m!EH-u&Dz=4?5f8uwPguJJp@-7#GC`|X1w
zK8~CcXL`Io-Z19WqE|L_)*ipXTbcXN=CZ71yKLLPdf5Jc$;ql&Enk)DN|!5lou3-n
zZoV<L@c77t5qFJwecQ)TZv?7ly?M{qRXfvXoISZ|&+enGKYR4xg5Yx>-ul7An|_nK
zYg_Q*SG(@3J-Iz<|J0Ay&sl!_tFDoUmMppPu;PoTdw+i4nCj2pt+L)ff7U|vrQK0a
zEIO<BwDURjQq!Xv&1+9bKQQ7|_LrwZG1YMg`rWv3&f<ojEUr1bdVIyb1LDdDdk1~=
zkaqZqzy6`VbK%%2A87xh^EDy<)Yk8}ZhqUU^EM55rFzH2@$=r|S0!vYcwNrs7q)CX
zl09sF$F%kB$3E<L@snqM^I6%bn8THmH#gLtOnGC`#s_urV-geNxZiUTM<?8;`a}DQ
zgkctQY{{R7MDBN{DR*`>m8MK?teWxtG5foVPut%7>$wkaui0~O?vclj?&h99`NpY?
zog-cB&3W%nf8(9mWv{<(H6K=fv*M7G?(k0z`S__7joTy7H0^Q~p5FGKdyj4Uk6C*(
zvCZeyD}VaD;<NvJJnGTA*}{aQ8P??s%c}o)Zu-5CDdv@5|I6wMds<G-w>uLSdy?1p
zyXoPLF}AFWtmoPG=rxAJP1imD+1sTzzp?eAui>?aZ%h0j@l9Q4Rn&baF0JD}^5vve
z=D#$g>?i%ri(Xu_qP9bSI_~b*kHwEwH>x%~-4t;|^ZZ*=e)af{j9d0>{@okrwtO<E
zti$M;e&o(^?2}ht&Nz1Lo}7cl2NFKK#Xaxjjz3l(eb0FD&7u$6cj~Lxzy8*D8{gP>
z?;EjmerQNYn{rsW<=|(LEsp!D=6}YO-nJmowz*Ab-}9FQwWB;oqdHa{_3LT#6y0C8
zTiweqE{q6ly!XkO>#M(PZ8)@I`WuJix<C8)7b_1R|I;VjuAlPvZI3^z+w^!v;<i&i
zAM$o>bXrsLTPt2$HPXEGeB-gsMK_)P;O5^pee_^v<B6}Id%U7-^z-F|9yz!8k?Z%=
zT-Y%^rt<c(e*K@wh^BL4==GAD3TnST(7*9r)*o9VTnycx8=e~o8fkL-XFT$Jb+zgZ
zoHT!JlHt|m;*sPU;y;hz;jf%e!!>P`?Q4=@K!$BH?2sYxhrd;(Gt?5K&v+z!v_Vg}
z3_nn?B&2!yNcdQWo^Tm$#Aide4rN$h#3x+VPs;w&-pSA$>525Lhs|`>-494K4Gxn6
z(gvjI!x^hW8gVN=FTM>|<VgE&XY44_*fd;yA$@>Us>6mAjj2G}AA*i2(3W2S&L}b!
zJ+UD!lsoA6M*mlVn+*n`jKVH&+`L?Tjy})iE~_rG+MU+4SvGq`ZM`$Crp#uaH?wHe
zSW8iDwcBN@wa;4!N-v|#H*bcu+FItcnyRbQmX67qSK%C8Zvldjm={7nJ-7rG6P<gt
zNK<l)&GbEWDSmqpzp>WW*g<BcuyqVzn5NIj=(S&>EyZAgKVW#ejlPlAk0v?9Gs`Bq
zjEwTiD)<C>HRW?>;5srFImWuKq|G5(@CsVK$k%fvP2{_91+7rzqpzhe*HI|)sjr|F
zi+qWo(eX*LrC8+CfmRA<gufd{{Id$;5x*nXFR86|)lgoH;fP-P^5x4b7NU8q?Jl`)
zhpSwl&x!SPTtS;7)^oHktytpgx`HP01wl*2Z9w``>AUmrclYU5DNo<uQ!L3o&jiX!
zi=-HpX$GP#1+7otP$)CnW6n_a%2M}2Sp0;arAzABI^-9P1kXaJlZwON_lLiOXB(gw
zWbu1<eFpv5&o+Rtl=RX!@cInVCZhknM}cpJl<?<Jyp*tR1196sNYwtJ5WF%E#;bS~
zu}T)36~$sRqv}Lm=tmJg0C`meQ)M9{5a0<&6U>s%zWM7j;`46K8p)D#2P%fK_@3A<
zbw^Y{Sr=IvQCLlLm4dPB2cr(fKo(gSkwG*M$U_Gz*}#ecOkJGJbQnxdq=#hvSLWdm
z@Ug4-B)el-tOIuA)-1{qks;AySnQ0bQqgvonw8@BrDu`OiMrALYiQ`YK0K0+IMPu#
zR1?KCpP>#{3{zF8S=~*zYeLE{AU}|<n5$@*XZ!G=nc}k3U#n(X@M<ffnHIj*X7=yW
z!4J^Df;z@#p`&O{qh|;3clzYTwq-^X_80p}O?K6hEWE-(;JaxUW3R}v=aA1tey^M#
z4}5Z;a>`HXQyz0e6uTiy!)|a4>Po5`SW0>o&`TeW%(;cJ<IqD;v|&a>p@RH@HfYcW
zO=eu30-vVGEJV3l$<z+9&og9uGZYC*mXH<865z)eic#nc>%Tu0KPqC*Pt1^@B0|9;
z3ZW-S&642fq~d6nggTNk6YCUO6@0dXX%$T@ig?JE;L&Emmjn8B#n;7w3Oc>;5ES)6
zH$7r3BYfzg(+t5q(<Hurz$s-TUx&1j;2=!LNSlxnuS0B5!tZPpBNUhPTP*dlCkaCu
zW1<U*#=}9#l6`j~Ekb$*=>!se^;?J3fs{Ohv7aI}AU%WBf<%@?ut@Z$ibb(#%)f|V
z7RTaQ0_$CNDypm5#PZteT8CwZA#;i$bCMyGGh|vOo2PNbMpMz~Sw`bM+(fR#l1og+
zQN{v1#yQsr{e6i(0@+itCuMWlmXchaoAEbm$is8BfW&V3`=&uoG!3`pH74s4Te;QQ
zr-E5o7HW@WhSlYE*k_hiyRAlJVIDU-AFq7N-Be|z!)lczb8B%Cztq($KO0OXmMhCf
z8A+zf>XOL$_Byw#$W`XD_DW6UeyrAObx9QzjqamHs=#Kq$u(SU)PJu&53b0!SJtBA
zezXA&Yk95RZY`H9`G<@rM>xZdnC5o<k9eZ59?=zI*pfS>07iutm%~<7Wp!Arm6d3L
zrM9y2N6VJj7COpkXC`wja=Wl~v(rc^ET*^g{JsQxBBQiEhiO?efq}LOYj*gl11%dg
zPaoL;Xlf1#I>OHrxUX3U+QvS7O`v6f7U)Ae3K|dEk3IjscauEx|LeV5j-m)NOP$GP
zvN~Ok+GXKMp|aL&bGq=;O}L!KWVp~}bySvNo?_F(rBke~-0Cu?6C6%NgE36+D^*#`
zs>5{fU!}}sb(Ptw5luyT#U+JYVSYNz@>mCWTZPF2{>j!dOo3Lc4<cnUCcQ$3wXV$J
zv{snJzs-#A<-M|C5YY=sM{Zf2xciheRJ)yvrn{|fD^{FvEu0HubD`UX#xXwMlx{Mc
z*?Q#+Ygxr)TeX$3yP{?}Y%Z&qInHt&FiOnKVvn)h>RP9jFSA#G@vgiXcjuW6nNlm%
z%woy4IP0wCwn|&MWs%6^U@Qf6r>nx^T2^PZ*f8T+Dx_|(REysK39GTzV8UQ*X6}rV
zyNmM+@<wH4NIIWk_2tg;x@8tvn#^boz|NA@lvRs=2Rep9pUs7ys$q9t#w}Jhky)J9
zMV3liH3}`{<YZ>STv}<Xf_p9YGKZtK-cshMT7uslB}rRZwQYHCk=4G$=BTyTSnaSY
z>k5uqyLG7z(_7g>^3^bAu`aci!<m*V3I?G*;$y6=&X!i=Osluq)5;yLG(@1yUX@lo
zDs5Dn+{&vs7Fo;c{$4r$0^4P)vG!&8i*kmm8XZr;BQHhl2cns4YwvZ}O?KPMX?o4G
zyBy09Zz`0`v^iWjE0@?|SOsIBt4i!rmsR8~Ew|PYI|2aiW9+vojGrGZ&Wxa-b2}XH
zRiUF6L&nMWsEW}kHah|*Okx`&^PO_0)*%NvV%SM8u2UjL9m@(a=4u@^W%hEk0<A>l
zhHJIwSFk(#P>UBKKr29Gv5~N(XqnSxttp0sI44CgVJu5wvN@^4BxW<MH;!ewh$AOk
z8<~$FlDfZ$CIlYp*alc@vMzMf5*D^{0!1pK@yFJI|JU^J*K7Z%9q-N8bygmh?*B<g
z_?G|$@CZ>U-4uwAm?e7O$GyI9?%(+TZ4dN4_tSmAx&e&!;7)+x<48)JhY7xdlmwjM
zfq@de18{i~?oU9cbIw_$EZ}|5{d6DjAd(4mf&$WP;B;Q<k8{!@;C;{WbiU8P*=Yml
z1g9c30Vi03)CQa&eb-8KI&&RC>H<z@u6a0reM$5_XLUN)564-I;XF>T1SttPK`T-!
z@V@79I=dgl{hSGOf(jk<0Vg<6#tGhn<O1CYxBv-%w<q2~ZURnzAh>rZ?khlV1LTL{
zd<UE${r?gAyCwJv@M7Sb06#-o3Y_3JJ+3r>(}y*;rZ83w{C2>jNFLw>|B6I)rQ&`x
z7m08a;7S?y0B(_Sg6%TCAMl)v6O0)l$;Ja#BW;0xg1?sO1UJbz!80=cC15?y>16X#
zz(kza9|BG=3yJ6i=gW8<U=!|d+dwCH4vFH2Ab#T%aa<FzOKE5yc<3I;heYjq2=EJ}
z@9$=e-N6`s>tt#=ivv24dO*kTqT(IN1>kg7LU$f*@Hs)c?;xBY-B}P$knR`E;3r6b
z%lb0u|Cf9s#QRzu!i(<Uaj)#T(hbr#X1K1nhE9|FqQ60pR$fB{C+>qlUk7Z%2J}4%
z%g_4f5W9UAiE|NID4EHMm<8`V{P!zGET2tdcO##V_hjJoyrul=66p<#hT%l9l=jO?
zc|DQ|0L7?R0evp!U^ZrFRnTT*)yxXbc2>!1!IL5KWZ;J@>0cIGNIzn+3Ahnbuw3xe
zusT)-{$;SH3^}V<ftk5+uU!v)RZIuH-?MV~#|iE9-;`(|8?MU)2`5U)hC0|{gHF4s
z!vq~=kSGF&9XwVx8oD@E2>a;Cz%9^aJu^}60M}*t43^GDArT~-O>6-8sckNi*Dh+m
zY;^^sN5f_dTZ-QzvM|I5%Lbl~wp5F@&trq3!wmT<QJOqZhqjaTRcN6L_566-bu1N=
za6T(WJIs(MhaRbAm=-`G`=-gds7I*vVLwq$^6vkMos;mVt_pa{0sAW8$8uP9xuxWb
zt9?5Q_TVxB{PpkyJz1iEuhen1m#_6P#nepL>gcunax`JiM;s#ZP)adF@lbX}pJSFK
z1~y^h(wb`B605_BO?A$QQRx{YbXI$LZ3PYjIU`DnC#PkP&^cW=FqKu~5Ro%tnbkRB
z;!hG{C*ZVctyx&TOa}#aXU+&*kBxJdFS6E@;dd=txue!uTj@$GudNwZ=B!CyGHQel
zn`c`k&Q~-0)&^BN-2|7z?R3$VldNsnf1}MXOq7G969*ie2$#uuP#o6#+^EG`QRuKO
z!7jVX>g+A-Tbw7JjnHhfb&0iFS55Dn5oOMN`;yvwt&R~ow~Z^OBSX%J%Cc&wb%gGY
zUOf};`0-jM+;N3X6Yl739K<Kw5%wE0)B*o0k5T%+kv2TD@tIA}G(8h|rsJ8^XEUBX
g`a;hO7hdqZxc<crFK&Es(~C_n{;N3TU#p$}1&3%GzyJUM

literal 0
HcmV?d00001

diff --git a/Race Element.HUD.Common/Race Element.HUD.Common.csproj b/Race Element.HUD.Common/Race Element.HUD.Common.csproj
index 10cc9a7e1..8d4bed244 100644
--- a/Race Element.HUD.Common/Race Element.HUD.Common.csproj	
+++ b/Race Element.HUD.Common/Race Element.HUD.Common.csproj	
@@ -24,6 +24,12 @@
         <IsTrimmable>True</IsTrimmable>
         <IsAotCompatible>True</IsAotCompatible>
     </PropertyGroup>
+    <ItemGroup>
+        <None Remove="Overlays\Driving\DualSense\ds5w_x64.dll" />
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Overlays\Driving\DualSense\ds5w_x64.dll" />
+    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="EdCanHack.Unglide" Version="2.0.0" />
@@ -36,7 +42,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Overlays\System\" />
+        <Folder Include="Overlays\System\" />
     </ItemGroup>
-
 </Project>

From 1615691f7e5b5b83b5ce6467f2fa2ba965d71a54 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 22:22:42 +0100
Subject: [PATCH 03/18] Update DualSenseJob.cs

disable effects after cancelling the dualsense job
---
 .../Overlays/Driving/DualSense/DualSenseJob.cs                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs
index 1240795af..1a016b10b 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
@@ -15,5 +15,7 @@ public sealed override void RunAction()
     }
     public override void AfterCancel()
     {
+        ds5w_set_trigger_effect_off(0);
+        ds5w_set_trigger_effect_off(1);
     }
 }

From 09c796c23886f90af9cf648449031c6d77b9bbf6 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 23:24:33 +0100
Subject: [PATCH 04/18] Update DualSenseOverlay.cs

fix creation of file
---
 .../Overlays/Driving/DualSense/DualSenseOverlay.cs    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
index df3f5e486..a810f0a75 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
@@ -53,7 +53,7 @@ public sealed override void BeforeStop()
     private static void ExtractDs5ApiDll()
     {
         string dllPath = Path.Combine(AppContext.BaseDirectory, Path.GetFileName("ds5w_x64.dll"));
-        FileInfo dllFile = new FileInfo(dllPath);
+        FileInfo dllFile = new(dllPath);
         if (dllFile.Exists) return;
 
         string resourceName = "RaceElement.HUD.Common.Overlays.Driving.DualSense.ds5w_x64.dll";
@@ -63,11 +63,10 @@ private static void ExtractDs5ApiDll()
             if (stream == null)
                 throw new FileNotFoundException($"Could not find resource: {resourceName}");
 
-            dllFile.Create();
-            using (var fileStream = dllFile.Open(FileMode.Create, FileAccess.Write))
-            {
-                stream.CopyTo(fileStream);
-            }
+            using var fileStream = dllFile.Open(FileMode.Create, FileAccess.Write);
+            stream.CopyTo(fileStream);
+            stream.Close();
+            fileStream.Close();
         }
     }
 

From ad4f4c81deaeb1fa27fb694a698eb2124a0c5727 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 23:38:13 +0100
Subject: [PATCH 05/18] Update TriggerHaptics.cs

disable effects at all times (can be improved in the future to remember this state)
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index b1200d03e..692a439c4 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -10,10 +10,16 @@ public static void HandleBraking(DualSenseConfiguration config)
     {
         // TODO: add either an option to threshold it on brake input or based on some curve?
         if (SimDataProvider.LocalCar.Inputs.Brake <= config.BrakeSlip.BrakeThreshold / 100f)
+        {
+            ds5w_set_trigger_effect_off(1);
             return;
+        }
         float[] slipRatios = SimDataProvider.LocalCar.Tyres.SlipRatio;
         if (slipRatios.Length != 4)
+        {
+            ds5w_set_trigger_effect_off(1);
             return;
+        }
 
         float slipRatioFront = Math.Max(slipRatios[0], slipRatios[1]);
         float slipRatioRear = Math.Max(slipRatios[2], slipRatios[3]);
@@ -45,10 +51,16 @@ public static void HandleBraking(DualSenseConfiguration config)
     public static void HandleAcceleration(DualSenseConfiguration config)
     {
         if (SimDataProvider.LocalCar.Inputs.Throttle <= config.ThrottleSlip.ThrottleThreshold / 100f)
+        {
+            ds5w_set_trigger_effect_off(0);
             return;
+        }
         float[] slipRatios = SimDataProvider.LocalCar.Tyres.SlipRatio;
         if (slipRatios.Length != 4)
+        {
+            ds5w_set_trigger_effect_off(0);
             return;
+        }
 
         float slipRatioFront = Math.Max(slipRatios[0], slipRatios[1]);
         float slipRatioRear = Math.Max(slipRatios[2], slipRatios[3]);

From 3615968f738e2d9e5d699c2855de68cb88034c14 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 23:40:45 +0100
Subject: [PATCH 06/18] Update DualSenseConfiguration.cs

update default settings, feels better after the previous commit, you can turn down amplitude ofc!
---
 .../Overlays/Driving/DualSense/DualSenseConfiguration.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs
index 1f13af5ed..43edd1974 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
@@ -36,7 +36,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]
-        public int MinFrequency { get; init; } = 10;
+        public int MinFrequency { get; init; } = 3;
 
         [ToolTip("Sets the max frequency of the vibration effect in the trigger.")]
         [IntRange(20, 150, 1)]
@@ -44,7 +44,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
         [IntRange(1, 8, 1)]
-        public int Amplitude { get; init; } = 1;
+        public int Amplitude { get; init; } = 8;
     }
 
     [ConfigGrouping("Throttle Slip", "Adjust the slip effect whilst applying the throttle.\nModify the threshold to increase or decrease sensitivity in different situations.")]
@@ -72,7 +72,7 @@ public sealed class ThrottleSlipHaptics
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]
-        public int MinFrequency { get; init; } = 10;
+        public int MinFrequency { get; init; } = 6;
 
         [ToolTip("Sets the max frequency of the vibration effect in the trigger.")]
         [IntRange(20, 150, 1)]
@@ -80,7 +80,7 @@ public sealed class ThrottleSlipHaptics
 
         [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
         [IntRange(1, 8, 1)]
-        public int Amplitude { get; init; } = 1;
+        public int Amplitude { get; init; } = 7;
     }
 
 }

From 7231cafe61bc58616cc83a784aaa4bf5439c83d9 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 23:49:29 +0100
Subject: [PATCH 07/18] Update TriggerHaptics.cs

add feedback as 0 frequency
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 692a439c4..0ad5c10ed 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -35,8 +35,8 @@ public static void HandleBraking(DualSenseConfiguration config)
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 17.5f;
-            //if (percentage >= 0.05f)
-            //    p.AddAdaptiveTriggerToPacket(controllerIndex, Trigger.Left, TriggerMode.FEEDBACK, [1, (int)(config.BrakeSlip.FeedbackStrength * percentage)]);
+            if (percentage >= 0.05f)
+                ds5w_set_trigger_effect_vibration(1, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);
@@ -74,8 +74,8 @@ public static void HandleAcceleration(DualSenseConfiguration config)
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 12.5f;
-            //if (percentage >= 0.05f)
-            //    p.AddAdaptiveTriggerToPacket(controllerIndex, Trigger.Right, TriggerMode.FEEDBACK, [1, (int)(config.ThrottleSlip.FeedbackStrength * percentage)]);
+            if (percentage >= 0.05f)
+                ds5w_set_trigger_effect_vibration(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
 
             int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
             freq.ClipMin(config.ThrottleSlip.MinFrequency);

From 23b6b8f45321747e55b7ba7063e1df3d2fb7a471 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sat, 25 Jan 2025 23:57:19 +0100
Subject: [PATCH 08/18] Update TriggerHaptics.cs

- fix ffb str to brake setting instead of throttle for brake slip feedback
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 0ad5c10ed..99a505b11 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -35,8 +35,9 @@ public static void HandleBraking(DualSenseConfiguration config)
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 17.5f;
+
             if (percentage >= 0.05f)
-                ds5w_set_trigger_effect_vibration(1, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
+                ds5w_set_trigger_effect_vibration(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage), 0);
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);

From d7ad4add6fc30d1bebe8ad00e27ae996e3fdb3be Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 00:10:31 +0100
Subject: [PATCH 09/18] revert tripperhaptics to vibration only

---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 99a505b11..12eb22e9b 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -36,8 +36,8 @@ public static void HandleBraking(DualSenseConfiguration config)
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 17.5f;
 
-            if (percentage >= 0.05f)
-                ds5w_set_trigger_effect_vibration(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage), 0);
+            //if (percentage >= 0.05f)
+            //    ds5w_set_trigger_effect_vibration(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage), 90);
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);
@@ -75,8 +75,8 @@ public static void HandleAcceleration(DualSenseConfiguration config)
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 12.5f;
-            if (percentage >= 0.05f)
-                ds5w_set_trigger_effect_vibration(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
+            //if (percentage >= 0.05f)
+            //    ds5w_set_trigger_effect_vibration(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
 
             int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
             freq.ClipMin(config.ThrottleSlip.MinFrequency);

From 135b34da6eb16d5798595f953e6dbfb5d35b58ae Mon Sep 17 00:00:00 2001
From: kamih <guillaume.stordeur@gmail.com>
Date: Sat, 25 Jan 2025 16:28:49 -0700
Subject: [PATCH 10/18] added ds5w_set_trigger_effect_feedback and
 ds5w_set_trigger_effect_weapon to DualSense API Resources

---
 .../Overlays/Driving/DualSense/Resources.cs   |  12 ++++++------
 .../Overlays/Driving/DualSense/ds5w_x64.dll   | Bin 19968 -> 19968 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs
index 7cc8ef70b..bb8a16a15 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/Resources.cs	
@@ -4,12 +4,6 @@ namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 
 internal static partial class Resources
 {
-    /*
-        DS5W_CAPI int ds5w_init(void);
-        DS5W_CAPI void ds5w_shutdown(void);
-        DS5W_CAPI int ds5w_set_trigger_effect_off(int left);
-        DS5W_CAPI int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
-    */
     [LibraryImport("ds5w_x64.dll", SetLastError = true)]
     public static partial int ds5w_init();
 
@@ -21,4 +15,10 @@ internal static partial class Resources
 
     [LibraryImport("ds5w_x64.dll", SetLastError = true)]
     public static partial int ds5w_set_trigger_effect_vibration(int left, int pos, int amp, int freq);
+
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial int ds5w_set_trigger_effect_feedback(int left, int pos, int strength);
+
+    [LibraryImport("ds5w_x64.dll", SetLastError = true)]
+    public static partial int ds5w_set_trigger_effect_weapon(int left, int start, int end, int strength);
 }
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/ds5w_x64.dll b/Race Element.HUD.Common/Overlays/Driving/DualSense/ds5w_x64.dll
index fb56309a0d2ebb059fec63be5eb2e907cf85c96c..a6e93968e85f47519d796ea711d552ad8db81a0a 100644
GIT binary patch
delta 5382
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

delta 5297
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
U6DOpiUWs_Zyu!A)@^7^N1_kl<9smFU


From 6b023960dcd8364b8506c4215d559ad4566af130 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 00:38:27 +0100
Subject: [PATCH 11/18] Update TriggerHaptics.cs

add feedback effect
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 12eb22e9b..4e5a51d1e 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -36,8 +36,11 @@ public static void HandleBraking(DualSenseConfiguration config)
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 17.5f;
 
-            //if (percentage >= 0.05f)
-            //    ds5w_set_trigger_effect_vibration(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage), 90);
+            if (percentage >= 0.05f)
+            {
+                ds5w_set_trigger_effect_feedback(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage));
+                ds5w_set_trigger_effect_off(1);
+            }
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);
@@ -75,8 +78,11 @@ public static void HandleAcceleration(DualSenseConfiguration config)
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
             float percentage = magicValue * 1.0f / 12.5f;
-            //if (percentage >= 0.05f)
-            //    ds5w_set_trigger_effect_vibration(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage), 0);
+            if (percentage >= 0.05f)
+            {
+                ds5w_set_trigger_effect_feedback(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage));
+                ds5w_set_trigger_effect_off(0);
+            }
 
             int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
             freq.ClipMin(config.ThrottleSlip.MinFrequency);

From 772c0e5b76a57d21a3b6221b6fee4e636362381b Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 00:51:12 +0100
Subject: [PATCH 12/18] Update TriggerHaptics.cs

time trial
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 4e5a51d1e..4867e15b7 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -38,18 +38,20 @@ public static void HandleBraking(DualSenseConfiguration config)
 
             if (percentage >= 0.05f)
             {
-                ds5w_set_trigger_effect_feedback(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage));
+                float perc = (config.BrakeSlip.FeedbackStrength * percentage);
+                perc.ClipMin(config.BrakeSlip.FeedbackStrength);
+                ds5w_set_trigger_effect_feedback(1, 0, (int)perc);
+                Thread.Sleep((int)(1000f / 200));
                 ds5w_set_trigger_effect_off(1);
             }
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);
             ds5w_set_trigger_effect_vibration(1, 0, config.BrakeSlip.Amplitude, freq);
+            Thread.Sleep((int)(1000f / 200 * 4));
         }
         else
-        {
             ds5w_set_trigger_effect_off(1);
-        }
     }
 
     public static void HandleAcceleration(DualSenseConfiguration config)
@@ -81,16 +83,16 @@ public static void HandleAcceleration(DualSenseConfiguration config)
             if (percentage >= 0.05f)
             {
                 ds5w_set_trigger_effect_feedback(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage));
+                Thread.Sleep((int)(1000f / 200));
                 ds5w_set_trigger_effect_off(0);
             }
 
             int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
             freq.ClipMin(config.ThrottleSlip.MinFrequency);
             ds5w_set_trigger_effect_vibration(0, 0, config.ThrottleSlip.Amplitude, freq);
+            Thread.Sleep((int)(1000f / 200 * 4));
         }
         else
-        {
             ds5w_set_trigger_effect_off(0);
-        }
     }
 }

From fc48eeaeca6be139897a36a0acc1595e59734408 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:02:47 +0100
Subject: [PATCH 13/18] add seperate thread for throttle and brake ffb

- added some sleeps to try out disabling the feedback effect and only enabling it shortly
---
 .../DualSense/DualSenseConfiguration.cs       |  4 ++--
 .../Driving/DualSense/DualSenseJob.cs         | 21 ++++++++++++-------
 .../Driving/DualSense/DualSenseOverlay.cs     | 13 ++++++++----
 .../Driving/DualSense/TriggerHaptics.cs       | 14 ++++++-------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs
index 43edd1974..8a1ec60e3 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
@@ -31,7 +31,7 @@ public sealed class BrakeSlipHaptics
         public float RearSlipThreshold { get; init; } = 0.25f;
 
         [ToolTip("Higher is stronger dynamic feedback.")]
-        [IntRange(5, 8, 1)]
+        [IntRange(1, 8, 1)]
         public int FeedbackStrength { get; init; } = 7;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
@@ -67,7 +67,7 @@ public sealed class ThrottleSlipHaptics
         public float RearSlipThreshold { get; init; } = 0.25f;
 
         [ToolTip("Higher is stronger dynamic feedback.")]
-        [IntRange(5, 8, 1)]
+        [IntRange(1, 8, 1)]
         public int FeedbackStrength { get; init; } = 8;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs
index 1a016b10b..d79789521 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
@@ -3,19 +3,26 @@
 
 namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 
-internal sealed class DualSenseJob(DualSenseOverlay overlay) : AbstractLoopJob
+internal sealed class ThrottleJob(DualSenseOverlay overlay) : AbstractLoopJob
 {
     public sealed override void RunAction()
     {
-        //if (!overlay.ShouldRender())
-        //    return;
+        if (!overlay.ShouldRender())
+            return;
 
         TriggerHaptics.HandleAcceleration(overlay._config);
-        TriggerHaptics.HandleBraking(overlay._config);
     }
-    public override void AfterCancel()
+    public override void AfterCancel() => ds5w_set_trigger_effect_off(0);
+}
+
+internal sealed class BrakeJob(DualSenseOverlay overlay) : AbstractLoopJob
+{
+    public sealed override void RunAction()
     {
-        ds5w_set_trigger_effect_off(0);
-        ds5w_set_trigger_effect_off(1);
+        if (!overlay.ShouldRender())
+            return;
+
+        TriggerHaptics.HandleBraking(overlay._config);
     }
+    public override void AfterCancel() => ds5w_set_trigger_effect_off(1);
 }
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
index a810f0a75..7a1c5977b 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
@@ -19,7 +19,8 @@ namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 internal sealed class DualSenseOverlay : CommonAbstractOverlay
 {
     internal readonly DualSenseConfiguration _config = new();
-    private DualSenseJob _DualSenseJob;
+    private ThrottleJob _throttleJob;
+    private BrakeJob _brakeJob;
 
     public DualSenseOverlay(Rectangle rectangle) : base(rectangle, "DualSense")
     {
@@ -35,14 +36,18 @@ public sealed override void BeforeStart()
         ExtractDs5ApiDll();
 
         ds5w_init();
-        _DualSenseJob = new DualSenseJob(this) { IntervalMillis = 1000 / 200 };
-        _DualSenseJob.Run();
+        _throttleJob = new ThrottleJob(this) { IntervalMillis = 1000 / 200 };
+        _brakeJob = new BrakeJob(this) { IntervalMillis = 1000 / 200 };
+        _throttleJob.Run();
+        _brakeJob.Run();
     }
     public sealed override void BeforeStop()
     {
         if (IsPreviewing) return;
 
-        _DualSenseJob?.CancelJoin();
+        _throttleJob?.CancelJoin();
+        _brakeJob?.CancelJoin();
+
         ds5w_shutdown();
     }
 
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 4867e15b7..640e7215a 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -28,27 +28,27 @@ public static void HandleBraking(DualSenseConfiguration config)
         if (slipRatioFront > config.BrakeSlip.FrontSlipThreshold || slipRatioRear > config.BrakeSlip.RearSlipThreshold)
         {
             float frontslipCoefecient = slipRatioFront * 4f;
-            frontslipCoefecient.ClipMax(10);
+            frontslipCoefecient.ClipMax(7.5f);
 
             float rearSlipCoefecient = slipRatioFront * 2f;
-            rearSlipCoefecient.ClipMax(7.5f);
+            rearSlipCoefecient.ClipMax(5f);
 
             float magicValue = frontslipCoefecient + rearSlipCoefecient;
-            float percentage = magicValue * 1.0f / 17.5f;
+            float percentage = magicValue * 1.0f / 12.5f;
 
             if (percentage >= 0.05f)
             {
                 float perc = (config.BrakeSlip.FeedbackStrength * percentage);
                 perc.ClipMin(config.BrakeSlip.FeedbackStrength);
                 ds5w_set_trigger_effect_feedback(1, 0, (int)perc);
-                Thread.Sleep((int)(1000f / 200));
+                Thread.Sleep((int)(1000f / 250));
                 ds5w_set_trigger_effect_off(1);
             }
 
             int freq = (int)(config.BrakeSlip.MaxFrequency * percentage);
             freq.ClipMin(config.BrakeSlip.MinFrequency);
             ds5w_set_trigger_effect_vibration(1, 0, config.BrakeSlip.Amplitude, freq);
-            Thread.Sleep((int)(1000f / 200 * 4));
+            Thread.Sleep((int)(1000f / 250 * 4));
         }
         else
             ds5w_set_trigger_effect_off(1);
@@ -83,14 +83,14 @@ public static void HandleAcceleration(DualSenseConfiguration config)
             if (percentage >= 0.05f)
             {
                 ds5w_set_trigger_effect_feedback(0, 0, (int)(config.ThrottleSlip.FeedbackStrength * percentage));
-                Thread.Sleep((int)(1000f / 200));
+                Thread.Sleep((int)(1000f / 250));
                 ds5w_set_trigger_effect_off(0);
             }
 
             int freq = (int)(config.ThrottleSlip.MaxFrequency * percentage);
             freq.ClipMin(config.ThrottleSlip.MinFrequency);
             ds5w_set_trigger_effect_vibration(0, 0, config.ThrottleSlip.Amplitude, freq);
-            Thread.Sleep((int)(1000f / 200 * 4));
+            Thread.Sleep((int)(1000f / 250 * 4));
         }
         else
             ds5w_set_trigger_effect_off(0);

From 4780c3a16321027a464bafaa1e7c1cb153e12e39 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:10:34 +0100
Subject: [PATCH 14/18] revert back to single thread

---
 .../Overlays/Driving/DualSense/DualSenseJob.cs    | 15 ++-------------
 .../Driving/DualSense/DualSenseOverlay.cs         | 12 ++++--------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs
index d79789521..f2e5a865a 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseJob.cs	
@@ -3,7 +3,7 @@
 
 namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 
-internal sealed class ThrottleJob(DualSenseOverlay overlay) : AbstractLoopJob
+internal sealed class HapticsJob(DualSenseOverlay overlay) : AbstractLoopJob
 {
     public sealed override void RunAction()
     {
@@ -11,18 +11,7 @@ public sealed override void RunAction()
             return;
 
         TriggerHaptics.HandleAcceleration(overlay._config);
-    }
-    public override void AfterCancel() => ds5w_set_trigger_effect_off(0);
-}
-
-internal sealed class BrakeJob(DualSenseOverlay overlay) : AbstractLoopJob
-{
-    public sealed override void RunAction()
-    {
-        if (!overlay.ShouldRender())
-            return;
-
         TriggerHaptics.HandleBraking(overlay._config);
     }
-    public override void AfterCancel() => ds5w_set_trigger_effect_off(1);
+    public override void AfterCancel() { ds5w_set_trigger_effect_off(0); ds5w_set_trigger_effect_off(1); }
 }
diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs
index 7a1c5977b..3187e53c6 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseOverlay.cs	
@@ -19,8 +19,7 @@ namespace RaceElement.HUD.Common.Overlays.Driving.DualSense;
 internal sealed class DualSenseOverlay : CommonAbstractOverlay
 {
     internal readonly DualSenseConfiguration _config = new();
-    private ThrottleJob _throttleJob;
-    private BrakeJob _brakeJob;
+    private HapticsJob _hapticsJob;
 
     public DualSenseOverlay(Rectangle rectangle) : base(rectangle, "DualSense")
     {
@@ -36,17 +35,14 @@ public sealed override void BeforeStart()
         ExtractDs5ApiDll();
 
         ds5w_init();
-        _throttleJob = new ThrottleJob(this) { IntervalMillis = 1000 / 200 };
-        _brakeJob = new BrakeJob(this) { IntervalMillis = 1000 / 200 };
-        _throttleJob.Run();
-        _brakeJob.Run();
+        _hapticsJob = new HapticsJob(this) { IntervalMillis = 1000 / 200 };
+        _hapticsJob.Run();
     }
     public sealed override void BeforeStop()
     {
         if (IsPreviewing) return;
 
-        _throttleJob?.CancelJoin();
-        _brakeJob?.CancelJoin();
+        _hapticsJob?.CancelJoin();
 
         ds5w_shutdown();
     }

From 4d725627cb35e92cde904bc425af982b8f175ea2 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:12:42 +0100
Subject: [PATCH 15/18] Update TriggerHaptics.cs

- fix brake behavior
---
 .../Overlays/Driving/DualSense/TriggerHaptics.cs              | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs
index 640e7215a..2abe4d66f 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/TriggerHaptics.cs	
@@ -38,9 +38,7 @@ public static void HandleBraking(DualSenseConfiguration config)
 
             if (percentage >= 0.05f)
             {
-                float perc = (config.BrakeSlip.FeedbackStrength * percentage);
-                perc.ClipMin(config.BrakeSlip.FeedbackStrength);
-                ds5w_set_trigger_effect_feedback(1, 0, (int)perc);
+                ds5w_set_trigger_effect_feedback(1, 0, (int)(config.BrakeSlip.FeedbackStrength * percentage));
                 Thread.Sleep((int)(1000f / 250));
                 ds5w_set_trigger_effect_off(1);
             }

From 78348d1d7b781207dc698ded643daf03cd287044 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:19:01 +0100
Subject: [PATCH 16/18] Update DsxConfiguration.cs

adjust defaults
---
 .../Overlays/Pitwall/DSX/DsxConfiguration.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs b/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs
index 72f8197fc..43e57c53e 100644
--- a/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs	
+++ b/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs	
@@ -32,7 +32,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(5, 8, 1)]
-        public int FeedbackStrength { get; init; } = 7;
+        public int FeedbackStrength { get; init; } = 3;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]
@@ -44,7 +44,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
         [IntRange(5, 8, 1)]
-        public int Amplitude { get; init; } = 8;
+        public int Amplitude { get; init; } = 6;
     }
 
     [ConfigGrouping("Throttle Slip", "Adjust the slip effect whilst applying the throttle.\nModify the threshold to increase or decrease sensitivity in different situations.")]
@@ -68,7 +68,7 @@ public sealed class ThrottleSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(5, 8, 1)]
-        public int FeedbackStrength { get; init; } = 8;
+        public int FeedbackStrength { get; init; } = 2;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]

From f0aa7b2c2dd147875b24ee89ec0b1fdc0a9985d2 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:27:13 +0100
Subject: [PATCH 17/18] Revert "Update DsxConfiguration.cs"

This reverts commit 78348d1d7b781207dc698ded643daf03cd287044.
---
 .../Overlays/Pitwall/DSX/DsxConfiguration.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs b/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs
index 43e57c53e..72f8197fc 100644
--- a/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs	
+++ b/Race Element.HUD.Common/Overlays/Pitwall/DSX/DsxConfiguration.cs	
@@ -32,7 +32,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(5, 8, 1)]
-        public int FeedbackStrength { get; init; } = 3;
+        public int FeedbackStrength { get; init; } = 7;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]
@@ -44,7 +44,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
         [IntRange(5, 8, 1)]
-        public int Amplitude { get; init; } = 6;
+        public int Amplitude { get; init; } = 8;
     }
 
     [ConfigGrouping("Throttle Slip", "Adjust the slip effect whilst applying the throttle.\nModify the threshold to increase or decrease sensitivity in different situations.")]
@@ -68,7 +68,7 @@ public sealed class ThrottleSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(5, 8, 1)]
-        public int FeedbackStrength { get; init; } = 2;
+        public int FeedbackStrength { get; init; } = 8;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]

From 4659d9c5f1176784c3dbf14af9aec3bcc3ca7905 Mon Sep 17 00:00:00 2001
From: Reinier Klarenberg <reinierklarenberg@gmail.com>
Date: Sun, 26 Jan 2025 01:27:54 +0100
Subject: [PATCH 18/18] Update DualSenseConfiguration.cs

adjust defaults
---
 .../Overlays/Driving/DualSense/DualSenseConfiguration.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs
index 8a1ec60e3..ea7423214 100644
--- a/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
+++ b/Race Element.HUD.Common/Overlays/Driving/DualSense/DualSenseConfiguration.cs	
@@ -32,11 +32,11 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(1, 8, 1)]
-        public int FeedbackStrength { get; init; } = 7;
+        public int FeedbackStrength { get; init; } = 3;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]
-        public int MinFrequency { get; init; } = 3;
+        public int MinFrequency { get; init; } = 6;
 
         [ToolTip("Sets the max frequency of the vibration effect in the trigger.")]
         [IntRange(20, 150, 1)]
@@ -44,7 +44,7 @@ public sealed class BrakeSlipHaptics
 
         [ToolTip("Change the amplitude(strength) of the vibration effect in the trigger.")]
         [IntRange(1, 8, 1)]
-        public int Amplitude { get; init; } = 8;
+        public int Amplitude { get; init; } = 6;
     }
 
     [ConfigGrouping("Throttle Slip", "Adjust the slip effect whilst applying the throttle.\nModify the threshold to increase or decrease sensitivity in different situations.")]
@@ -68,7 +68,7 @@ public sealed class ThrottleSlipHaptics
 
         [ToolTip("Higher is stronger dynamic feedback.")]
         [IntRange(1, 8, 1)]
-        public int FeedbackStrength { get; init; } = 8;
+        public int FeedbackStrength { get; init; } = 2;
 
         [ToolTip("Sets the min frequency of the vibration effect in the trigger.")]
         [IntRange(1, 10, 1)]