The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-17 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Force dead zone and anti-dead zone for new profiles

Browse Source 
Related to issue #804
This commit is contained in:
Travis Nickles 2019-08-30 13:32:56 -05:00
parent 9bd51043b8
commit eff927e7ed
4 changed files with 1127 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -2975,13 +2975,13 @@ namespace DS4Windows
try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Rainbow"); double.TryParse(Item.InnerText, out rainbow[device]); } try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Rainbow"); double.TryParse(Item.InnerText, out rainbow[device]); }
catch { rainbow[device] = 0; missingSetting = true; } catch { rainbow[device] = 0; missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSDeadZone"); int.TryParse(Item.InnerText, out lsModInfo[device].deadZone); } try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSDeadZone"); int.TryParse(Item.InnerText, out lsModInfo[device].deadZone); }
catch { lsModInfo[device].deadZone = 0; missingSetting = true; } catch { lsModInfo[device].deadZone = 10; missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/RSDeadZone"); int.TryParse(Item.InnerText, out rsModInfo[device].deadZone); } try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/RSDeadZone"); int.TryParse(Item.InnerText, out rsModInfo[device].deadZone); }
catch { rsModInfo[device].deadZone = 0; missingSetting = true; } catch { rsModInfo[device].deadZone = 10; missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSAntiDeadZone"); int.TryParse(Item.InnerText, out lsModInfo[device].antiDeadZone); } try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSAntiDeadZone"); int.TryParse(Item.InnerText, out lsModInfo[device].antiDeadZone); }
catch { lsModInfo[device].antiDeadZone = 0; missingSetting = true; } catch { lsModInfo[device].antiDeadZone = 25; missingSetting = true; }
try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/RSAntiDeadZone"); int.TryParse(Item.InnerText, out rsModInfo[device].antiDeadZone); } try { Item = m_Xdoc.SelectSingleNode("/" + rootname + "/RSAntiDeadZone"); int.TryParse(Item.InnerText, out rsModInfo[device].antiDeadZone); }
catch { rsModInfo[device].antiDeadZone = 0; missingSetting = true; } catch { rsModInfo[device].antiDeadZone = 25; missingSetting = true; }
try { try {
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSMaxZone"); int temp = 100; Item = m_Xdoc.SelectSingleNode("/" + rootname + "/LSMaxZone"); int temp = 100;
@ -4548,8 +4548,8 @@ namespace DS4Windows
rumble[device] = 100; rumble[device] = 100;
touchSensitivity[device] = 100; touchSensitivity[device] = 100;
l2ModInfo[device].deadZone = r2ModInfo[device].deadZone = 0; l2ModInfo[device].deadZone = r2ModInfo[device].deadZone = 0;
lsModInfo[device].deadZone = rsModInfo[device].deadZone = 0; lsModInfo[device].deadZone = rsModInfo[device].deadZone = 10;
lsModInfo[device].antiDeadZone = rsModInfo[device].antiDeadZone = 0; lsModInfo[device].antiDeadZone = rsModInfo[device].antiDeadZone = 25;
lsModInfo[device].maxZone = rsModInfo[device].maxZone = 100; lsModInfo[device].maxZone = rsModInfo[device].maxZone = 100;
l2ModInfo[device].antiDeadZone = r2ModInfo[device].antiDeadZone = 0; l2ModInfo[device].antiDeadZone = r2ModInfo[device].antiDeadZone = 0;
l2ModInfo[device].maxZone = r2ModInfo[device].maxZone = 100; l2ModInfo[device].maxZone = r2ModInfo[device].maxZone = 100;

88
DS4Windows/DS4Forms/Options.Designer.cs generated
View File

@ -217,6 +217,9 @@
this.gyroMousestickXAxisCom = new System.Windows.Forms.ComboBox(); this.gyroMousestickXAxisCom = new System.Windows.Forms.ComboBox();
this.gyroMouseStickInvertXCk = new System.Windows.Forms.CheckBox(); this.gyroMouseStickInvertXCk = new System.Windows.Forms.CheckBox();
this.gyroMouseStickInvertYCk = new System.Windows.Forms.CheckBox(); this.gyroMouseStickInvertYCk = new System.Windows.Forms.CheckBox();
this.gyroMStickUseSmoothCk = new System.Windows.Forms.CheckBox();
this.label39 = new System.Windows.Forms.Label();
this.gyroMStickSmoothWeightNUD = new System.Windows.Forms.NumericUpDown();
this.tCControls = new System.Windows.Forms.TabControl(); this.tCControls = new System.Windows.Forms.TabControl();
this.tPControls = new System.Windows.Forms.TabPage(); this.tPControls = new System.Windows.Forms.TabPage();
this.lBControls = new System.Windows.Forms.ListBox(); this.lBControls = new System.Windows.Forms.ListBox();
@ -427,9 +430,6 @@
this.optionsTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.shareTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.shareTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.psTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.psTouchInvStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gyroMStickUseSmoothCk = new System.Windows.Forms.CheckBox();
this.gyroMStickSmoothWeightNUD = new System.Windows.Forms.NumericUpDown();
this.label39 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tBGreenBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tBGreenBar)).BeginInit();
@ -483,6 +483,7 @@
((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadX)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadY)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadY)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMStickVertScaleNUD)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMStickVertScaleNUD)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMStickSmoothWeightNUD)).BeginInit();
this.tCControls.SuspendLayout(); this.tCControls.SuspendLayout();
this.tPControls.SuspendLayout(); this.tPControls.SuspendLayout();
this.pnlController.SuspendLayout(); this.pnlController.SuspendLayout();
@ -532,7 +533,6 @@
((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).BeginInit();
this.cMGyroTriggers.SuspendLayout(); this.cMGyroTriggers.SuspendLayout();
this.cMTouchDisableInvert.SuspendLayout(); this.cMTouchDisableInvert.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gyroMStickSmoothWeightNUD)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// lowColorChooserButton // lowColorChooserButton
@ -923,6 +923,11 @@
0, 0,
0}); 0});
this.nUDRS.Name = "nUDRS"; this.nUDRS.Name = "nUDRS";
this.nUDRS.Value = new decimal(new int[] {
8,
0,
0,
131072});
this.nUDRS.ValueChanged += new System.EventHandler(this.numUDRS_ValueChanged); this.nUDRS.ValueChanged += new System.EventHandler(this.numUDRS_ValueChanged);
// //
// numUDMouseSens // numUDMouseSens
@ -956,6 +961,11 @@
0, 0,
0}); 0});
this.nUDLS.Name = "nUDLS"; this.nUDLS.Name = "nUDLS";
this.nUDLS.Value = new decimal(new int[] {
8,
0,
0,
131072});
this.nUDLS.ValueChanged += new System.EventHandler(this.numUDLS_ValueChanged); this.nUDLS.ValueChanged += new System.EventHandler(this.numUDLS_ValueChanged);
// //
// nUDL2 // nUDL2
@ -2254,6 +2264,35 @@
this.gyroMouseStickInvertYCk.UseVisualStyleBackColor = true; this.gyroMouseStickInvertYCk.UseVisualStyleBackColor = true;
this.gyroMouseStickInvertYCk.CheckedChanged += new System.EventHandler(this.GyroMouseStickInvert_CheckedChanged); this.gyroMouseStickInvertYCk.CheckedChanged += new System.EventHandler(this.GyroMouseStickInvert_CheckedChanged);
// //
// gyroMStickUseSmoothCk
//
resources.ApplyResources(this.gyroMStickUseSmoothCk, "gyroMStickUseSmoothCk");
this.gyroMStickUseSmoothCk.Name = "gyroMStickUseSmoothCk";
this.gyroMStickUseSmoothCk.UseVisualStyleBackColor = true;
this.gyroMStickUseSmoothCk.CheckedChanged += new System.EventHandler(this.GyroMStickUseSmoothCk_CheckedChanged);
//
// label39
//
resources.ApplyResources(this.label39, "label39");
this.label39.Name = "label39";
//
// gyroMStickSmoothWeightNUD
//
this.gyroMStickSmoothWeightNUD.DecimalPlaces = 3;
resources.ApplyResources(this.gyroMStickSmoothWeightNUD, "gyroMStickSmoothWeightNUD");
this.gyroMStickSmoothWeightNUD.Maximum = new decimal(new int[] {
1,
0,
0,
0});
this.gyroMStickSmoothWeightNUD.Name = "gyroMStickSmoothWeightNUD";
this.gyroMStickSmoothWeightNUD.Value = new decimal(new int[] {
5,
0,
0,
65536});
this.gyroMStickSmoothWeightNUD.ValueChanged += new System.EventHandler(this.GyroMStickSmoothWeightNUD_ValueChanged);
//
// tCControls // tCControls
// //
this.tCControls.Controls.Add(this.tPControls); this.tCControls.Controls.Add(this.tPControls);
@ -3246,6 +3285,11 @@
0, 0,
0}); 0});
this.nUDRSAntiDead.Name = "nUDRSAntiDead"; this.nUDRSAntiDead.Name = "nUDRSAntiDead";
this.nUDRSAntiDead.Value = new decimal(new int[] {
20,
0,
0,
131072});
this.nUDRSAntiDead.ValueChanged += new System.EventHandler(this.nUDRSAntiDead_ValueChanged); this.nUDRSAntiDead.ValueChanged += new System.EventHandler(this.nUDRSAntiDead_ValueChanged);
// //
// label2 // label2
@ -3268,6 +3312,11 @@
0, 0,
0}); 0});
this.nUDLSAntiDead.Name = "nUDLSAntiDead"; this.nUDLSAntiDead.Name = "nUDLSAntiDead";
this.nUDLSAntiDead.Value = new decimal(new int[] {
20,
0,
0,
131072});
this.nUDLSAntiDead.ValueChanged += new System.EventHandler(this.nUDLSAntiDead_ValueChanged); this.nUDLSAntiDead.ValueChanged += new System.EventHandler(this.nUDLSAntiDead_ValueChanged);
// //
// label1 // label1
@ -4597,35 +4646,6 @@
resources.ApplyResources(this.psTouchInvStripMenuItem, "psTouchInvStripMenuItem"); resources.ApplyResources(this.psTouchInvStripMenuItem, "psTouchInvStripMenuItem");
this.psTouchInvStripMenuItem.CheckedChanged += new System.EventHandler(this.TouchDisableInvert_CheckedChanged); this.psTouchInvStripMenuItem.CheckedChanged += new System.EventHandler(this.TouchDisableInvert_CheckedChanged);
// //
// gyroMStickUseSmoothCk
//
resources.ApplyResources(this.gyroMStickUseSmoothCk, "gyroMStickUseSmoothCk");
this.gyroMStickUseSmoothCk.Name = "gyroMStickUseSmoothCk";
this.gyroMStickUseSmoothCk.UseVisualStyleBackColor = true;
this.gyroMStickUseSmoothCk.CheckedChanged += new System.EventHandler(this.GyroMStickUseSmoothCk_CheckedChanged);
//
// gyroMStickSmoothWeightNUD
//
this.gyroMStickSmoothWeightNUD.DecimalPlaces = 3;
resources.ApplyResources(this.gyroMStickSmoothWeightNUD, "gyroMStickSmoothWeightNUD");
this.gyroMStickSmoothWeightNUD.Maximum = new decimal(new int[] {
1,
0,
0,
0});
this.gyroMStickSmoothWeightNUD.Name = "gyroMStickSmoothWeightNUD";
this.gyroMStickSmoothWeightNUD.Value = new decimal(new int[] {
5,
0,
0,
65536});
this.gyroMStickSmoothWeightNUD.ValueChanged += new System.EventHandler(this.GyroMStickSmoothWeightNUD_ValueChanged);
//
// label39
//
resources.ApplyResources(this.label39, "label39");
this.label39.Name = "label39";
//
// Options // Options
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
@ -4701,6 +4721,7 @@
((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadX)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMouseStickAntiDeadY)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMStickVertScaleNUD)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gyroMStickVertScaleNUD)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gyroMStickSmoothWeightNUD)).EndInit();
this.tCControls.ResumeLayout(false); this.tCControls.ResumeLayout(false);
this.tPControls.ResumeLayout(false); this.tPControls.ResumeLayout(false);
this.pnlController.ResumeLayout(false); this.pnlController.ResumeLayout(false);
@ -4760,7 +4781,6 @@
((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDSZS)).EndInit();
this.cMGyroTriggers.ResumeLayout(false); this.cMGyroTriggers.ResumeLayout(false);
this.cMTouchDisableInvert.ResumeLayout(false); this.cMTouchDisableInvert.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gyroMStickSmoothWeightNUD)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }

