Add sixaxis max zone setting

DS4Windows/DS4Control/Mapping.cs

@@ -872,21 +872,26 @@ namespace DS4Windows
             bool sOff = tempBool = isUsingSAforMouse(device);
             if (sOff == false)
             {
-                double SXD = 10 * getSXDeadzone(device);
+                int SXD = (int)(10d * getSXDeadzone(device));
-                double SZD = 10 * getSZDeadzone(device);
+                int SZD = (int)(10d * getSZDeadzone(device));
+                double SXMax = getSXMaxzone(device);
+                double SZMax = getSZMaxzone(device);
                 double sxsens = getSXSens(device);
                 double szsens = getSZSens(device);
 
                 int gyroX = cState.Motion.accelX;
                 int gyroZ = cState.Motion.accelZ;
 
-                if (SXD > 0.0)
-                {
                 int absx = Math.Abs(gyroX);
+                int absz = Math.Abs(gyroZ);
+
+                if (SXD > 0 || SXMax < 1.0)
+                {
+                    int maxValue = (int)(SXMax * 128d);
                     if (absx > SXD)
                     {
                         cState.Motion.accelX = Math.Sign(gyroX) *
-                            (int)Math.Min(128, sxsens * 128 * ((absx - SXD) / (128 - SXD)));
+                            (int)Math.Min(128d, sxsens * 128d * ((absx - SXD) / (double)(maxValue - SXD)));
                     }
                     else
                     {
@@ -895,18 +900,17 @@ namespace DS4Windows
                 }
                 else
                 {
-                    int absx = Math.Abs(gyroX);
                     cState.Motion.accelX = Math.Sign(gyroX) *
-                        (int)Math.Min(128, sxsens * 128 * (absx / (double)(128)));
+                        (int)Math.Min(128d, sxsens * 128d * (absx / 128d));
                 }
 
-                if (SZD > 0.0)
+                if (SZD > 0 || SZMax < 1.0)
                 {
-                    int absz = Math.Abs(gyroZ);
+                    int maxValue = (int)(SZMax * 128d);
                     if (absz > SZD)
                     {
                         cState.Motion.accelZ = Math.Sign(gyroZ) *
-                            (int)Math.Min(128, szsens * 128 * ((absz - SZD) / (128 - SZD)));
+                            (int)Math.Min(128d, szsens * 128d * ((absz - SZD) / (double)(maxValue - SZD)));
                     }
                     else
                     {
@@ -915,9 +919,8 @@ namespace DS4Windows
                 }
                 else
                 {
-                    int absz = Math.Abs(gyroZ);
                     cState.Motion.accelZ = Math.Sign(gyroZ) *
-                        (int)Math.Min(128, szsens * 128 * ((absz) / (double)(128)));
+                        (int)Math.Min(128d, szsens * 128d * ((absz) / 128d));
                 }
             }
 

DS4Windows/DS4Control/ScpUtil.cs

@@ -696,6 +696,18 @@ namespace DS4Windows
             return m_Config.SZDeadzone[index];
         }
 
+        public static double[] SXMaxzone => m_Config.SXMaxzone;
+        public static double getSXMaxzone(int index)
+        {
+            return m_Config.SXMaxzone[index];
+        }
+
+        public static double[] SZMaxzone => m_Config.SZMaxzone;
+        public static double getSZMaxzone(int index)
+        {
+            return m_Config.SZMaxzone[index];
+        }
+
         public static int[] LSDeadzone => m_Config.LSDeadzone;
         public static int getLSDeadzone(int index)
         {
@@ -1170,6 +1182,8 @@ namespace DS4Windows
         public int[] l2Maxzone = { 100, 100, 100, 100, 100 }, r2Maxzone = { 100, 100, 100, 100, 100 };
         public double[] LSRotation = { 0.0, 0.0, 0.0, 0.0, 0.0 }, RSRotation = { 0.0, 0.0, 0.0, 0.0, 0.0 };
         public double[] SXDeadzone = { 0.25, 0.25, 0.25, 0.25, 0.25 }, SZDeadzone = { 0.25, 0.25, 0.25, 0.25, 0.25 };
+        public double[] SXMaxzone = new double[5] { 1.0, 1.0, 1.0, 1.0, 1.0 },
+            SZMaxzone = new double[5] { 1.0, 1.0, 1.0, 1.0, 1.0 };
         public double[] l2Sens = { 1, 1, 1, 1, 1 }, r2Sens = { 1, 1, 1, 1, 1 };
         public double[] LSSens = { 1, 1, 1, 1, 1 }, RSSens = { 1, 1, 1, 1, 1 };
         public double[] SXSens = { 1, 1, 1, 1, 1 }, SZSens = { 1, 1, 1, 1, 1 };
@@ -1480,6 +1494,9 @@ namespace DS4Windows
                 XmlNode xmlSXD = m_Xdoc.CreateNode(XmlNodeType.Element, "SXDeadZone", null); xmlSXD.InnerText = SXDeadzone[device].ToString(); Node.AppendChild(xmlSXD);
                 XmlNode xmlSZD = m_Xdoc.CreateNode(XmlNodeType.Element, "SZDeadZone", null); xmlSZD.InnerText = SZDeadzone[device].ToString(); Node.AppendChild(xmlSZD);
 
+                XmlNode xmlSXMaxzone = m_Xdoc.CreateNode(XmlNodeType.Element, "SXMaxZone", null); xmlSXMaxzone.InnerText = Convert.ToInt32(SXMaxzone[device] * 100.0).ToString(); Node.AppendChild(xmlSXMaxzone);
+                XmlNode xmlSZMaxzone = m_Xdoc.CreateNode(XmlNodeType.Element, "SZMaxZone", null); xmlSZMaxzone.InnerText = Convert.ToInt32(SZMaxzone[device] * 100.0).ToString(); Node.AppendChild(xmlSZMaxzone);
+
                 XmlNode xmlSens = m_Xdoc.CreateNode(XmlNodeType.Element, "Sensitivity", null);
                 xmlSens.InnerText = $"{LSSens[device]}|{RSSens[device]}|{l2Sens[device]}|{r2Sens[device]}|{SXSens[device]}|{SZSens[device]}";
                 Node.AppendChild(xmlSens);
@@ -2281,9 +2298,23 @@ namespace DS4Windows
                 catch { RSMaxzone[device] = 100; missingSetting = true; }
 
                 try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/SXDeadZone"); double.TryParse(Item.InnerText, out SXDeadzone[device]); }
-                catch { missingSetting = true; }
+                catch { SXDeadzone[device] = 0.25; missingSetting = true; }
                 try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/SZDeadZone"); double.TryParse(Item.InnerText, out SZDeadzone[device]); }
-                catch { missingSetting = true; }
+                catch { SZDeadzone[device] = 0.25; missingSetting = true; }
+
+                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/SXMaxZone");
+                    int temp = 0;
+                    int.TryParse(Item.InnerText, out temp);
+                    SXMaxzone[device] = Math.Min(Math.Max(temp * 0.01, 0.0), 1.0);
+                }
+                catch { SXMaxzone[device] = 1.0; missingSetting = true; }
+
+                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/SZMaxZone");
+                    int temp = 0;
+                    int.TryParse(Item.InnerText, out temp);
+                    SZMaxzone[device] = Math.Min(Math.Max(temp * 0.01, 0.0), 1.0);
+                }
+                catch { SZMaxzone[device] = 1.0; missingSetting = true; }
 
                 try
                 {
@@ -3465,6 +3496,7 @@ namespace DS4Windows
             LSRotation[device] = 0.0;
             RSRotation[device] = 0.0;
             SXDeadzone[device] = SZDeadzone[device] = 0.25;
+            SXMaxzone[device] = SZMaxzone[device] = 1.0;
             l2Sens[device] = r2Sens[device] = 1;
             LSSens[device] = RSSens[device] = 1;
             SXSens[device] = SZSens[device] = 1;

DS4Windows/DS4Forms/Options.Designer.cs

@@ -294,6 +294,8 @@
             this.rBSAControls = new System.Windows.Forms.RadioButton();
             this.rBSAMouse = new System.Windows.Forms.RadioButton();
             this.pnlSAMouse = new System.Windows.Forms.Panel();
+            this.cBGyroMouseXAxis = new System.Windows.Forms.ComboBox();
+            this.label16 = new System.Windows.Forms.Label();
             this.lbGyroSmooth = new System.Windows.Forms.Label();
             this.cBGyroSmooth = new System.Windows.Forms.CheckBox();
             this.lbSmoothWeight = new System.Windows.Forms.Label();
@@ -343,9 +345,11 @@
             this.shareToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.alwaysOnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.label17 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.nUDSixAxisXMaxZone = new System.Windows.Forms.NumericUpDown();
+            this.nUDSixAxisZMaxZone = new System.Windows.Forms.NumericUpDown();
             this.advColorDialog = new DS4Windows.AdvancedColorDialog();
-            this.label16 = new System.Windows.Forms.Label();
-            this.cBGyroMouseXAxis = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tBGreenBar)).BeginInit();
@@ -433,6 +437,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.nUDSXS)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).BeginInit();
             this.cMGyroTriggers.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDSixAxisXMaxZone)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDSixAxisZMaxZone)).BeginInit();
             this.SuspendLayout();
             // 
             // lowColorChooserButton
