From 187de539ea370210146c7f1bcf398c2a100f758f Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Tue, 6 Oct 2020 02:54:27 -0400
Subject: ease requirements for loading driver settings

gui settings are no longer needed

this covers edge case where interaccel converter
is used but the gui does not run until after reboot
---
 grapher/Models/Serialized/RawAccelSettings.cs | 29 ++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'grapher/Models/Serialized/RawAccelSettings.cs')

diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index 570a6c8..6f48d44 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -44,17 +44,36 @@ namespace grapher.Models.Serialized
 
         #region Methods
 
-        public static RawAccelSettings Load()
+        public static RawAccelSettings Load(Func<GUISettings> DefaultGUISettingsSupplier)
         {
-            return Load(DefaultSettingsFile);
+            return Load(DefaultSettingsFile, DefaultGUISettingsSupplier);
         }
 
-        public static RawAccelSettings Load(string file)
+        public static RawAccelSettings Load(string file, Func<GUISettings> DefaultGUISettingsSupplier)
         {   
             try
             {
-                var settings = JsonConvert.DeserializeObject<RawAccelSettings>(File.ReadAllText(file), SerializerSettings);
-                if (settings is null) throw new JsonException($"{file} contains invalid JSON");
+                RawAccelSettings settings = null;
+
+                JObject jo = JObject.Parse(File.ReadAllText(file));
+                if (jo.ContainsKey(DriverSettings.Key))
+                {
+                    settings = jo.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings));
+                }
+                else
+                {
+                    settings = new RawAccelSettings
+                    {
+                        AccelerationSettings = jo.ToObject<DriverSettings>(),
+                        GUISettings = DefaultGUISettingsSupplier()
+                    };
+                }
+
+                if (settings is null || settings.AccelerationSettings is null)
+                {
+                    throw new JsonException($"{file} contains invalid JSON");
+                }
+
                 return settings;
             }
             catch (FileNotFoundException e)
-- 
cgit v1.2.3


From 2be0106211cb4ce30036fc0c8e84ae70dff68c87 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Thu, 8 Oct 2020 02:07:56 -0400
Subject: add toggle button + save gui settings on close

remove option to disable write on startup
---
 grapher/Models/Serialized/RawAccelSettings.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'grapher/Models/Serialized/RawAccelSettings.cs')

diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index 6f48d44..e0362ff 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -115,6 +115,18 @@ namespace grapher.Models.Serialized
                 .AddFirst(new JProperty("### Mode Types ###", modes));
         }
 
+        public bool IsDefaultEquivalent()
+        {
+            bool wholeOrNoY = AccelerationSettings.combineMagnitudes ||
+                AccelerationSettings.modes.y == AccelMode.noaccel;
+
+            return AccelerationSettings.sensitivity.x == 1 &&
+                AccelerationSettings.sensitivity.y == 1 &&
+                AccelerationSettings.rotation == 0 &&
+                AccelerationSettings.modes.x == AccelMode.noaccel &&
+                wholeOrNoY;
+        }
+
         #endregion Methods
     }
 }
-- 
cgit v1.2.3


From a44294e7e689e43417323d6b1684f7462d113cb1 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Thu, 8 Oct 2020 22:53:31 -0400
Subject: improve comments, variable names

---
 grapher/Models/Serialized/RawAccelSettings.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'grapher/Models/Serialized/RawAccelSettings.cs')

diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index e0362ff..818bfb6 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -55,16 +55,16 @@ namespace grapher.Models.Serialized
             {
                 RawAccelSettings settings = null;
 
-                JObject jo = JObject.Parse(File.ReadAllText(file));
-                if (jo.ContainsKey(DriverSettings.Key))
+                JObject settingsJObject = JObject.Parse(File.ReadAllText(file));
+                if (settingsJObject.ContainsKey(DriverSettings.Key))
                 {
-                    settings = jo.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings));
+                    settings = settingsJObject.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings));
                 }
                 else
                 {
                     settings = new RawAccelSettings
                     {
-                        AccelerationSettings = jo.ToObject<DriverSettings>(),
+                        AccelerationSettings = settingsJObject.ToObject<DriverSettings>(),
                         GUISettings = DefaultGUISettingsSupplier()
                     };
                 }
-- 
cgit v1.2.3