update wrapper + writer to handle lut

grapher is building but applying options still broken for the most part

7 files changed, 175 insertions, 332 deletions

diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 5a04030..9ed2cb9 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -32,7 +32,7 @@ namespace grapher
             AccelCharts = accelCharts;
             ApplyOptions = applyOptions;
             WriteButton = writeButton;
-            ToggleButton = (CheckBox)toggleButton;
+            DisableButton = (CheckBox)toggleButton;
             ScaleMenuItem = scaleMenuItem;
             Settings = settings;
             DefaultButtonFont = WriteButton.Font;
@@ -42,7 +42,7 @@ namespace grapher
 
             ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick);
             WriteButton.Click += new System.EventHandler(OnWriteButtonClick);
-            ToggleButton.Click += new System.EventHandler(OnToggleButtonClick);
+            DisableButton.Click += new System.EventHandler(DisableDriverEventHandler);
             AccelForm.FormClosing += new FormClosingEventHandler(SaveGUISettingsOnClose);
 
             ButtonTimerInterval = Convert.ToInt32(DriverSettings.WriteDelayMs);
@@ -51,25 +51,8 @@ namespace grapher
 
             ChartRefresh = SetupChartTimer();
 
-            bool settingsActive = Settings.Startup();
-            SettingsNotDefault = !Settings.RawAccelSettings.IsDefaultEquivalent();
-
-            if (settingsActive)
-            {
-                LastToggleChecked = SettingsNotDefault;
-                ToggleButton.Enabled = LastToggleChecked;
-                RefreshOnRead(Settings.RawAccelSettings.AccelerationSettings);
-            }
-            else
-            {
-                DriverSettings active = ManagedAccel.GetActive().Settings;
-                bool activeNotDefault = !RawAccelSettings.IsDefaultEquivalent(active);
-
-                LastToggleChecked = activeNotDefault;
-                ToggleButton.Enabled = SettingsNotDefault || activeNotDefault;
-                RefreshOnRead(active);
-            }
-
+            RefreshUser();
+            RefreshActive();
             SetupButtons();
 
             // TODO: The below removes an overlapping form from the anisotropy panel.
@@ -94,7 +77,7 @@ namespace grapher
 
         public Button WriteButton { get; }
 
-        public CheckBox ToggleButton { get; }
+        public CheckBox DisableButton { get; }
 
         public Timer ButtonTimer { get; }
 
@@ -104,8 +87,6 @@ namespace grapher
 
         public DeviceIDManager DeviceIDManager { get; }
 
-        public Action UpdateInputManagers { get; private set; }
-
         private Timer ChartRefresh { get; }
 
         private Font SmallButtonFont { get; }
@@ -125,46 +106,37 @@ namespace grapher
         private void SaveGUISettingsOnClose(Object sender, FormClosingEventArgs e)
         {
             var guiSettings = Settings.MakeGUISettingsFromFields();
-            if (!Settings.RawAccelSettings.GUISettings.Equals(guiSettings))
+            if (!Settings.GuiSettings.Equals(guiSettings))
             {
-                Settings.RawAccelSettings.GUISettings = guiSettings;
-                Settings.RawAccelSettings.Save();
+                guiSettings.Save();
             }
         }
 
         public void UpdateActiveSettingsFromFields()
         {
-            var driverSettings = Settings.RawAccelSettings.AccelerationSettings;
-
-            var newArgs = ApplyOptions.GetArgs();
-
             var settings = new DriverSettings
             {
                 rotation = ApplyOptions.Rotation.Field.Data,
-                snap = driverSettings.snap,
                 sensitivity = new Vec2<double>
                 {
                     x = ApplyOptions.Sensitivity.Fields.X,
                     y = ApplyOptions.Sensitivity.Fields.Y
                 },
                 combineMagnitudes = ApplyOptions.IsWhole,
-                args = newArgs,
-                minimumTime = driverSettings.minimumTime,
-                directionalMultipliers = driverSettings.directionalMultipliers,
+                args = ApplyOptions.GetArgs(),
                 domainArgs = ApplyOptions.Directionality.GetDomainArgs(),
                 rangeXY = ApplyOptions.Directionality.GetRangeXY(),
                 deviceID = DeviceIDManager.ID,
-                maximumSpeed = driverSettings.maximumSpeed,
-                minimumSpeed = driverSettings.minimumSpeed
             };
 
+            Settings.SetHiddenOptions(settings);
+
             ButtonDelay(WriteButton);
-            SettingsErrors errors = Settings.TryUpdateActiveSettings(settings);
+
+            SettingsErrors errors = Settings.TryActivate(settings);
             if (errors.Empty())
             {
-                SettingsNotDefault = !Settings.RawAccelSettings.IsDefaultEquivalent();
-                LastToggleChecked = SettingsNotDefault;
-                RefreshOnRead(Settings.RawAccelSettings.AccelerationSettings);
+                RefreshActive();
             }
             else
             {
@@ -172,25 +144,28 @@ namespace grapher
             }
         }
 
