diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs index c5a2a40..e42c220 100644 --- 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 { diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs index 358c7d0..f222445 100644 --- 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]); } diff --git a/DS4Windows/DS4Forms/Options.Designer.cs b/DS4Windows/DS4Forms/Options.Designer.cs index ab36b9a..2df8ff9 100644 --- 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; } } \ No newline at end of file diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs index 01cf6ea..493d99d 100644 --- 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) diff --git a/DS4Windows/DS4Forms/Options.resx b/DS4Windows/DS4Forms/Options.resx index cc5fc07..9fd3681 100644 --- a/DS4Windows/DS4Forms/Options.resx +++ b/DS4Windows/DS4Forms/Options.resx @@ -700,7 +700,7 @@ NoControl - 6, 4 + 6, 31 19, 13 @@ -730,7 +730,7 @@ NoControl - 82, 5 + 82, 32 21, 13 @@ -760,7 +760,7 @@ NoControl - 168, 47 + 169, 67 28, 13 @@ -784,7 +784,7 @@ 13 - 114, 44 + 115, 64 49, 20 @@ -805,7 +805,7 @@ 8 - 105, 2 + 105, 29 40, 20 @@ -835,7 +835,7 @@ NoControl - 6, 162 + 8, 178 Yes @@ -1189,7 +1189,7 @@ NoControl - 82, 34 + 82, 6 22, 13 @@ -1219,7 +1219,7 @@ NoControl - 6, 34 + 6, 6 20, 13 @@ -1243,7 +1243,7 @@ 10 - 105, 31 + 105, 3 No @@ -1288,7 +1288,7 @@ 11 - 30, 31 + 30, 3 No @@ -1312,7 +1312,7 @@ 2 - 30, 2 + 30, 29 No @@ -1918,7 +1918,7 @@ NoControl - 6, 138 + 8, 154 Yes @@ -1948,7 +1948,7 @@ NoControl - 202, 106 + 215, 122 23, 23 @@ -1978,7 +1978,7 @@ NoControl - 6, 105 + 4, 118 Yes @@ -2015,7 +2015,7 @@ with profile NoControl - 130, 108 + 132, 122 67, 23 @@ -2045,7 +2045,7 @@ with profile NoControl - 7, 75 + 5, 96 73, 13 @@ -2075,7 +2075,7 @@ with profile NoControl - 164, 9 + 8, 42 120, 17 @@ -2099,7 +2099,7 @@ with profile 5 - 87, 74 + 85, 95 29, 20 @@ -2126,7 +2126,7 @@ with profile NoControl - 120, 74 + 118, 95 Yes @@ -2159,7 +2159,7 @@ with profile NoControl - 7, 45 + 8, 65 Yes @@ -2189,7 +2189,7 @@ with profile 281, 221 - 272, 190 + 272, 205 247 @@ -5909,7 +5909,7 @@ with profile 0 - 29, 2 + 36, 16 No @@ -5933,7 +5933,7 @@ with profile 0 - 146, 2 + 153, 16 No @@ -5963,7 +5963,7 @@ with profile NoControl - 123, 4 + 130, 18 22, 13 @@ -5993,7 +5993,7 @@ with profile NoControl - 201, 4 + 208, 18 15, 13 @@ -6023,7 +6023,7 @@ with profile NoControl - 84, 4 + 91, 18 15, 13 @@ -6053,7 +6053,7 @@ with profile NoControl - 6, 4 + 13, 18 20, 13 @@ -6103,8 +6103,110 @@ with profile 1 + + 158, 30 + + + 68, 20 + + + 7 + + + nUDR2AntiDead + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + antiDeadzoneTabPage + + + 0 + + + True + + + NoControl + + + 117, 32 + + + 24, 13 + + + 6 + + + R2: + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + antiDeadzoneTabPage + + + 1 + + + 51, 29 + + + 50, 20 + + + 5 + + + nUDL2AntiDead + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + antiDeadzoneTabPage + + + 2 + + + True + + + NoControl + + + 7, 31 + + + 22, 13 + + + 4 + + + L2: + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + antiDeadzoneTabPage + + + 3 + - 160, 18 + 157, 4 68, 20 @@ -6122,7 +6224,7 @@ with profile antiDeadzoneTabPage - 0 + 4 True @@ -6131,7 +6233,7 @@ with profile NoControl - 119, 20 + 116, 6 25, 13 @@ -6152,10 +6254,10 @@ with profile antiDeadzoneTabPage - 1 + 5 - 53, 17 + 50, 3 50, 20 @@ -6173,7 +6275,7 @@ with profile antiDeadzoneTabPage - 2 + 6 True @@ -6182,7 +6284,7 @@ with profile NoControl - 9, 19 + 6, 5 23, 13 @@ -6203,7 +6305,7 @@ with profile antiDeadzoneTabPage - 3 + 7 4, 22