add independent xy accel to driver

other changes:

modifier_args type name is now settings,
which is now the type passed in driver ioctl

remove most settings/args verification from driver,
plan to let gui handle most of it

add another accel arg, rate, which is used to set
the 'accel' parameter of types which call exp (nat/sig),
might want to cap it

add (update) serializable DriverSettings (ModifierArgs) class to
gui and static methods for interop

remove properties from ManagedAccel, its now just a black box
for accessing modifier methods

add exception handling in wrapper_io to throw proper managed types

change SettingsManager::Startup to make a new settings file
if an error occurs during deserialization

change structure of accel types; how offset and weight are applied
now depend on additivity of types

remove tagged_union and add a handrolled variant/visit impl

AccelGui::UpdateActiveValueLabels currently broken for caps
and a few other args

remove gui default layout and initial natural accel setup

cli not updated

1 files changed, 45 insertions, 70 deletions

diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 848606d..fc58387 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
+using System;
 using System.Windows.Forms;
 
 namespace grapher.Models.Serialized
@@ -32,63 +28,38 @@ namespace grapher.Models.Serialized
 
         private ToolStripMenuItem AutoWriteMenuItem { get; set; }
 
-        public void UpdateActiveSettings(
-            int mode,
-            double degrees,
-            double sensitivityX,
-            double sensitivityY,
-            double weightX,
-            double weightY,
-            double capX,
-            double capY,
-            double offset,
-            double accel,
-            double limitOrExp,
-            double midpoint,
-            double gainCap)
+        public void UpdateActiveSettings(DriverSettings settings)
         {
-            ActiveAccel.UpdateAccel(
-                mode,
-                degrees,
-                sensitivityX,
-                sensitivityY,
-                weightX,
-                weightY,
-                capX,
-                capY,
-                offset,
-                accel,
-                limitOrExp,
-                midpoint,
-                gainCap);
+            try
+            {
+                settings.SendToDriverAndUpdate(ActiveAccel);
 
-            RawAccelSettings.AccelerationSettings = new modifier_args(ActiveAccel);
-            RawAccelSettings.GUISettings = new GUISettings
+                RawAccelSettings.AccelerationSettings = settings;
+                RawAccelSettings.GUISettings = new GUISettings
                 {
                     AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked,
                     DPI = (int)DpiField.Data,
                     PollRate = (int)PollRateField.Data
                 };
 
-            RawAccelSettings.Save();
+                RawAccelSettings.Save();
+            }
+            catch (DriverWriteCDException)
+            {
+                Console.WriteLine("write on cooldown");
+            }
         }
 
-        public void UpdateActiveAccelFromFileSettings()
+        public void UpdateActiveAccelFromFileSettings(DriverSettings settings)
         {
-            ActiveAccel.UpdateAccel(
-                RawAccelSettings.AccelerationSettings.acc_fn_args.accel_mode,
-                RawAccelSettings.AccelerationSettings.degrees,
-                RawAccelSettings.AccelerationSettings.sens.x,
-                RawAccelSettings.AccelerationSettings.sens.y,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.weight.x,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.weight.y,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.cap.x,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.cap.y,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.offset,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.accel,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.exponent,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.midpoint,
-                RawAccelSettings.AccelerationSettings.acc_fn_args.acc_args.gain_cap);
+            try
+            {
+                settings.SendToDriverAndUpdate(ActiveAccel);
+            }
+            catch (DriverWriteCDException)
+            {
+                Console.WriteLine("write on cd during file init");
+            }
             DpiField.SetToEntered(RawAccelSettings.GUISettings.DPI);
             PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
             AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
@@ -96,28 +67,32 @@ namespace grapher.Models.Serialized
 
         public void Startup()
         {
-            ActiveAccel.ReadFromDriver();
-
-            if(RawAccelSettings.Exists())
+            if (RawAccelSettings.Exists())
             {
-                RawAccelSettings = RawAccelSettings.Load();
-                if (RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup)
+                try
                 {
-                    UpdateActiveAccelFromFileSettings();
-                }
-            }
-            else
-            {
-                RawAccelSettings = new RawAccelSettings(
-                    ActiveAccel,
-                    new GUISettings
+                    RawAccelSettings = RawAccelSettings.Load();
+                    if (RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup)
                     {
-                        AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked,
-                        DPI = (int)DpiField.Data,
-                        PollRate = (int)PollRateField.Data
-                    });
-                RawAccelSettings.Save();
+                        UpdateActiveAccelFromFileSettings(RawAccelSettings.AccelerationSettings);
+                    }
+                    return;
+                }
+                catch (JsonSerializationException e)
+                {
+                    Console.WriteLine($"bad settings: {e}");
+                }
             }
+
+            RawAccelSettings = new RawAccelSettings(
+                DriverSettings.GetActive(),
+                new GUISettings
+                {
+                    AutoWriteToDriverOnStartup = AutoWriteMenuItem.Checked,
+                    DPI = (int)DpiField.Data,
+                    PollRate = (int)PollRateField.Data
+                });
+            RawAccelSettings.Save();
         }
     }
 }