-        public void RefreshOnRead(DriverSettings args)
+        public void UpdateInputManagers()
         {
-            UpdateShownActiveValues(args);
-            UpdateGraph(args);
-
-            UpdateInputManagers = () =>
-            {
-                MouseWatcher.UpdateHandles(args.deviceID);
-                DeviceIDManager.Update(args.deviceID);
-            };
+            MouseWatcher.UpdateHandles(Settings.ActiveSettings.baseSettings.deviceID);
+            DeviceIDManager.Update(Settings.ActiveSettings.baseSettings.deviceID);
+        }
 
+        public void RefreshActive()
+        {
+            UpdateGraph();
             UpdateInputManagers();
         }
 
-        public void UpdateGraph(DriverSettings args)
+        public void RefreshUser()
+        {
+            UpdateShownActiveValues(Settings.UserSettings);
+        }
+
+        public void UpdateGraph()
         {
             AccelCharts.Calculate(
                 Settings.ActiveAccel,
-                args);
+                Settings.ActiveSettings.baseSettings);
             AccelCharts.Bind();
         }
 
@@ -214,32 +189,31 @@ namespace grapher
         {
             WriteButton.Top = Constants.SensitivityChartAloneHeight - Constants.ButtonVerticalOffset;
             
-            ToggleButton.Appearance = Appearance.Button;
-            ToggleButton.FlatStyle = FlatStyle.System;
-            ToggleButton.TextAlign = ContentAlignment.MiddleCenter;
-            ToggleButton.Size = WriteButton.Size;
-            ToggleButton.Top = WriteButton.Top;
+            DisableButton.Appearance = Appearance.Button;
+            DisableButton.FlatStyle = FlatStyle.System;
+            DisableButton.TextAlign = ContentAlignment.MiddleCenter;
+            DisableButton.Size = WriteButton.Size;
+            DisableButton.Top = WriteButton.Top;
 
             SetButtonDefaults();
         }
 
         private void SetButtonDefaults()
         {
-            ToggleButton.Checked = LastToggleChecked;
-
-            ToggleButton.Font = DefaultButtonFont;
-            ToggleButton.Text = ToggleButton.Checked ? "Disable" : "Enable";
-            ToggleButton.Update();
+            DisableButton.Font = DefaultButtonFont;
+            DisableButton.Text = "Disable";
+            DisableButton.Enabled = true;
+            DisableButton.Update();
 
             WriteButton.Font = DefaultButtonFont;
             WriteButton.Text = Constants.WriteButtonDefaultText;
-            WriteButton.Enabled = ToggleButton.Checked || !ToggleButton.Enabled;
+            WriteButton.Enabled = true;
             WriteButton.Update();
         }
 
         private void OnScaleMenuItemClick(object sender, EventArgs e)
         {
-            UpdateGraph(Settings.RawAccelSettings.AccelerationSettings);
+            UpdateGraph();
         }
 
         private void OnWriteButtonClick(object sender, EventArgs e)
@@ -247,24 +221,16 @@ namespace grapher
             UpdateActiveSettingsFromFields();
         }
 
-        private void OnToggleButtonClick(object sender, EventArgs e)
+        private void DisableDriverEventHandler(object sender, EventArgs e)
         {
-            var accel = ToggleButton.Checked ?
-                new ManagedAccel(Settings.RawAccelSettings.AccelerationSettings) :
-                AccelTypeOptions.DefaultSettings;
-
-            LastToggleChecked = ToggleButton.Checked;
-            ButtonDelay(ToggleButton);
-
-            SettingsManager.SendToDriver(accel);
-            Settings.ActiveAccel = accel;
-            RefreshOnRead(accel.Settings);
+            ButtonDelay(DisableButton);
+            Settings.DisableDriver();
+            RefreshActive();
         }
 
         private void OnButtonTimerTick(object sender, EventArgs e)
         {
             ButtonTimer.Stop();
-            ToggleButton.Enabled = SettingsNotDefault;
             SetButtonDefaults();
         }
 
