From 57be3fadb777f185454361270c1a8076417ed6a5 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Tue, 20 Oct 2020 00:40:22 -0400
Subject: [PATCH 1/6] add speed cap

---
 common/rawaccel-settings.h |  1 +
 common/rawaccel.hpp        | 28 ++++++++++++++++++++++------
 grapher/Models/AccelGUI.cs |  3 ++-
 wrapper/wrapper.cpp        |  3 +++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index aeb89e89..02f0a8a2 100644
--- a/common/rawaccel-settings.h
+++ b/common/rawaccel-settings.h
@@ -18,6 +18,7 @@ namespace rawaccel {
         bool combine_mags = true;
         vec2<accel_mode> modes = { accel_mode::noaccel, accel_mode::noaccel };
         vec2<accel_args> argsv;
+        double speed_cap = 0;
         vec2d sens = { 1, 1 };
         milliseconds time_min = DEFAULT_TIME_MIN;
     };
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index ecd38501..3a49aa67 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -200,11 +200,25 @@ namespace rawaccel {
             accel(args, mode, lut), gain_cap(args.gain_cap, accel), clamp(args.scale_cap)
         {}
 
-        inline double apply(double speed) const {
+        inline double apply(double speed, double output_speed_cap) const { 
+            double scale;
+
             if (gain_cap.should_apply(speed)) {
-                return clamp(gain_cap.apply(speed));
+                scale = gain_cap.apply(speed);
+            }
+            else {
+                scale = accel.apply(speed);
+            }
+
+            scale = clamp(scale);
+
+            double output_speed = scale * speed;
+
+            if (output_speed_cap > 0 && output_speed > output_speed_cap) {
+                scale = output_speed_cap / speed;
             }
-            else return clamp(accel.apply(speed));
+
+            return scale;
         }
 
         accelerator() = default;
@@ -216,6 +230,7 @@ namespace rawaccel {
         bool apply_accel = false;
         bool combine_magnitudes = true;
         rotator rotate;
+        double output_speed_cap = 0;
         vec2<accelerator> accels;
         vec2d sensitivity = { 1, 1 };
 
@@ -236,6 +251,7 @@ namespace rawaccel {
                 return;
             }
 
+            output_speed_cap = maxsd(args.speed_cap, 0);
             accels.x = accelerator(args.argsv.x, args.modes.x, luts.x);
             accels.y = accelerator(args.argsv.y, args.modes.y, luts.y);
             apply_accel = true;
@@ -259,13 +275,13 @@ namespace rawaccel {
                 if (combine_magnitudes) {
                     double mag = sqrtsd(movement.x * movement.x + movement.y * movement.y);
                     double speed = mag / time;
-                    double scale = accels.x.apply(speed);
+                    double scale = accels.x.apply(speed, output_speed_cap);
                     movement.x *= scale;
                     movement.y *= scale;
                 }
                 else {
-                    movement.x *= accels.x.apply(fabs(movement.x) / time);
-                    movement.y *= accels.y.apply(fabs(movement.y) / time);
+                    movement.x *= accels.x.apply(fabs(movement.x) / time, output_speed_cap);
+                    movement.y *= accels.y.apply(fabs(movement.y) / time, output_speed_cap);
                 }
             }
         }
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index dd1e37de..902b135f 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -120,7 +120,8 @@ public void UpdateActiveSettingsFromFields()
                 combineMagnitudes = ApplyOptions.IsWhole,
                 modes = ApplyOptions.GetModes(),
                 args = ApplyOptions.GetArgs(),
-                minimumTime = driverSettings.minimumTime
+                minimumTime = driverSettings.minimumTime,
+                speedCap = driverSettings.speedCap
             };
 
             WriteButtonDelay();
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index a921801f..1bfb251b 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -63,6 +63,9 @@ public ref struct DriverSettings
     [JsonProperty("Accel parameters")]
     Vec2<AccelArgs> args;
 
+    [JsonProperty("Output Speed Cap", Required = Required::Default)]
+    double speedCap;
+
     [JsonProperty("Sensitivity multipliers")]
     Vec2<double> sensitivity;
     

From c7ba6fb1d992a0efbcb581dfeaa65b0f5f59cdb7 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Tue, 20 Oct 2020 19:05:35 -0400
Subject: [PATCH 2/6] update min time threshold for 8khz

---
 common/rawaccel-settings.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index 02f0a8a2..fe171818 100644
--- a/common/rawaccel-settings.h
+++ b/common/rawaccel-settings.h
@@ -4,10 +4,12 @@
 #include "accel-base.hpp"
 
 namespace rawaccel {
+
     using milliseconds = double;
 
+    inline constexpr int MAX_POLL_RATE_KHZ = 8;
+    inline constexpr milliseconds DEFAULT_TIME_MIN = 1.0 / MAX_POLL_RATE_KHZ * 0.8;
     inline constexpr milliseconds WRITE_DELAY = 1000;
-    inline constexpr milliseconds DEFAULT_TIME_MIN = 0.4;
 
     enum class accel_mode {
         linear, classic, natural, naturalgain, power, motivity, noaccel

From 91803c92a0ad16168126cf7d80de12d14855440d Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Wed, 21 Oct 2020 18:54:44 -0400
Subject: [PATCH 3/6] fix sens label visibility when separated

---
 grapher/Models/Options/ActiveValueLabelXY.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/grapher/Models/Options/ActiveValueLabelXY.cs b/grapher/Models/Options/ActiveValueLabelXY.cs
index 1367a6ab..381779c5 100644
--- a/grapher/Models/Options/ActiveValueLabelXY.cs
+++ b/grapher/Models/Options/ActiveValueLabelXY.cs
@@ -143,7 +143,8 @@ public void AlignActiveValues()
         private void Align (int width)
         {
             FullWidth = width;
-            ShortenedWidth = FullWidth / 2;
+            // ShortenedWidth = FullWidth / 2;
+            ShortenedWidth = FullWidth;
 
             SetYLeft();
             Y.Width = ShortenedWidth;

From 737461c030322ca9120aca7f61cb664fb484265a Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:23:42 -0400
Subject: [PATCH 4/6] put autowrite option back in menu

---
 grapher/Form1.Designer.cs                     | 20 +++-
 grapher/Form1.cs                              |  1 +
 grapher/Models/AccelGUI.cs                    | 93 +++++++++----------
 grapher/Models/AccelGUIFactory.cs             |  2 +
 grapher/Models/Serialized/GUISettings.cs      | 10 +-
 grapher/Models/Serialized/RawAccelSettings.cs | 17 ++--
 grapher/Models/Serialized/SettingsManager.cs  | 25 +++--
 7 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index a6ae7543..6fd9478b 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -168,6 +168,7 @@ private void InitializeComponent()
             this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            this.AutoWriteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.optionsPanel.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.chartsPanel.SuspendLayout();
@@ -954,7 +955,8 @@ private void InitializeComponent()
             this.advancedToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.capStyleToolStripMenuItem,
             this.offsetStyleToolStripMenuItem,
-            this.toolStripMenuItem1});
+            this.toolStripMenuItem1,
+            this.AutoWriteMenuItem});
             this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
             this.advancedToolStripMenuItem.Size = new System.Drawing.Size(72, 20);
             this.advancedToolStripMenuItem.Text = "Advanced";
