Add anti-deadzone for L2 and R2. Tweak Options form.

2025-01-22 21:21:17 +01:00 · 2017-03-30 00:37:01 -07:00 · 2017-03-30 00:37:01 -07:00 · 550a860eaf
commit 550a860eaf
parent 90e487a2eb
5 changed files with 353 additions and 90 deletions
--- a/DS4Windows/DS4Control/Mapping.cs
+++ b/DS4Windows/DS4Control/Mapping.cs
@ -478,12 +478,17 @@ namespace DS4Windows
                            tempOutputY = ((dState.LY - 127.5f - tempLsYDead) / (double)(maxYValue - tempLsYDead));
                        }
                    }
+                    else
+                    {
+                        tempOutputX = ((dState.LX - 127.5f) / (double)(maxXValue));
+                        tempOutputY = ((dState.LY - 127.5f) / (double)(maxYValue));
+                    }

                    double tempLsXAntiDeadPercent = 0.0, tempLsYAntiDeadPercent = 0.0;
                    if (lsAntiDead > 0)
                    {
-                        tempLsXAntiDeadPercent = (lsAntiDead / 100.0) * Math.Abs(Math.Cos(r));
-                        tempLsYAntiDeadPercent = (lsAntiDead / 100.0) * Math.Abs(Math.Sin(r));
+                        tempLsXAntiDeadPercent = (lsAntiDead * 0.01) * Math.Abs(Math.Cos(r));
+                        tempLsYAntiDeadPercent = (lsAntiDead * 0.01) * Math.Abs(Math.Sin(r));
                    }

                    if (tempOutputX > 0.0)
@ -539,12 +544,17 @@ namespace DS4Windows
                            tempOutputY = ((dState.RY - 127.5f - tempRsYDead) / (double)(maxYValue - tempRsYDead));
                        }
                    }
+                    else
+                    {
+                        tempOutputX = ((dState.RX - 127.5f) / (double)(maxXValue));
+                        tempOutputY = ((dState.RY - 127.5f) / (double)(maxYValue));
+                    }

                    double tempRsXAntiDeadPercent = 0.0, tempRsYAntiDeadPercent = 0.0;
                    if (rsAntiDead > 0)
                    {
-                        tempRsXAntiDeadPercent = (rsAntiDead / 100.0) * Math.Abs(Math.Cos(r));
-                        tempRsYAntiDeadPercent = (rsAntiDead / 100.0) * Math.Abs(Math.Sin(r));
+                        tempRsXAntiDeadPercent = (rsAntiDead * 0.01) * Math.Abs(Math.Cos(r));
+                        tempRsYAntiDeadPercent = (rsAntiDead * 0.01) * Math.Abs(Math.Sin(r));
                    }

                    if (tempOutputX > 0.0)
@ -573,9 +583,38 @@ namespace DS4Windows
            }

            byte l2Deadzone = L2Deadzone[device];
-            if (l2Deadzone > 0)
+            int l2AntiDeadzone = L2AntiDeadzone[device];
+            if (l2Deadzone > 0 || l2AntiDeadzone > 0)
            {
-                if (cState.L2 > l2Deadzone)
+                double tempL2Output = (cState.L2 / 255.0);
+                double tempL2AntiDead = 0.0;
+                if (l2Deadzone > 0)
+                {
+                    if (cState.L2 > l2Deadzone)
+                    {
+                        tempL2Output = ((dState.L2 - l2Deadzone) / (double)(255 - l2Deadzone));
+                    }
+                    else
+                    {
+                        tempL2Output = 0.0;
+                    }
+                }
+
+                if (l2AntiDeadzone > 0)
+                {
+                    tempL2AntiDead = l2AntiDeadzone * 0.01;
+                }
+
+                if (tempL2Output > 0.0)
+                {
+                    dState.L2 = (byte)(((1.0 - tempL2AntiDead) * tempL2Output + tempL2AntiDead) * 255);
+                }
+                else
+                {
+                    dState.L2 = 0;
+                }
+
+                /*if (cState.L2 > l2Deadzone)
                {
                    dState.L2 = (byte)(((dState.L2 - l2Deadzone) / (double)(255 - l2Deadzone)) * 255);
                }
@ -583,14 +622,35 @@ namespace DS4Windows
                {
                    dState.L2 = 0;
                }
+                */
            }

            byte r2Deadzone = R2Deadzone[device];