@@ -276,15 +242,13 @@ namespace grapher
 
         private void ButtonDelay(ButtonBase btn)
         {
-            ToggleButton.Checked = false;
-
-            ToggleButton.Enabled = false;
+            DisableButton.Enabled = false;
             WriteButton.Enabled = false;
 
             btn.Font = SmallButtonFont;
             btn.Text = $"{Constants.ButtonDelayText} : {ButtonTimerInterval} ms";
 
-            ToggleButton.Update();
+            DisableButton.Update();
             WriteButton.Update();
 
             StartButtonTimer();
diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs
index 163829f..c5c2ae5 100644
--- a/grapher/Models/Mouse/MouseWatcher.cs
+++ b/grapher/Models/Mouse/MouseWatcher.cs
@@ -772,8 +772,8 @@ namespace grapher.Models.Mouse
 
                 // strip negative directional multipliers, charts calculated from positive input
 
-                Vec2<double> dirMults = SettingsManager.RawAccelSettings
-                    .AccelerationSettings.directionalMultipliers;
+                Vec2<double> dirMults = SettingsManager.ActiveSettings.baseSettings
+                    .directionalMultipliers;
 
                 if (dirMults.x > 0 && x < 0)
                 {
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 7e2e3d7..556f969 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -17,13 +17,14 @@ namespace grapher
             new LinearLayout(),
             new ClassicLayout(),
             new NaturalLayout(),
+            new JumpLayout(),
             new PowerLayout(),
             new MotivityLayout(),
             new OffLayout(),
             new LUTLayout(),
         }.ToDictionary(k => k.Name);
 
-        public static readonly ManagedAccel DefaultSettings = new ManagedAccel();
+        public static readonly AccelArgs DefaultArgs = new DriverSettings().args.x;
 
         #endregion Fields
 
@@ -233,22 +234,18 @@ namespace grapher
 
         public void SetArgs(ref AccelArgs args)
         {
-            AccelArgs defaults = DefaultSettings.Settings.args.x;
-            args.accelClassic = defaults.accelClassic;
-            args.accelMotivity = defaults.accelMotivity;
-            args.accelNatural = defaults.accelClassic;
-            args.scale = Scale.Visible ? Scale.Field.Data : defaults.scale;
-            args.cap = Cap.Visible ? Cap.SensitivityCap : defaults.cap;
-            args.limit = Limit.Visible ? Limit.Field.Data : defaults.limit;
-            args.exponent = Exponent.Visible ? Exponent.Field.Data : defaults.exponent;
-            args.offset = Offset.Visible ? Offset.Offset : defaults.offset;
-            args.midpoint = Midpoint.Visible ? Midpoint.Field.Data : defaults.midpoint;
-            args.weight = Weight.Visible ? Weight.Field.Data : defaults.weight;
+            if (Scale.Visible) args.scale = Scale.Field.Data;
+            if (Cap.Visible) args.cap = Cap.SensitivityCap;
+            if (Limit.Visible) args.limit = Limit.Field.Data;
+            if (Exponent.Visible) args.exponent = Exponent.Field.Data;
+            if (Offset.Visible) args.offset = Offset.Offset;
+            if (Midpoint.Visible) args.midpoint = Midpoint.Field.Data;
+            if (Weight.Visible) args.weight = Weight.Field.Data;
         }
 
         public AccelArgs GenerateArgs()
         {
-            AccelArgs args = new AccelArgs();
+            AccelArgs args = new DriverSettings().args.x;
             SetArgs(ref args);
             return args;
         }
diff --git a/grapher/Models/Serialized/GUISettings.cs b/grapher/Models/Serialized/GUISettings.cs
index bb35055..93d56de 100644
--- a/grapher/Models/Serialized/GUISettings.cs
+++ b/grapher/Models/Serialized/GUISettings.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.IO;
 
 namespace grapher.Models.Serialized
 {
@@ -65,6 +66,32 @@ namespace grapher.Models.Serialized
                 AutoWriteToDriverOnStartup.GetHashCode();
         }
 
+        public void Save()
+        {
+            File.WriteAllText(Constants.GuiConfigFileName, JsonConvert.SerializeObject(this));
+        }
+
+        public static GUISettings MaybeLoad()
+        {
+            GUISettings settings = null;
+
+            try
+            {
+                settings = JsonConvert.DeserializeObject<GUISettings>(
+                    File.ReadAllText(Constants.GuiConfigFileName));
+            }
+            catch (Exception ex)
+            {
+                if (!(ex is JsonException || ex is FileNotFoundException))
+                {
+                    throw;
+                }
+            }
+
+            return settings;
+        }
+
         #endregion Methods
+
     }
 }