@@ -965,7 +967,7 @@ private void InitializeComponent()
             this.gainCapToolStripMenuItem,
             this.legacyCapToolStripMenuItem});
             this.capStyleToolStripMenuItem.Name = "capStyleToolStripMenuItem";
-            this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.capStyleToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.capStyleToolStripMenuItem.Text = "Cap Style";
             // 
             // gainCapToolStripMenuItem
@@ -988,7 +990,7 @@ private void InitializeComponent()
             this.gainOffsetToolStripMenuItem,
             this.legacyOffsetToolStripMenuItem});
             this.offsetStyleToolStripMenuItem.Name = "offsetStyleToolStripMenuItem";
-            this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.offsetStyleToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.offsetStyleToolStripMenuItem.Text = "Offset Style";
             // 
             // gainOffsetToolStripMenuItem
@@ -1009,7 +1011,7 @@ private void InitializeComponent()
             this.wholeVectorToolStripMenuItem,
             this.byVectorComponentToolStripMenuItem});
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(163, 22);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(210, 22);
             this.toolStripMenuItem1.Text = "Application Style";
             // 
             // wholeVectorToolStripMenuItem
@@ -1279,6 +1281,15 @@ private void InitializeComponent()
             title6.Text = "Sensitivity";
             this.AccelerationChart.Titles.Add(title6);
             // 