@@ -2792,6 +2798,10 @@
             // 
             // maxZoneTabPage
             // 
+            this.maxZoneTabPage.Controls.Add(this.nUDSixAxisZMaxZone);
+            this.maxZoneTabPage.Controls.Add(this.nUDSixAxisXMaxZone);
+            this.maxZoneTabPage.Controls.Add(this.label18);
+            this.maxZoneTabPage.Controls.Add(this.label17);
             this.maxZoneTabPage.Controls.Add(this.nUDR2Maxzone);
             this.maxZoneTabPage.Controls.Add(this.nUDL2Maxzone);
             this.maxZoneTabPage.Controls.Add(this.label8);
@@ -3127,6 +3137,22 @@
             resources.ApplyResources(this.pnlSAMouse, "pnlSAMouse");
             this.pnlSAMouse.Name = "pnlSAMouse";
             // 
+            // cBGyroMouseXAxis
+            // 
+            this.cBGyroMouseXAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cBGyroMouseXAxis.FormattingEnabled = true;
+            this.cBGyroMouseXAxis.Items.AddRange(new object[] {
+            resources.GetString("cBGyroMouseXAxis.Items"),
+            resources.GetString("cBGyroMouseXAxis.Items1")});
+            resources.ApplyResources(this.cBGyroMouseXAxis, "cBGyroMouseXAxis");
+            this.cBGyroMouseXAxis.Name = "cBGyroMouseXAxis";
+            this.cBGyroMouseXAxis.SelectedIndexChanged += new System.EventHandler(this.cBGyroMouseXAxis_SelectedIndexChanged);
+            // 
+            // label16
+            // 
+            resources.ApplyResources(this.label16, "label16");
+            this.label16.Name = "label16";
+            // 
             // lbGyroSmooth
             // 
             resources.ApplyResources(this.lbGyroSmooth, "lbGyroSmooth");