-            if (r2Deadzone > 0)
+            int r2AntiDeadzone = R2AntiDeadzone[device];
+            if (r2Deadzone > 0 || r2AntiDeadzone > 0)
            {
-                if (cState.R2 > r2Deadzone)
+                double tempR2Output = (cState.R2 / 255.0);
+                double tempR2AntiDead = 0.0;
+                if (r2Deadzone > 0)
                {
-                    dState.R2 = (byte)(((dState.R2 - r2Deadzone) / (double)(255 - r2Deadzone)) * 255);
+                    if (cState.R2 > r2Deadzone)
+                    {
+                        tempR2Output = ((dState.R2 - r2Deadzone) / (double)(255 - r2Deadzone));
+                    }
+                    else
+                    {
+                        tempR2Output = 0.0;
+                    }
+                }
+
+                if (r2AntiDeadzone > 0)
+                {
+                    tempR2AntiDead = r2AntiDeadzone * 0.01;
+                }
+
+                if (tempR2Output > 0.0)
+                {
+                    dState.R2 = (byte)(((1.0 - tempR2AntiDead) * tempR2Output + tempR2AntiDead) * 255);
                }
                else
                {
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@ -358,6 +358,8 @@ namespace DS4Windows
        public static int[] RSDeadzone => m_Config.RSDeadzone;
        public static int[] LSAntiDeadzone => m_Config.LSAntiDeadzone;
        public static int[] RSAntiDeadzone => m_Config.RSAntiDeadzone;
+        public static int[] L2AntiDeadzone => m_Config.l2AntiDeadzone;
+        public static int[] R2AntiDeadzone => m_Config.r2AntiDeadzone;
        public static int[] LSCurve => m_Config.lsCurve;
        public static int[] RSCurve => m_Config.rsCurve;
        public static double[] L2Sens => m_Config.l2Sens;
@ -584,6 +586,7 @@ namespace DS4Windows
        public Byte[] l2Deadzone = { 0, 0, 0, 0, 0 }, r2Deadzone = { 0, 0, 0, 0, 0 };
        public int[] LSDeadzone = { 0, 0, 0, 0, 0 }, RSDeadzone = { 0, 0, 0, 0, 0 };
        public int[] LSAntiDeadzone = { 0, 0, 0, 0, 0 }, RSAntiDeadzone = { 0, 0, 0, 0, 0 };
+        public int[] l2AntiDeadzone = { 0, 0, 0, 0, 0 }, r2AntiDeadzone = { 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[] 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 };
@ -822,6 +825,8 @@ namespace DS4Windows
                XmlNode xmlScrollSensitivity = m_Xdoc.CreateNode(XmlNodeType.Element, "scrollSensitivity", null); xmlScrollSensitivity.InnerText = scrollSensitivity[device].ToString(); Node.AppendChild(xmlScrollSensitivity);
                XmlNode xmlLeftTriggerMiddle = m_Xdoc.CreateNode(XmlNodeType.Element, "LeftTriggerMiddle", null); xmlLeftTriggerMiddle.InnerText = l2Deadzone[device].ToString(); Node.AppendChild(xmlLeftTriggerMiddle);
                XmlNode xmlRightTriggerMiddle = m_Xdoc.CreateNode(XmlNodeType.Element, "RightTriggerMiddle", null); xmlRightTriggerMiddle.InnerText = r2Deadzone[device].ToString(); Node.AppendChild(xmlRightTriggerMiddle);
+                XmlNode xmlL2AD = m_Xdoc.CreateNode(XmlNodeType.Element, "L2AntiDeadZone", null); xmlL2AD.InnerText = l2AntiDeadzone[device].ToString(); Node.AppendChild(xmlL2AD);
+                XmlNode xmlR2AD = m_Xdoc.CreateNode(XmlNodeType.Element, "R2AntiDeadZone", null); xmlR2AD.InnerText = r2AntiDeadzone[device].ToString(); Node.AppendChild(xmlR2AD);
                XmlNode xmlButtonMouseSensitivity = m_Xdoc.CreateNode(XmlNodeType.Element, "ButtonMouseSensitivity", null); xmlButtonMouseSensitivity.InnerText = buttonMouseSensitivity[device].ToString(); Node.AppendChild(xmlButtonMouseSensitivity);
                XmlNode xmlRainbow = m_Xdoc.CreateNode(XmlNodeType.Element, "Rainbow", null); xmlRainbow.InnerText = rainbow[device].ToString(); Node.AppendChild(xmlRainbow);
                XmlNode xmlLSD = m_Xdoc.CreateNode(XmlNodeType.Element, "LSDeadZone", null); xmlLSD.InnerText = LSDeadzone[device].ToString(); Node.AppendChild(xmlLSD);
@ -1454,6 +1459,10 @@ namespace DS4Windows
                catch { missingSetting = true; }
                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/RightTriggerMiddle"); byte.TryParse(Item.InnerText, out r2Deadzone[device]); }
                catch { missingSetting = true; }
+                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/L2AntiDeadZone"); int.TryParse(Item.InnerText, out l2AntiDeadzone[device]); }
+                catch { missingSetting = true; }
+                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/R2AntiDeadZone"); int.TryParse(Item.InnerText, out r2AntiDeadzone[device]); }
+                catch { missingSetting = true; }
                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/ButtonMouseSensitivity"); int.TryParse(Item.InnerText, out buttonMouseSensitivity[device]); }
                catch { missingSetting = true; }
                try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Rainbow"); double.TryParse(Item.InnerText, out rainbow[device]); }
--- a/DS4Windows/DS4Forms/Options.Designer.cs
+++ b/DS4Windows/DS4Forms/Options.Designer.cs
@ -256,6 +256,11 @@
            this.lbRSCurvePercent = new System.Windows.Forms.Label();
            this.lbLSCurvePercent = new System.Windows.Forms.Label();
            this.lbLSCurve = new System.Windows.Forms.Label();
+            this.antiDeadzoneTabPage = new System.Windows.Forms.TabPage();
+            this.nUDRSAntiDead = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.nUDLSAntiDead = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
            this.fLPSettings = new System.Windows.Forms.FlowLayoutPanel();
            this.gBGyro = new System.Windows.Forms.GroupBox();
            this.rBSAControls = new System.Windows.Forms.RadioButton();
@ -302,11 +307,10 @@
            this.shareToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.pSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.alwaysOnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.antiDeadzoneTabPage = new System.Windows.Forms.TabPage();
-            this.label1 = new System.Windows.Forms.Label();
-            this.nUDLSAntiDead = new System.Windows.Forms.NumericUpDown();
-            this.label2 = new System.Windows.Forms.Label();
-            this.nUDRSAntiDead = new System.Windows.Forms.NumericUpDown();
+            this.nUDR2AntiDead = new System.Windows.Forms.NumericUpDown();
+            this.label3 = new System.Windows.Forms.Label();
+            this.nUDL2AntiDead = new System.Windows.Forms.NumericUpDown();
+            this.label4 = new System.Windows.Forms.Label();
            this.advColorDialog = new DS4Windows.AdvancedColorDialog();
            ((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit();
@ -367,6 +371,9 @@
            this.tPCurve.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.nUDLSCurve)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.nUDRSCurve)).BeginInit();
+            this.antiDeadzoneTabPage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDRSAntiDead)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDLSAntiDead)).BeginInit();
            this.fLPSettings.SuspendLayout();
            this.gBGyro.SuspendLayout();
            this.pnlSAMouse.SuspendLayout();