+            // AutoWriteMenuItem
+            // 
+            this.AutoWriteMenuItem.Checked = true;
+            this.AutoWriteMenuItem.CheckOnClick = true;
+            this.AutoWriteMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.AutoWriteMenuItem.Name = "AutoWriteMenuItem";
+            this.AutoWriteMenuItem.Size = new System.Drawing.Size(210, 22);
+            this.AutoWriteMenuItem.Text = "Apply Settings On Startup";
+            // 
             // RawAcceleration
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1406,6 +1417,7 @@ private void InitializeComponent()
         private System.Windows.Forms.DataVisualization.Charting.Chart GainChart;
         private System.Windows.Forms.DataVisualization.Charting.Chart VelocityChart;
         private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart;
+        private System.Windows.Forms.ToolStripMenuItem AutoWriteMenuItem;
     }
 }
 
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index 446618bf..d62ed6d8 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -59,6 +59,7 @@ public RawAcceleration()
                 legacyCapToolStripMenuItem,
                 gainOffsetToolStripMenuItem,
                 legacyOffsetToolStripMenuItem,
+                AutoWriteMenuItem,
                 ScaleMenuItem,
                 DPITextBox,
                 PollRateTextBox,
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 902b135f..09b432f7 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -33,13 +33,8 @@ public AccelGUI(
             ToggleButton = (CheckBox)toggleButton;
             ScaleMenuItem = scaleMenuItem;
             Settings = settings;
-            Settings.Startup();
-            RefreshOnRead(Settings.RawAccelSettings.AccelerationSettings);
-            AccelForm.DoResize();
-
             DefaultButtonFont = WriteButton.Font;
             SmallButtonFont = new Font(WriteButton.Font.Name, WriteButton.Font.Size * Constants.SmallButtonSizeFactor);
-
             MouseWatcher = mouseWatcher;
 
             ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick);
@@ -50,9 +45,30 @@ public AccelGUI(
             ButtonTimerInterval = Convert.ToInt32(DriverInterop.WriteDelayMs);
             ButtonTimer = new Timer();
             ButtonTimer.Tick += new System.EventHandler(OnButtonTimerTick);
-            SetupButtons();
 
             ChartRefresh = SetupChartTimer();
+
+            bool settingsActive = Settings.Startup();
+            SettingsNotDefault = !Settings.RawAccelSettings.IsDefaultEquivalent();
+
+            if (settingsActive)
+            {
+                LastToggleChecked = SettingsNotDefault;
+                ToggleButton.Enabled = LastToggleChecked;
+                RefreshOnRead(Settings.RawAccelSettings.AccelerationSettings);
+            }
+            else
+            {
+                DriverSettings active = DriverInterop.GetActiveSettings();
+                bool activeNotDefault = !RawAccelSettings.IsDefaultEquivalent(active);
+
+                LastToggleChecked = activeNotDefault;
+                ToggleButton.Enabled = SettingsNotDefault || activeNotDefault;
+                RefreshOnRead(active);
+            }
+
+            SetupButtons();
+            AccelForm.DoResize();
         }
 
         #endregion Constructors
@@ -124,11 +140,12 @@ public void UpdateActiveSettingsFromFields()
                 speedCap = driverSettings.speedCap
             };
 
-            WriteButtonDelay();
+            ButtonDelay(WriteButton);
             SettingsErrors errors = Settings.TryUpdateActiveSettings(settings);
             if (errors.Empty())
             {
-                RefreshToggleStateFromNewSettings();
+                SettingsNotDefault = !Settings.RawAccelSettings.IsDefaultEquivalent();
+                LastToggleChecked = SettingsNotDefault;
                 RefreshOnRead(Settings.RawAccelSettings.AccelerationSettings);
             }
             else