diff --git a/grapher/Models/Serialized/LookupTable.cs b/grapher/Models/Serialized/LookupTable.cs
deleted file mode 100644
index d373461..0000000
--- a/grapher/Models/Serialized/LookupTable.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace grapher.Models.Serialized
-{
-    [Serializable]
-    public static class LookupTable
-    {
-        public static void Deserialize(string lutFile, ref DriverSettings settings)
-        {
-            if (!File.Exists(lutFile))
-            {
-                throw new Exception($"LUT file does not exist at {lutFile}.");
-            }
-
-            JObject lutJObject = JObject.Parse(File.ReadAllText(lutFile));
-
-            var spacedLut = lutJObject.ToObject<SpacedTable>(JsonSerializer.Create(RawAccelSettings.SerializerSettings));
-
-            if (spacedLut is null)
-            {
-                var arbitraryLut = lutJObject.ToObject<ArbitraryTable>(JsonSerializer.Create(RawAccelSettings.SerializerSettings));
-
-                if (arbitraryLut is null || arbitraryLut.points is null)
-                {
-                    throw new Exception($"{lutFile} does not contain valid lookuptable json.");
-                }
-
-                settings.ArbitraryTable = arbitraryLut;
-                settings.args.x.lutArgs.type = TableType.arbitrary;
-            }
-            else
-            {
-                if (spacedLut.points is null)
-                {
-                    throw new Exception($"{lutFile} does not contain valid lookuptable json.");
-                }
-
-                settings.SpacedTable = spacedLut;
-                settings.args.x.lutArgs = spacedLut.args;
-            }
-        }
-    }
-}
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
deleted file mode 100644
index dc4eb0a..0000000
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.IO;
-using System.Linq;
-
-namespace grapher.Models.Serialized
-{
-    [Serializable]
-    public class RawAccelSettings
-    {
-        #region Fields
-
-        public static readonly string ExecutingDirectory = AppDomain.CurrentDomain.BaseDirectory;
-        public static readonly string DefaultSettingsFile = Path.Combine(ExecutingDirectory, Constants.DefaultSettingsFileName);
-        public static readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings
-        {
-            MissingMemberHandling = MissingMemberHandling.Ignore,
-        };
-        #endregion Fields
-
-        #region Constructors
-
-        public RawAccelSettings() { }
-
-        public RawAccelSettings(
-            DriverSettings accelSettings,
-            GUISettings guiSettings)
-        {
-            AccelerationSettings = accelSettings;
-            GUISettings = guiSettings;
-        }
-
-        #endregion Constructors
-
-        #region Properties
-        [JsonProperty(Required = Required.Always)]
-        public GUISettings GUISettings { get; set; }
-
-        [JsonProperty(DriverSettings.Key, Required = Required.Always)]
-        public DriverSettings AccelerationSettings { get; set; }
-
-        #endregion Properties
-
-        #region Methods
-
-        public static RawAccelSettings Load(Func<GUISettings> DefaultGUISettingsSupplier)
-        {
-            return Load(DefaultSettingsFile, DefaultGUISettingsSupplier);
-        }
-
-        public static RawAccelSettings Load(string file, Func<GUISettings> DefaultGUISettingsSupplier)
-        {   
-            try
-            {
-                RawAccelSettings settings = null;
-
-                JObject settingsJObject = JObject.Parse(File.ReadAllText(file));
-                if (settingsJObject.ContainsKey(DriverSettings.Key))
-                {
-                    settings = settingsJObject.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings));
-                }
-                else
-                {
-                    settings = new RawAccelSettings
-                    {
-                        AccelerationSettings = settingsJObject.ToObject<DriverSettings>(),
-                        GUISettings = DefaultGUISettingsSupplier()
-                    };
-                }
-
-                if (settings is null || settings.AccelerationSettings is null)
-                {
-                    throw new JsonException($"{file} contains invalid JSON");
-                }
-
-                return settings;
-            }
-            catch (FileNotFoundException e)
-            {
-                throw new FileNotFoundException($"Settings file does not exist at {file}", e);
-            }
-            catch (JsonException e)
-            {
-                throw new JsonException($"Settings file at {file} does not contain valid Raw Accel Settings.", e);
-            }
-        }
-
-        public static bool Exists()
-        {
-            return Exists(DefaultSettingsFile);
-        }
-
-        public static bool Exists(string file)
-        {
-            return File.Exists(file);
-        }
-
-        public void Save()
-        {
-            Save(DefaultSettingsFile);
-        }
-
-        public void Save(string file)
-        {
-            JObject thisJO = JObject.FromObject(this);
-            AddComments(thisJO);
-            File.WriteAllText(file, thisJO.ToString(Formatting.Indented));
-        }
-
-        private void AddComments(JObject thisJO)
-        {
-            string modes = string.Join(" | ", Enum.GetNames(typeof(AccelMode)));
-            ((JObject)thisJO[DriverSettings.Key])
-                .AddFirst(new JProperty("### Mode Types ###", modes));
-        }
-
-        public bool IsDefaultEquivalent()
-        {
-            return IsDefaultEquivalent(AccelerationSettings);
-        }
-
-        public static bool IsDefaultEquivalent(DriverSettings accelSettings)
-        {
-            bool wholeOrNoY = accelSettings.combineMagnitudes ||
-                accelSettings.args.y.mode == AccelMode.noaccel;
-
-            return string.IsNullOrEmpty(accelSettings.deviceID) &&
-                accelSettings.sensitivity.x == 1 &&
-                accelSettings.sensitivity.y == 1 &&
-                accelSettings.directionalMultipliers.x <= 0 &&
-                accelSettings.directionalMultipliers.y <= 0 &&
-                accelSettings.rotation == 0 &&
-                accelSettings.snap == 0 &&
-                accelSettings.args.x.mode == AccelMode.noaccel &&
-                wholeOrNoY;
-        }
-
-        #endregion Methods
-    }
-}
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 25aa534..c0cc413 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.IO;
 using System.Windows.Forms;
 using System.Threading;
 using System.Text;