@ -379,9 +386,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.nUDSXS)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).BeginInit();
            this.cMGyroTriggers.SuspendLayout();
-            this.antiDeadzoneTabPage.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.nUDLSAntiDead)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nUDRSAntiDead)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDR2AntiDead)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDL2AntiDead)).BeginInit();
            this.SuspendLayout();
            // 
            // lowColorChooserButton
@ -2637,6 +2643,64 @@
            resources.ApplyResources(this.lbLSCurve, "lbLSCurve");
            this.lbLSCurve.Name = "lbLSCurve";
            // 
+            // antiDeadzoneTabPage
+            // 
+            this.antiDeadzoneTabPage.Controls.Add(this.nUDR2AntiDead);
+            this.antiDeadzoneTabPage.Controls.Add(this.label3);
+            this.antiDeadzoneTabPage.Controls.Add(this.nUDL2AntiDead);
+            this.antiDeadzoneTabPage.Controls.Add(this.label4);
+            this.antiDeadzoneTabPage.Controls.Add(this.nUDRSAntiDead);
+            this.antiDeadzoneTabPage.Controls.Add(this.label2);
+            this.antiDeadzoneTabPage.Controls.Add(this.nUDLSAntiDead);
+            this.antiDeadzoneTabPage.Controls.Add(this.label1);
+            resources.ApplyResources(this.antiDeadzoneTabPage, "antiDeadzoneTabPage");
+            this.antiDeadzoneTabPage.Name = "antiDeadzoneTabPage";
+            this.antiDeadzoneTabPage.UseVisualStyleBackColor = true;
+            // 
+            // nUDRSAntiDead
+            // 
+            this.nUDRSAntiDead.DecimalPlaces = 2;
+            this.nUDRSAntiDead.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+            resources.ApplyResources(this.nUDRSAntiDead, "nUDRSAntiDead");
+            this.nUDRSAntiDead.Maximum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDRSAntiDead.Name = "nUDRSAntiDead";
+            this.nUDRSAntiDead.ValueChanged += new System.EventHandler(this.nUDRSAntiDead_ValueChanged);
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // nUDLSAntiDead
+            // 
+            this.nUDLSAntiDead.DecimalPlaces = 2;
+            this.nUDLSAntiDead.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+            resources.ApplyResources(this.nUDLSAntiDead, "nUDLSAntiDead");
+            this.nUDLSAntiDead.Maximum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nUDLSAntiDead.Name = "nUDLSAntiDead";
+            this.nUDLSAntiDead.ValueChanged += new System.EventHandler(this.nUDLSAntiDead_ValueChanged);
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
            // fLPSettings
            // 
            resources.ApplyResources(this.fLPSettings, "fLPSettings");