@@ -3653,21 +3679,59 @@
             resources.ApplyResources(this.alwaysOnToolStripMenuItem, "alwaysOnToolStripMenuItem");
             this.alwaysOnToolStripMenuItem.CheckedChanged += new System.EventHandler(this.SATrigger_CheckedChanged);
             // 
-            // label16
+            // label17
             // 
-            resources.ApplyResources(this.label16, "label16");
+            resources.ApplyResources(this.label17, "label17");
-            this.label16.Name = "label16";
+            this.label17.Name = "label17";
             // 
-            // cBGyroMouseXAxis
+            // label18
             // 
-            this.cBGyroMouseXAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            resources.ApplyResources(this.label18, "label18");
-            this.cBGyroMouseXAxis.FormattingEnabled = true;
+            this.label18.Name = "label18";
-            this.cBGyroMouseXAxis.Items.AddRange(new object[] {
+            // 
-            resources.GetString("cBGyroMouseXAxis.Items"),
+            // nUDSixAxisXMaxZone
-            resources.GetString("cBGyroMouseXAxis.Items1")});
+            // 
-            resources.ApplyResources(this.cBGyroMouseXAxis, "cBGyroMouseXAxis");
+            this.nUDSixAxisXMaxZone.DecimalPlaces = 2;
-            this.cBGyroMouseXAxis.Name = "cBGyroMouseXAxis";
+            this.nUDSixAxisXMaxZone.Increment = new decimal(new int[] {
-            this.cBGyroMouseXAxis.SelectedIndexChanged += new System.EventHandler(this.cBGyroMouseXAxis_SelectedIndexChanged);
+            1,
+            0,
+            0,
+            65536});
+            resources.ApplyResources(this.nUDSixAxisXMaxZone, "nUDSixAxisXMaxZone");
+            this.nUDSixAxisXMaxZone.Maximum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDSixAxisXMaxZone.Name = "nUDSixAxisXMaxZone";
+            this.nUDSixAxisXMaxZone.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDSixAxisXMaxZone.ValueChanged += new System.EventHandler(this.nUDSixAxisXMaxZone_ValueChanged);
+            // 
+            // nUDSixAxisZMaxZone
+            // 
+            this.nUDSixAxisZMaxZone.DecimalPlaces = 2;
+            this.nUDSixAxisZMaxZone.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+            resources.ApplyResources(this.nUDSixAxisZMaxZone, "nUDSixAxisZMaxZone");
+            this.nUDSixAxisZMaxZone.Maximum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDSixAxisZMaxZone.Name = "nUDSixAxisZMaxZone";
+            this.nUDSixAxisZMaxZone.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDSixAxisZMaxZone.ValueChanged += new System.EventHandler(this.nUDSixAxisZMaxZone_ValueChanged);
             // 
             // Options
             // 