@@ -21,22 +22,41 @@ namespace grapher.Models.Serialized
             ToolStripMenuItem showVelocityAndGain,
             DeviceIDManager deviceIDManager)
         {
-            ActiveAccel = activeAccel;
             DpiField = dpiField;
             PollRateField = pollRateField;
             AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
             DeviceIDManager = deviceIDManager;
+
+            SetActiveFields(activeAccel);
+
+            GuiSettings = GUISettings.MaybeLoad();
+
+            if (GuiSettings is null)
+            {
+                GuiSettings = MakeGUISettingsFromFields();
+                GuiSettings.Save();
+            }
+            else
+            {
+                UpdateFieldsFromGUISettings();
+            }
+
+            UserSettings = InitUserSettings();
         }
 
         #endregion Constructors
 
         #region Properties
 
-        public ManagedAccel ActiveAccel { get; set; }
+        public GUISettings GuiSettings { get; private set; }
+
+        public ManagedAccel ActiveAccel { get; private set; }
+
+        public ExtendedSettings ActiveSettings { get; private set; }
 
-        public RawAccelSettings RawAccelSettings { get; private set; }
+        public DriverSettings UserSettings { get; private set; }
 
         public Field DpiField { get; private set; }
 
@@ -53,47 +73,54 @@ namespace grapher.Models.Serialized
         #endregion Properties
 
         #region Methods