@@ -177,34 +194,23 @@ private void SetupButtons()
             ToggleButton.Size = WriteButton.Size;
             ToggleButton.Top = WriteButton.Top;
 
-            RefreshToggleStateFromNewSettings();
-            SetToggleButtonDefault();
-            SetWriteButtonDefault();
+            SetButtonDefaults();
         }
 
-        private void RefreshToggleStateFromNewSettings()
+        private void SetButtonDefaults()
         {
-            SettingsNotDefault = !Settings.RawAccelSettings.IsDefaultEquivalent();
-            LastToggleChecked = SettingsNotDefault;
-        }
+            ToggleButton.Checked = LastToggleChecked;
+
+            ToggleButton.Font = DefaultButtonFont;
+            ToggleButton.Text = ToggleButton.Checked ? "Enabled" : "Disabled";
+            ToggleButton.Update();
 
-        private void SetWriteButtonDefault()
-        {
             WriteButton.Font = DefaultButtonFont;
             WriteButton.Text = Constants.WriteButtonDefaultText;
             WriteButton.Enabled = ToggleButton.Checked || !ToggleButton.Enabled;
             WriteButton.Update();
         }
 
-        private void SetToggleButtonDefault()
-        {
-            ToggleButton.Checked = LastToggleChecked;
-            ToggleButton.Enabled = SettingsNotDefault;
-            ToggleButton.Font = DefaultButtonFont;
-            ToggleButton.Text = ToggleButton.Checked ? "Enabled" : "Disabled";
-            ToggleButton.Update();
-        }
-
         private void OnScaleMenuItemClick(object sender, EventArgs e)
         {
             UpdateGraph(Settings.RawAccelSettings.AccelerationSettings);
@@ -221,7 +227,8 @@ private void OnToggleButtonClick(object sender, EventArgs e)
                 Settings.RawAccelSettings.AccelerationSettings :
                 DriverInterop.DefaultSettings;
 
-            ToggleButtonDelay();
+            LastToggleChecked = ToggleButton.Checked;
+            ButtonDelay(ToggleButton);
 
             SettingsManager.SendToDriver(settings);
             Settings.ActiveAccel.UpdateFromSettings(settings);
@@ -231,8 +238,8 @@ private void OnToggleButtonClick(object sender, EventArgs e)
         private void OnButtonTimerTick(object sender, EventArgs e)
         {
             ButtonTimer.Stop();
-            SetToggleButtonDefault();
-            SetWriteButtonDefault();
+            ToggleButton.Enabled = SettingsNotDefault;
+            SetButtonDefaults();
         }
 
         private void StartButtonTimer()
@@ -241,33 +248,17 @@ private void StartButtonTimer()
             ButtonTimer.Start();
         }
 
-        private void WriteButtonDelay()
+        private void ButtonDelay(ButtonBase btn)
         {
-            WriteButton.Font = SmallButtonFont;
-            WriteButton.Text = $"{Constants.ButtonDelayText} : {ButtonTimerInterval} ms";
+            ToggleButton.Checked = false;
+
+            ToggleButton.Enabled = false;
             WriteButton.Enabled = false;
-            WriteButton.Update();
 
-            if (ToggleButton.Enabled)
-            {
-                LastToggleChecked = ToggleButton.Checked;
-                ToggleButton.Checked = false;
-                ToggleButton.Enabled = false;
-                ToggleButton.Update();
-            }
-            StartButtonTimer();
-        }
+            btn.Font = SmallButtonFont;
+            btn.Text = $"{Constants.ButtonDelayText} : {ButtonTimerInterval} ms";
 