@@ -3786,6 +3850,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.nUDSXS)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).EndInit();
             this.cMGyroTriggers.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.nUDSixAxisXMaxZone)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDSixAxisZMaxZone)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -4110,5 +4176,9 @@
         private System.Windows.Forms.ComboBox touchpadInvertComboBox;
         private System.Windows.Forms.ComboBox cBGyroMouseXAxis;
         private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.NumericUpDown nUDSixAxisZMaxZone;
+        private System.Windows.Forms.NumericUpDown nUDSixAxisXMaxZone;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.Label label17;
     }
 }

DS4Windows/DS4Forms/Options.cs

@@ -497,6 +497,7 @@ namespace DS4Windows
                 {
                     nUDSX.Value = 0.25m;
                 }
+
                 try
                 {
                     nUDSZ.Value = (decimal)SZDeadzone[device];
@@ -505,6 +506,25 @@ namespace DS4Windows
                 {
                     nUDSZ.Value = 0.25m;
                 }
+
+                try
+                {
+                    nUDSixAxisXMaxZone.Value = (decimal)SXMaxzone[device];
+                }
+                catch
+                {
+                    nUDSixAxisXMaxZone.Value = 1.0m;
+                }
+
+                try
+                {
+                    nUDSixAxisZMaxZone.Value = (decimal)SZMaxzone[device];
+                }
+                catch
+                {
+                    nUDSixAxisZMaxZone.Value = 1.0m;
+                }
+
                 try
                 {
                     nUDL2S.Value = Math.Round((decimal)L2Sens[device], 2);
@@ -677,6 +697,8 @@ namespace DS4Windows
                 nUDRSRotation.Value = 0;
                 nUDSX.Value = .25m;
                 nUDSZ.Value = .25m;
+                nUDSixAxisXMaxZone.Value = 1.0m;
+                nUDSixAxisZMaxZone.Value = 1.0m;
 
                 nUDL2S.Value = 1;
                 nUDR2S.Value = 1;
@@ -1335,6 +1357,8 @@ namespace DS4Windows
             FlashAt[device] = (int)nUDflashLED.Value;
             SXDeadzone[device] = (double)nUDSX.Value;
             SZDeadzone[device] = (double)nUDSZ.Value;
+            SXMaxzone[device] = (double)nUDSixAxisXMaxZone.Value;
+            SZMaxzone[device] = (double)nUDSixAxisZMaxZone.Value;
             MouseAccel[device] = cBMouseAccel.Checked;
             DinputOnly[device] = cBDinput.Checked;
             StartTouchpadOff[device] = cbStartTouchpadOff.Checked;
@@ -2920,6 +2944,22 @@ namespace DS4Windows
             }
         }
 