-        public SettingsErrors TryUpdateActiveSettings(DriverSettings settings)
-        {
-            var errors = TryUpdateAccel(settings);
-
-            if (errors.Empty())
-            {
-                RawAccelSettings.AccelerationSettings = settings;
-                RawAccelSettings.GUISettings = MakeGUISettingsFromFields();
-                RawAccelSettings.Save();
-            }
 
-            return errors;
+        public void DisableDriver()
+        {
+            var defaultSettings = new ExtendedSettings();
+            ActiveSettings = defaultSettings;
+            ActiveAccel.Settings = defaultSettings;
+            new Thread(() => ActiveAccel.Activate()).Start();
         }
 
         public void UpdateFieldsFromGUISettings()
         {
-            DpiField.SetToEntered(RawAccelSettings.GUISettings.DPI);
-            PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
-            ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove;
-            ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain;
-            AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
+            DpiField.SetToEntered(GuiSettings.DPI);
+            PollRateField.SetToEntered(GuiSettings.PollRate);
+            ShowLastMouseMoveMenuItem.Checked = GuiSettings.ShowLastMouseMove;
+            ShowVelocityAndGainMoveMenuItem.Checked = GuiSettings.ShowVelocityAndGain;
+            AutoWriteMenuItem.Checked = GuiSettings.AutoWriteToDriverOnStartup;
         }
 
-        public SettingsErrors TryUpdateAccel(DriverSettings settings)
+        public SettingsErrors TryActivate(DriverSettings settings)
         {
-            var accel = new ManagedAccel(settings);
-            var errors = SendToDriverSafe(accel);
-            if (errors.Empty()) ActiveAccel= accel;
-            return errors;
-        }
+            var errors = new SettingsErrors(settings);
 
-        public static void SendToDriver(ManagedAccel accel)
-        {
-            new Thread(() => accel.Activate()).Start();
+            if (errors.Empty())
+            {
+                GuiSettings = MakeGUISettingsFromFields();
+                GuiSettings.Save();
+
+                UserSettings = settings;
+                File.WriteAllText(Constants.DefaultSettingsFileName, RaConvert.Settings(settings));
+
+                ActiveSettings = new ExtendedSettings(settings);
+                ActiveAccel.Settings = ActiveSettings;
+
+                new Thread(() => ActiveAccel.Activate()).Start();
+            }
+
+            return errors;
         }
 
-        public static SettingsErrors SendToDriverSafe(ManagedAccel accel)
+        public void SetHiddenOptions(DriverSettings settings)
         {
-            var errors = new SettingsErrors(accel.Settings);
-            if (errors.Empty()) SendToDriver(accel);
-            return errors;
+            settings.snap = UserSettings.snap;
+            settings.maximumSpeed = UserSettings.maximumSpeed;
+            settings.minimumSpeed = UserSettings.minimumSpeed;
+            settings.minimumTime = UserSettings.minimumTime;
+            settings.maximumTime = UserSettings.maximumTime;
+            settings.ignore = UserSettings.ignore;
+            settings.directionalMultipliers = UserSettings.directionalMultipliers;
         }
 
         public GUISettings MakeGUISettingsFromFields()
@@ -108,32 +135,51 @@ namespace grapher.Models.Serialized
             };
         }
 
-        // Returns true when file settings are active
-        public bool Startup()
+        public bool TableActive()
+        {
+            return ActiveSettings.tables.x != null || ActiveSettings.tables.y != null;
+        }
+
+        public void SetActiveFields(ManagedAccel activeAccel)
         {
-            if (RawAccelSettings.Exists())
+            ActiveAccel = activeAccel;
+            ActiveSettings = activeAccel.Settings;
+        }
+
+        private DriverSettings InitUserSettings()
+        {
+            var path = Constants.DefaultSettingsFileName;
+            if (File.Exists(path))
             {
                 try
                 {
-                    RawAccelSettings = RawAccelSettings.Load(() => MakeGUISettingsFromFields());
-                    UpdateFieldsFromGUISettings();
-                    if (RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup)
+                    DriverSettings settings = RaConvert.Settings(File.ReadAllText(path));
+
+                    if (!GuiSettings.AutoWriteToDriverOnStartup || 
+                        TableActive() || 
+                        TryActivate(settings).Empty())
                     {
-                        TryUpdateAccel(RawAccelSettings.AccelerationSettings);
+                        return settings;
                     }
-                    return RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;
+
                 }
                 catch (JsonException e)
                 {
-                    Console.WriteLine($"bad settings: {e}");
+                    System.Diagnostics.Debug.WriteLine($"bad settings: {e}");
                 }
             }
 
-            RawAccelSettings = new RawAccelSettings(
-                ManagedAccel.GetActive().Settings,
-                MakeGUISettingsFromFields());
-            RawAccelSettings.Save();
-            return true;
+            if (!TableActive())
+            {
+                File.WriteAllText(path, RaConvert.Settings(ActiveSettings.baseSettings));
+                return ActiveSettings.baseSettings;
+            }
+            else
+            {
+                var defaultSettings = new DriverSettings();
+                File.WriteAllText(path, RaConvert.Settings(defaultSettings));
+                return defaultSettings;
+            }
         }
 
         #endregion Methods