-        private void ToggleButtonDelay()
-        { 
-            LastToggleChecked = ToggleButton.Checked;
-            ToggleButton.Checked = false;
-            ToggleButton.Enabled = false;
-            ToggleButton.Font = SmallButtonFont;
-            ToggleButton.Text = $"{Constants.ButtonDelayText} : {ButtonTimerInterval} ms";
             ToggleButton.Update();
-
-            WriteButton.Enabled = false;
             WriteButton.Update();
 
             StartButtonTimer();
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index 51bbc2b9..3dc2a742 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -32,6 +32,7 @@ public static AccelGUI Construct(
             ToolStripMenuItem legacyCapToolStripMenuItem,
             ToolStripMenuItem gainOffsetToolStripMenuItem,
             ToolStripMenuItem legacyOffsetToolStripMenuItem,
+            ToolStripMenuItem autoWriteMenuItem,
             ToolStripMenuItem scaleMenuItem,
             ToolStripTextBox dpiTextBox,
             ToolStripTextBox pollRateTextBox,
@@ -326,6 +327,7 @@ public static AccelGUI Construct(
                 activeAccel,
                 accelCalculator.DPI,
                 accelCalculator.PollRate,
+                autoWriteMenuItem,
                 showLastMouseMoveMenuItem,
                 showVelocityGainToolStripMenuItem);
 
diff --git a/grapher/Models/Serialized/GUISettings.cs b/grapher/Models/Serialized/GUISettings.cs
index c8f87aed..bb350552 100644
--- a/grapher/Models/Serialized/GUISettings.cs
+++ b/grapher/Models/Serialized/GUISettings.cs
@@ -4,6 +4,7 @@
 namespace grapher.Models.Serialized
 {
     [Serializable]
+    [JsonObject(ItemRequired = Required.Always)]
     public class GUISettings
     {
         #region Constructors
@@ -27,6 +28,9 @@ public GUISettings() {}
         [JsonProperty(Order = 4)]
         public bool ShowVelocityAndGain { get; set; }
 
+        [JsonProperty(Order = 5)]
+        public bool AutoWriteToDriverOnStartup { get; set; }
+
         #endregion Properties
 
         #region Methods
@@ -48,7 +52,8 @@ public bool Equals(GUISettings other)
             return DPI == other.DPI &&
                 PollRate == other.PollRate &&
                 ShowLastMouseMove == other.ShowLastMouseMove &&
-                ShowVelocityAndGain == other.ShowVelocityAndGain;
+                ShowVelocityAndGain == other.ShowVelocityAndGain &&
+                AutoWriteToDriverOnStartup == other.AutoWriteToDriverOnStartup;
         }
 
         public override int GetHashCode()
@@ -56,7 +61,8 @@ public override int GetHashCode()
             return DPI.GetHashCode() ^
                 PollRate.GetHashCode() ^
                 ShowLastMouseMove.GetHashCode() ^
-                ShowVelocityAndGain.GetHashCode();
+                ShowVelocityAndGain.GetHashCode() ^
+                AutoWriteToDriverOnStartup.GetHashCode();
         }
 
         #endregion Methods
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index 818bfb61..af87a657 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -117,13 +117,18 @@ private void AddComments(JObject thisJO)
 
         public bool IsDefaultEquivalent()
         {
-            bool wholeOrNoY = AccelerationSettings.combineMagnitudes ||
-                AccelerationSettings.modes.y == AccelMode.noaccel;
+            return IsDefaultEquivalent(AccelerationSettings);
+        }
+
+        public static bool IsDefaultEquivalent(DriverSettings accelSettings)
+        {
+            bool wholeOrNoY = accelSettings.combineMagnitudes ||
+                accelSettings.modes.y == AccelMode.noaccel;
 
-            return AccelerationSettings.sensitivity.x == 1 &&
-                AccelerationSettings.sensitivity.y == 1 &&
-                AccelerationSettings.rotation == 0 &&
-                AccelerationSettings.modes.x == AccelMode.noaccel &&
+            return accelSettings.sensitivity.x == 1 &&
+                accelSettings.sensitivity.y == 1 &&
+                accelSettings.rotation == 0 &&
+                accelSettings.modes.x == AccelMode.noaccel &&
                 wholeOrNoY;
         }
 
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 8712c87a..f13ba810 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -14,12 +14,14 @@ public SettingsManager(
             ManagedAccel activeAccel,
             Field dpiField,
             Field pollRateField,
+            ToolStripMenuItem autoWrite,
             ToolStripMenuItem showLastMouseMove,
             ToolStripMenuItem showVelocityAndGain)
         {
             ActiveAccel = activeAccel;
             DpiField = dpiField;
             PollRateField = pollRateField;
+            AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
         }
@@ -36,6 +38,8 @@ public SettingsManager(
 
         private Field PollRateField { get; set; }
 
+        private ToolStripMenuItem AutoWriteMenuItem { get; set; }
+
         private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; }
 
         private ToolStripMenuItem ShowVelocityAndGainMoveMenuItem { get; set; }
@@ -92,12 +96,7 @@ public void UpdateFieldsFromGUISettings()
             PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
             ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove;
             ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain;
-        }
-
-        public void UpdateActiveAccelFromFileSettings(DriverSettings settings)
-        {
-            TryUpdateAccel(settings);
-            UpdateFieldsFromGUISettings();
+            AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
         }
 
         public SettingsErrors TryUpdateAccel(DriverSettings settings)
@@ -126,11 +125,13 @@ public GUISettings MakeGUISettingsFromFields()
                 DPI = (int)DpiField.Data,
                 PollRate = (int)PollRateField.Data,
                 ShowLastMouseMove = ShowLastMouseMoveMenuItem.Checked,
-                ShowVelocityAndGain = ShowVelocityAndGainMoveMenuItem.Checked
+                ShowVelocityAndGain = ShowVelocityAndGainMoveMenuItem.Checked,
+                AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked
             };
         }
 