@ -3140,59 +3204,49 @@
            resources.ApplyResources(this.alwaysOnToolStripMenuItem, "alwaysOnToolStripMenuItem");
            this.alwaysOnToolStripMenuItem.CheckedChanged += new System.EventHandler(this.SATrigger_CheckedChanged);
            // 
-            // antiDeadzoneTabPage
+            // nUDR2AntiDead
            // 
-            this.antiDeadzoneTabPage.Controls.Add(this.nUDRSAntiDead);
-            this.antiDeadzoneTabPage.Controls.Add(this.label2);
-            this.antiDeadzoneTabPage.Controls.Add(this.nUDLSAntiDead);
-            this.antiDeadzoneTabPage.Controls.Add(this.label1);
-            resources.ApplyResources(this.antiDeadzoneTabPage, "antiDeadzoneTabPage");
-            this.antiDeadzoneTabPage.Name = "antiDeadzoneTabPage";
-            this.antiDeadzoneTabPage.UseVisualStyleBackColor = true;
-            // 
-            // label1
-            // 
-            resources.ApplyResources(this.label1, "label1");
-            this.label1.Name = "label1";
-            // 
-            // nUDLSAntiDead
-            // 
-            this.nUDLSAntiDead.DecimalPlaces = 2;
-            this.nUDLSAntiDead.Increment = new decimal(new int[] {
+            this.nUDR2AntiDead.DecimalPlaces = 2;
+            this.nUDR2AntiDead.Increment = new decimal(new int[] {
            1,
            0,
            0,
            65536});
-            resources.ApplyResources(this.nUDLSAntiDead, "nUDLSAntiDead");
-            this.nUDLSAntiDead.Maximum = new decimal(new int[] {
+            resources.ApplyResources(this.nUDR2AntiDead, "nUDR2AntiDead");
+            this.nUDR2AntiDead.Maximum = new decimal(new int[] {
            1,
            0,
            0,
            0});
-            this.nUDLSAntiDead.Name = "nUDLSAntiDead";
-            this.nUDLSAntiDead.ValueChanged += new System.EventHandler(this.nUDLSAntiDead_ValueChanged);
+            this.nUDR2AntiDead.Name = "nUDR2AntiDead";
+            this.nUDR2AntiDead.ValueChanged += new System.EventHandler(this.nUDR2AntiDead_ValueChanged);
            // 
-            // label2
+            // label3
            // 
-            resources.ApplyResources(this.label2, "label2");
-            this.label2.Name = "label2";
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
            // 
-            // nUDRSAntiDead
+            // nUDL2AntiDead
            // 
-            this.nUDRSAntiDead.DecimalPlaces = 2;
-            this.nUDRSAntiDead.Increment = new decimal(new int[] {
+            this.nUDL2AntiDead.DecimalPlaces = 2;
+            this.nUDL2AntiDead.Increment = new decimal(new int[] {
            1,
            0,
            0,
            65536});
-            resources.ApplyResources(this.nUDRSAntiDead, "nUDRSAntiDead");
-            this.nUDRSAntiDead.Maximum = new decimal(new int[] {
+            resources.ApplyResources(this.nUDL2AntiDead, "nUDL2AntiDead");
+            this.nUDL2AntiDead.Maximum = new decimal(new int[] {
            1,
            0,
            0,
            0});
-            this.nUDRSAntiDead.Name = "nUDRSAntiDead";
-            this.nUDRSAntiDead.ValueChanged += new System.EventHandler(this.nUDRSAntiDead_ValueChanged);
+            this.nUDL2AntiDead.Name = "nUDL2AntiDead";
+            this.nUDL2AntiDead.ValueChanged += new System.EventHandler(this.nUDL2AntiDead_ValueChanged);
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
            // 
            // Options
            // 
@ -3277,6 +3331,10 @@
            this.tPCurve.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.nUDLSCurve)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.nUDRSCurve)).EndInit();
+            this.antiDeadzoneTabPage.ResumeLayout(false);
+            this.antiDeadzoneTabPage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDRSAntiDead)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDLSAntiDead)).EndInit();
            this.fLPSettings.ResumeLayout(false);
            this.gBGyro.ResumeLayout(false);
            this.gBGyro.PerformLayout();
@ -3292,10 +3350,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.nUDSXS)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).EndInit();
            this.cMGyroTriggers.ResumeLayout(false);