16
DS4Windows/DS4Forms/Options.cs
View File

@ -520,7 +520,7 @@ namespace DS4Windows.Forms
} }
catch catch
{ {
nUDLS.Value = 0; nUDLS.Value = 0.08m;
} }
try try
{ {
@ -528,7 +528,7 @@ namespace DS4Windows.Forms
} }
catch catch
{ {
nUDRS.Value = 0; nUDRS.Value = 0.08m;
} }
try try
@ -537,7 +537,7 @@ namespace DS4Windows.Forms
} }
catch catch
{ {
nUDLSAntiDead.Value = 0; nUDLSAntiDead.Value = 0.20m;
} }
try try
{ {
@ -545,7 +545,7 @@ namespace DS4Windows.Forms
} }
catch catch
{ {
nUDRSAntiDead.Value = 0; nUDRSAntiDead.Value = 0.20m;
} }
try try
@ -884,10 +884,10 @@ namespace DS4Windows.Forms
nUDR2.Value = 0; nUDR2.Value = 0;
nUDL2Maxzone.Value = 1; nUDL2Maxzone.Value = 1;
nUDR2Maxzone.Value = 1; nUDR2Maxzone.Value = 1;
nUDLS.Value = 0; nUDLS.Value = 0.08m;
nUDRS.Value = 0; nUDRS.Value = 0.08m;
nUDLSAntiDead.Value = 0; nUDLSAntiDead.Value = 0.20m;
nUDRSAntiDead.Value = 0; nUDRSAntiDead.Value = 0.20m;
nUDLSMaxZone.Value = 1; nUDLSMaxZone.Value = 1;
nUDRSMaxZone.Value = 1; nUDRSMaxZone.Value = 1;
nUDLSRotation.Value = 0; nUDLSRotation.Value = 0;

2022
DS4Windows/DS4Forms/Options.resx
View File

File diff suppressed because it is too large Load Diff