-        public void Startup()
+        // Returns true when file settings are active
+        public bool Startup()
         {
             if (RawAccelSettings.Exists())
             {
@@ -138,8 +139,11 @@ public void Startup()
                 {
                     RawAccelSettings = RawAccelSettings.Load(() => MakeGUISettingsFromFields());
                     UpdateFieldsFromGUISettings();
-                    UpdateActiveAccelFromFileSettings(RawAccelSettings.AccelerationSettings);
-                    return;
+                    if (RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup)
+                    {
+                        TryUpdateAccel(RawAccelSettings.AccelerationSettings);
+                    }
+                    return RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
                 }
                 catch (JsonException e)
                 {
@@ -151,6 +155,7 @@ public void Startup()
                 DriverInterop.GetActiveSettings(),
                 MakeGUISettingsFromFields());
             RawAccelSettings.Save();
+            return true;
         }
 
         #endregion Methods

From f0ec7a278892c0dfed7c39e4efebd57d97cdb46c Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:03:19 -0400
Subject: [PATCH 5/6] move speedcap into accelerator

---
 common/accel-base.hpp      |  1 +
 common/rawaccel-settings.h |  1 -
 common/rawaccel.hpp        | 19 +++++++++----------
 grapher/Models/AccelGUI.cs |  9 ++++++---
 wrapper/wrapper.cpp        |  5 ++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/common/accel-base.hpp b/common/accel-base.hpp
index ac7ac4d1..b15d6953 100644
--- a/common/accel-base.hpp
+++ b/common/accel-base.hpp
@@ -14,6 +14,7 @@ namespace rawaccel {
         double weight = 1;
         double scale_cap = 0;
         double gain_cap = 0;
+        double speed_cap = 0;
     };
 
     template <typename Func>
diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h
index fe171818..e9e158c6 100644
--- a/common/rawaccel-settings.h
+++ b/common/rawaccel-settings.h
@@ -20,7 +20,6 @@ namespace rawaccel {
         bool combine_mags = true;
         vec2<accel_mode> modes = { accel_mode::noaccel, accel_mode::noaccel };
         vec2<accel_args> argsv;
-        double speed_cap = 0;
         vec2d sens = { 1, 1 };
         milliseconds time_min = DEFAULT_TIME_MIN;
     };
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index 3a49aa67..b160a425 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -195,12 +195,15 @@ namespace rawaccel {
         accel_variant accel;
         velocity_gain_cap gain_cap;
         accel_scale_clamp clamp;
+        double output_speed_cap = 0;
 
         accelerator(const accel_args& args, accel_mode mode, si_pair* lut = nullptr) :
             accel(args, mode, lut), gain_cap(args.gain_cap, accel), clamp(args.scale_cap)
-        {}
+        {
+            output_speed_cap = maxsd(args.speed_cap, 0);
+        }
 
-        inline double apply(double speed, double output_speed_cap) const { 
+        inline double apply(double speed) const { 
             double scale;
 
             if (gain_cap.should_apply(speed)) {
@@ -212,9 +215,7 @@ namespace rawaccel {
 
             scale = clamp(scale);
 
-            double output_speed = scale * speed;
-
-            if (output_speed_cap > 0 && output_speed > output_speed_cap) {
+            if (output_speed_cap > 0 && (scale * speed) > output_speed_cap) {
                 scale = output_speed_cap / speed;
             }
 
@@ -230,7 +231,6 @@ namespace rawaccel {
         bool apply_accel = false;
         bool combine_magnitudes = true;
         rotator rotate;
-        double output_speed_cap = 0;
         vec2<accelerator> accels;
         vec2d sensitivity = { 1, 1 };
 
@@ -251,7 +251,6 @@ namespace rawaccel {
                 return;
             }
 
-            output_speed_cap = maxsd(args.speed_cap, 0);
             accels.x = accelerator(args.argsv.x, args.modes.x, luts.x);
             accels.y = accelerator(args.argsv.y, args.modes.y, luts.y);
             apply_accel = true;
@@ -275,13 +274,13 @@ namespace rawaccel {
                 if (combine_magnitudes) {
                     double mag = sqrtsd(movement.x * movement.x + movement.y * movement.y);
                     double speed = mag / time;
-                    double scale = accels.x.apply(speed, output_speed_cap);
+                    double scale = accels.x.apply(speed);
                     movement.x *= scale;
                     movement.y *= scale;
                 }
                 else {
-                    movement.x *= accels.x.apply(fabs(movement.x) / time, output_speed_cap);
-                    movement.y *= accels.y.apply(fabs(movement.y) / time, output_speed_cap);
+                    movement.x *= accels.x.apply(fabs(movement.x) / time);
+                    movement.y *= accels.y.apply(fabs(movement.y) / time);
                 }
             }
         }
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 09b432f7..c08313bc 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -125,6 +125,10 @@ public void UpdateActiveSettingsFromFields()
         {
             var driverSettings = Settings.RawAccelSettings.AccelerationSettings;
 
+            var newArgs = ApplyOptions.GetArgs();
+            newArgs.x.speedCap = driverSettings.args.x.speedCap;
+            newArgs.y.speedCap = driverSettings.args.y.speedCap;
+
             var settings = new DriverSettings
             {
                 rotation = ApplyOptions.Rotation.Field.Data,
@@ -135,9 +139,8 @@ public void UpdateActiveSettingsFromFields()
                 },
                 combineMagnitudes = ApplyOptions.IsWhole,
                 modes = ApplyOptions.GetModes(),
-                args = ApplyOptions.GetArgs(),
-                minimumTime = driverSettings.minimumTime,
-                speedCap = driverSettings.speedCap
+                args = newArgs,
+                minimumTime = driverSettings.minimumTime
             };
 
             ButtonDelay(WriteButton);
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 1bfb251b..ee88112a 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -33,6 +33,8 @@ public value struct AccelArgs
     [JsonProperty("legacyCap")]
     double scaleCap;
     double gainCap;
+    [JsonProperty(Required = Required::Default)]
+    double speedCap;
 };
 
 generic <typename T>
@@ -63,9 +65,6 @@ public ref struct DriverSettings
     [JsonProperty("Accel parameters")]
     Vec2<AccelArgs> args;
 
-    [JsonProperty("Output Speed Cap", Required = Required::Default)]
-    double speedCap;
-
     [JsonProperty("Sensitivity multipliers")]
     Vec2<double> sensitivity;
     

From fa3a5f448d6d6d66b3de313f674623c583bdf41b Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:03:31 -0400
Subject: [PATCH 6/6] update signed

---
 signed/driver/rawaccel.sys | Bin 52552 -> 52560 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/signed/driver/rawaccel.sys b/signed/driver/rawaccel.sys
index 94872fea0221bfc9687587668d3fd8d97886b9cc..a390fc4f3d27eb48f10a0e62dc7df29ff86b591c 100644
GIT binary patch
delta 13035
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
HAAkQ3gpxQj

delta 12917
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