+        private void nUDSixAxisXMaxZone_ValueChanged(object sender, EventArgs e)
+        {
+            if (!loading)
+            {
+                SXMaxzone[device] = (double)nUDSixAxisXMaxZone.Value;
+            }
+        }
+
+        private void nUDSixAxisZMaxZone_ValueChanged(object sender, EventArgs e)
+        {
+            if (!loading)
+            {
+                SZMaxzone[device] = (double)nUDSixAxisZMaxZone.Value;
+            }
+        }
+
         private void Options_Resize(object sender, EventArgs e)
         {
             fLPSettings.AutoScroll = false;

DS4Windows/DS4Forms/Options.resx

@@ -1338,6 +1338,9 @@
   <data name="label15.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label15.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
     <value>141, 66</value>
   </data>
@@ -6337,11 +6340,113 @@ with profile</value>
   <data name="&gt;&gt;antiDeadzoneTabPage.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="nUDSixAxisZMaxZone.Location" type="System.Drawing.Point, System.Drawing">
+    <value>220, 29</value>
+  </data>
+  <data name="nUDSixAxisZMaxZone.Size" type="System.Drawing.Size, System.Drawing">
+    <value>40, 20</value>
+  </data>
+  <data name="nUDSixAxisZMaxZone.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisZMaxZone.Name" xml:space="preserve">
+    <value>nUDSixAxisZMaxZone</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisZMaxZone.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisZMaxZone.Parent" xml:space="preserve">
+    <value>maxZoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisZMaxZone.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="nUDSixAxisXMaxZone.Location" type="System.Drawing.Point, System.Drawing">
+    <value>220, 3</value>
+  </data>
+  <data name="nUDSixAxisXMaxZone.Size" type="System.Drawing.Size, System.Drawing">
+    <value>41, 20</value>
+  </data>
+  <data name="nUDSixAxisXMaxZone.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisXMaxZone.Name" xml:space="preserve">
+    <value>nUDSixAxisXMaxZone</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisXMaxZone.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisXMaxZone.Parent" xml:space="preserve">
+    <value>maxZoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;nUDSixAxisXMaxZone.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="label18.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label18.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
+    <value>162, 31</value>
+  </data>
+  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
+    <value>52, 13</value>
+  </data>
+  <data name="label18.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="label18.Text" xml:space="preserve">
+    <value>Sixaxis Z:</value>
+  </data>
+  <data name="&gt;&gt;label18.Name" xml:space="preserve">
+    <value>label18</value>
+  </data>
+  <data name="&gt;&gt;label18.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label18.Parent" xml:space="preserve">
+    <value>maxZoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label17.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label17.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label17.Location" type="System.Drawing.Point, System.Drawing">
+    <value>162, 6</value>
+  </data>
+  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
+    <value>52, 13</value>
+  </data>
+  <data name="label17.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="label17.Text" xml:space="preserve">
+    <value>Sixaxis X:</value>
+  </data>
+  <data name="&gt;&gt;label17.Name" xml:space="preserve">
+    <value>label17</value>
+  </data>
+  <data name="&gt;&gt;label17.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label17.Parent" xml:space="preserve">
+    <value>maxZoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="nUDR2Maxzone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>161, 29</value>
+    <value>114, 29</value>
   </data>
   <data name="nUDR2Maxzone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 20</value>
+    <value>40, 20</value>
   </data>
   <data name="nUDR2Maxzone.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -6356,13 +6461,13 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;nUDR2Maxzone.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>4</value>
   </data>
   <data name="nUDL2Maxzone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>42, 29</value>
+    <value>36, 29</value>
   </data>
   <data name="nUDL2Maxzone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 20</value>
+    <value>41, 20</value>
   </data>
   <data name="nUDL2Maxzone.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -6377,7 +6482,7 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;nUDL2Maxzone.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>5</value>
   </data>
   <data name="label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6386,7 +6491,7 @@ with profile</value>
     <value>NoControl</value>
   </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>129, 31</value>
+    <value>85, 31</value>
   </data>
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>24, 13</value>
@@ -6407,7 +6512,7 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>6</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6437,13 +6542,13 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>7</value>
   </data>
   <data name="nUDRSMaxZone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 3</value>
+    <value>114, 4</value>
   </data>
   <data name="nUDRSMaxZone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 20</value>
+    <value>40, 20</value>
   </data>
   <data name="nUDRSMaxZone.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -6458,7 +6563,7 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;nUDRSMaxZone.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>8</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6467,7 +6572,7 @@ with profile</value>
     <value>NoControl</value>
   </data>
   <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>129, 5</value>
+    <value>85, 5</value>
   </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>25, 13</value>
@@ -6488,13 +6593,13 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>9</value>
   </data>
   <data name="nUDLSMaxZone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>42, 3</value>
+    <value>37, 3</value>
   </data>
   <data name="nUDLSMaxZone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 20</value>
+    <value>40, 20</value>
   </data>
   <data name="nUDLSMaxZone.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -6509,7 +6614,7 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;nUDLSMaxZone.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>10</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -6539,7 +6644,7 @@ with profile</value>
     <value>maxZoneTabPage</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>11</value>
   </data>
   <data name="maxZoneTabPage.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
@@ -6937,6 +7042,9 @@ with profile</value>
   <data name="label14.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
     <value>125, 23</value>
   </data>
@@ -6985,6 +7093,9 @@ with profile</value>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
@@ -7156,6 +7267,9 @@ with profile</value>
   <data name="label16.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label16.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label16.Location" type="System.Drawing.Point, System.Drawing">
     <value>167, 74</value>
   </data>
@@ -7183,6 +7297,9 @@ with profile</value>
   <data name="lbGyroSmooth.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="lbGyroSmooth.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="lbGyroSmooth.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 145</value>
   </data>
@@ -8188,6 +8305,9 @@ with profile</value>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1011, 481</value>
   </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
   </data>
@@ -8492,7 +8612,7 @@ with profile</value>
     <value>advColorDialog</value>
   </data>
   <data name="&gt;&gt;advColorDialog.Type" xml:space="preserve">
-    <value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.84.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DS4Windows.AdvancedColorDialog, DS4Windows, Version=1.4.85.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Options</value>