-            this.antiDeadzoneTabPage.ResumeLayout(false);
-            this.antiDeadzoneTabPage.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.nUDLSAntiDead)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nUDRSAntiDead)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDR2AntiDead)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nUDL2AntiDead)).EndInit();
            this.ResumeLayout(false);

        }
@ -3582,5 +3638,9 @@
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.NumericUpDown nUDLSAntiDead;
        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.NumericUpDown nUDR2AntiDead;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.NumericUpDown nUDL2AntiDead;
+        private System.Windows.Forms.Label label4;
    }
 }
--- a/DS4Windows/DS4Forms/Options.cs
+++ b/DS4Windows/DS4Forms/Options.cs
@ -221,6 +221,24 @@ namespace DS4Windows
                {
                    nUDR2.Value = 0;
                }
+
+                try
+                {
+                    nUDL2AntiDead.Value = (decimal)(L2AntiDeadzone[device] / 100d);
+                }
+                catch
+                {
+                    nUDL2AntiDead.Value = 0;
+                }
+                try
+                {
+                    nUDR2AntiDead.Value = (decimal)(R2AntiDeadzone[device] / 100d);
+                }
+                catch
+                {
+                    nUDR2AntiDead.Value = 0;
+                }
+
                try
                {
                    nUDLS.Value = Math.Round((decimal)(LSDeadzone[device] / 127d), 3);
@ -237,6 +255,7 @@ namespace DS4Windows
                {
                    nUDRS.Value = 0;
                }
+
                try
                {
                    nUDLSAntiDead.Value = (decimal)(LSAntiDeadzone[device] / 100d);
@ -253,6 +272,7 @@ namespace DS4Windows
                {
                    nUDRSAntiDead.Value = 0;
                }
+
                try
                {
                    nUDSX.Value = (decimal)SXDeadzone[device];
@ -1028,6 +1048,8 @@ namespace DS4Windows
                FlashColor[device] = new DS4Color(Color.Black);
            L2Deadzone[device] = (byte)Math.Round((nUDL2.Value * 255), 0);
            R2Deadzone[device] = (byte)Math.Round((nUDR2.Value * 255), 0);
+            L2AntiDeadzone[device] = (int)(nUDL2AntiDead.Value * 100);
+            R2AntiDeadzone[device] = (int)(nUDR2AntiDead.Value * 100);
            RumbleBoost[device] = (byte)nUDRumbleBoost.Value;
            TouchSensitivity[device] = (byte)nUDTouch.Value;
            TouchpadJitterCompensation[device] = cBTouchpadJitterCompensation.Checked;
@ -2357,12 +2379,22 @@ namespace DS4Windows

        private void nUDLSAntiDead_ValueChanged(object sender, EventArgs e)
        {
-            LSAntiDeadzone[device] = (byte)(nUDLSAntiDead.Value * 100);
+            LSAntiDeadzone[device] = (int)(nUDLSAntiDead.Value * 100);
        }

        private void nUDRSAntiDead_ValueChanged(object sender, EventArgs e)
        {
-            RSAntiDeadzone[device] = (byte)(nUDRSAntiDead.Value * 100);
+            RSAntiDeadzone[device] = (int)(nUDRSAntiDead.Value * 100);
+        }
+
+        private void nUDL2AntiDead_ValueChanged(object sender, EventArgs e)
+        {
+            L2AntiDeadzone[device] = (int)(nUDL2AntiDead.Value * 100);
+        }
+
+        private void nUDR2AntiDead_ValueChanged(object sender, EventArgs e)
+        {
+            R2AntiDeadzone[device] = (int)(nUDR2AntiDead.Value * 100);
        }

        private void Options_Resize(object sender, EventArgs e)
--- a/DS4Windows/DS4Forms/Options.resx
+++ b/DS4Windows/DS4Forms/Options.resx
@ -700,7 +700,7 @@
    <value>NoControl</value>
  </data>
  <data name="lbL2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 4</value>
+    <value>6, 31</value>
  </data>
  <data name="lbL2.Size" type="System.Drawing.Size, System.Drawing">
    <value>19, 13</value>
@ -730,7 +730,7 @@
    <value>NoControl</value>
  </data>
  <data name="lbR2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>82, 5</value>
+    <value>82, 32</value>
  </data>
  <data name="lbR2.Size" type="System.Drawing.Size, System.Drawing">
    <value>21, 13</value>
@ -760,7 +760,7 @@
    <value>NoControl</value>
  </data>
  <data name="lbIdleMinutes.Location" type="System.Drawing.Point, System.Drawing">
-    <value>168, 47</value>
+    <value>169, 67</value>
  </data>
  <data name="lbIdleMinutes.Size" type="System.Drawing.Size, System.Drawing">
    <value>28, 13</value>
@ -784,7 +784,7 @@
    <value>13</value>
  </data>
  <data name="nUDIdleDisconnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>114, 44</value>
+    <value>115, 64</value>
  </data>
  <data name="nUDIdleDisconnect.Size" type="System.Drawing.Size, System.Drawing">
    <value>49, 20</value>
@ -805,7 +805,7 @@
    <value>8</value>
  </data>
  <data name="nUDR2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>105, 2</value>
+    <value>105, 29</value>
  </data>
  <data name="nUDR2.Size" type="System.Drawing.Size, System.Drawing">
    <value>40, 20</value>
@ -835,7 +835,7 @@
    <value>NoControl</value>
  </data>
  <data name="cBFlushHIDQueue.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 162</value>
+    <value>8, 178</value>
  </data>
  <data name="cBFlushHIDQueue.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>Yes</value>
@ -1189,7 +1189,7 @@
    <value>NoControl</value>
  </data>
  <data name="lbRS.Location" type="System.Drawing.Point, System.Drawing">
-    <value>82, 34</value>
+    <value>82, 6</value>
  </data>
  <data name="lbRS.Size" type="System.Drawing.Size, System.Drawing">
    <value>22, 13</value>
@ -1219,7 +1219,7 @@
    <value>NoControl</value>
  </data>
  <data name="lbLS.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 34</value>
+    <value>6, 6</value>
  </data>
  <data name="lbLS.Size" type="System.Drawing.Size, System.Drawing">
    <value>20, 13</value>
@ -1243,7 +1243,7 @@
    <value>10</value>
  </data>
  <data name="nUDRS.Location" type="System.Drawing.Point, System.Drawing">
-    <value>105, 31</value>
+    <value>105, 3</value>
  </data>
  <data name="nUDRS.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
@ -1288,7 +1288,7 @@
    <value>11</value>
  </data>
  <data name="nUDLS.Location" type="System.Drawing.Point, System.Drawing">
-    <value>30, 31</value>
+    <value>30, 3</value>
  </data>
  <data name="nUDLS.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
@ -1312,7 +1312,7 @@
    <value>2</value>
  </data>
  <data name="nUDL2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>30, 2</value>
+    <value>30, 29</value>
  </data>
  <data name="nUDL2.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
@ -1918,7 +1918,7 @@
    <value>NoControl</value>
  </data>
  <data name="cBDinput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 138</value>
+    <value>8, 154</value>
  </data>
  <data name="cBDinput.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>Yes</value>
@ -1948,7 +1948,7 @@
    <value>NoControl</value>
  </data>
  <data name="pBProgram.Location" type="System.Drawing.Point, System.Drawing">
-    <value>202, 106</value>
+    <value>215, 122</value>
  </data>
  <data name="pBProgram.Size" type="System.Drawing.Size, System.Drawing">
    <value>23, 23</value>
@ -1978,7 +1978,7 @@
    <value>NoControl</value>
  </data>
  <data name="cBLaunchProgram.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 105</value>
+    <value>4, 118</value>
  </data>
  <data name="cBLaunchProgram.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>Yes</value>
@ -2015,7 +2015,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>130, 108</value>
+    <value>132, 122</value>
  </data>
  <data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
    <value>67, 23</value>
@ -2045,7 +2045,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="lbUseController.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 75</value>
+    <value>5, 96</value>
  </data>
  <data name="lbUseController.Size" type="System.Drawing.Size, System.Drawing">
    <value>73, 13</value>
@ -2075,7 +2075,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="cBMouseAccel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>164, 9</value>
+    <value>8, 42</value>
  </data>
  <data name="cBMouseAccel.Size" type="System.Drawing.Size, System.Drawing">
    <value>120, 17</value>
@ -2099,7 +2099,7 @@ with profile</value>
    <value>5</value>
  </data>
  <data name="nUDSixaxis.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 74</value>
+    <value>85, 95</value>
  </data>
  <data name="nUDSixaxis.Size" type="System.Drawing.Size, System.Drawing">
    <value>29, 20</value>
@ -2126,7 +2126,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="cBControllerInput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>120, 74</value>
+    <value>118, 95</value>
  </data>
  <data name="cBControllerInput.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>Yes</value>
@ -2159,7 +2159,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="cBIdleDisconnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 45</value>
+    <value>8, 65</value>
  </data>
  <data name="cBIdleDisconnect.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>Yes</value>
@ -2189,7 +2189,7 @@ with profile</value>
    <value>281, 221</value>
  </data>
  <data name="gBOther.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 190</value>
+    <value>272, 205</value>
  </data>
  <data name="gBOther.TabIndex" type="System.Int32, mscorlib">
    <value>247</value>
@ -5909,7 +5909,7 @@ with profile</value>
    <value>0</value>
  </data>
  <data name="nUDLSCurve.Location" type="System.Drawing.Point, System.Drawing">
-    <value>29, 2</value>
+    <value>36, 16</value>
  </data>
  <data name="nUDLSCurve.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
@ -5933,7 +5933,7 @@ with profile</value>
    <value>0</value>
  </data>
  <data name="nUDRSCurve.Location" type="System.Drawing.Point, System.Drawing">
-    <value>146, 2</value>
+    <value>153, 16</value>
  </data>
  <data name="nUDRSCurve.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
@ -5963,7 +5963,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="lbRSCurve.Location" type="System.Drawing.Point, System.Drawing">
-    <value>123, 4</value>
+    <value>130, 18</value>
  </data>
  <data name="lbRSCurve.Size" type="System.Drawing.Size, System.Drawing">
    <value>22, 13</value>
@ -5993,7 +5993,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="lbRSCurvePercent.Location" type="System.Drawing.Point, System.Drawing">
-    <value>201, 4</value>
+    <value>208, 18</value>
  </data>
  <data name="lbRSCurvePercent.Size" type="System.Drawing.Size, System.Drawing">
    <value>15, 13</value>
@ -6023,7 +6023,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="lbLSCurvePercent.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 4</value>
+    <value>91, 18</value>
  </data>
  <data name="lbLSCurvePercent.Size" type="System.Drawing.Size, System.Drawing">
    <value>15, 13</value>
@ -6053,7 +6053,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="lbLSCurve.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 4</value>
+    <value>13, 18</value>
  </data>
  <data name="lbLSCurve.Size" type="System.Drawing.Size, System.Drawing">
    <value>20, 13</value>
@ -6103,8 +6103,110 @@ with profile</value>
  <data name="&gt;&gt;tPCurve.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
+  <data name="nUDR2AntiDead.Location" type="System.Drawing.Point, System.Drawing">
+    <value>158, 30</value>
+  </data>
+  <data name="nUDR2AntiDead.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 20</value>
+  </data>
+  <data name="nUDR2AntiDead.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;nUDR2AntiDead.Name" xml:space="preserve">
+    <value>nUDR2AntiDead</value>
+  </data>
+  <data name="&gt;&gt;nUDR2AntiDead.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;nUDR2AntiDead.Parent" xml:space="preserve">
+    <value>antiDeadzoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;nUDR2AntiDead.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>117, 32</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>24, 13</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>R2:</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="&gt;&gt;label3.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;label3.Parent" xml:space="preserve">
+    <value>antiDeadzoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="nUDL2AntiDead.Location" type="System.Drawing.Point, System.Drawing">
+    <value>51, 29</value>
+  </data>
+  <data name="nUDL2AntiDead.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 20</value>
+  </data>
+  <data name="nUDL2AntiDead.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;nUDL2AntiDead.Name" xml:space="preserve">
+    <value>nUDL2AntiDead</value>
+  </data>
+  <data name="&gt;&gt;nUDL2AntiDead.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;nUDL2AntiDead.Parent" xml:space="preserve">
+    <value>antiDeadzoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;nUDL2AntiDead.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>7, 31</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>22, 13</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>L2:</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="&gt;&gt;label4.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;label4.Parent" xml:space="preserve">
+    <value>antiDeadzoneTabPage</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
  <data name="nUDRSAntiDead.Location" type="System.Drawing.Point, System.Drawing">
-    <value>160, 18</value>
+    <value>157, 4</value>
  </data>
  <data name="nUDRSAntiDead.Size" type="System.Drawing.Size, System.Drawing">
    <value>68, 20</value>
@ -6122,7 +6224,7 @@ with profile</value>
    <value>antiDeadzoneTabPage</value>
  </data>
  <data name="&gt;&gt;nUDRSAntiDead.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>4</value>
  </data>
  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@ -6131,7 +6233,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>119, 20</value>
+    <value>116, 6</value>
  </data>
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>25, 13</value>
@ -6152,10 +6254,10 @@ with profile</value>
    <value>antiDeadzoneTabPage</value>
  </data>
  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>5</value>
  </data>
  <data name="nUDLSAntiDead.Location" type="System.Drawing.Point, System.Drawing">
-    <value>53, 17</value>
+    <value>50, 3</value>
  </data>
  <data name="nUDLSAntiDead.Size" type="System.Drawing.Size, System.Drawing">
    <value>50, 20</value>
@ -6173,7 +6275,7 @@ with profile</value>
    <value>antiDeadzoneTabPage</value>
  </data>
  <data name="&gt;&gt;nUDLSAntiDead.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>6</value>
  </data>
  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@ -6182,7 +6284,7 @@ with profile</value>
    <value>NoControl</value>
  </data>
  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 19</value>
+    <value>6, 5</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>23, 13</value>
@ -6203,7 +6305,7 @@ with profile</value>
    <value>antiDeadzoneTabPage</value>
  </data>
  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>7</value>
  </data>
  <data name="antiDeadzoneTabPage.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 22</value>