The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-29 20:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

Browse Source
This commit is contained in:
mika-n 2019-08-26 13:44:36 +03:00
commit 358e39aac1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -3153,7 +3153,7 @@ namespace DS4Windows
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/GyroMouseStickMaxZone"); int.TryParse(Item.InnerText, out int temp); Item = m_Xdoc.SelectSingleNode("/" + rootname + "/GyroMouseStickMaxZone"); int.TryParse(Item.InnerText, out int temp);
gyroMStickInfo[device].maxZone = temp; gyroMStickInfo[device].maxZone = temp;
} }
catch { gyroMStickInfo[device].maxZone = 840; missingSetting = true; } catch { gyroMStickInfo[device].maxZone = 830; missingSetting = true; }
try try
{ {
@ -4552,7 +4552,7 @@ namespace DS4Windows
gyroOutMode[device] = GyroOutMode.Controls; gyroOutMode[device] = GyroOutMode.Controls;
sAMouseStickTriggers[device] = string.Empty; sAMouseStickTriggers[device] = string.Empty;
sAMouseStickTriggerCond[device] = true; sAMouseStickTriggerCond[device] = true;
gyroMStickInfo[device].deadZone = 30; gyroMStickInfo[device].maxZone = 840; gyroMStickInfo[device].deadZone = 30; gyroMStickInfo[device].maxZone = 830;
gyroMStickInfo[device].antiDeadX = 0.4; gyroMStickInfo[device].antiDeadY = 0.4; gyroMStickInfo[device].antiDeadX = 0.4; gyroMStickInfo[device].antiDeadY = 0.4;
gyroMStickInfo[device].inverted = 0; gyroMStickInfo[device].inverted = 0;
sASteeringWheelEmulationAxis[device] = SASteeringWheelEmulationAxisType.None; sASteeringWheelEmulationAxis[device] = SASteeringWheelEmulationAxisType.None;

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

@ -2089,7 +2089,7 @@
0}); 0});
this.gyroMouseStickDZ.Name = "gyroMouseStickDZ"; this.gyroMouseStickDZ.Name = "gyroMouseStickDZ";
this.gyroMouseStickDZ.Value = new decimal(new int[] { this.gyroMouseStickDZ.Value = new decimal(new int[] {
40, 30,
0, 0,
0, 0,
0}); 0});
@ -2110,7 +2110,7 @@
0}); 0});
this.gyroMouseStickMaxZ.Name = "gyroMouseStickMaxZ"; this.gyroMouseStickMaxZ.Name = "gyroMouseStickMaxZ";
this.gyroMouseStickMaxZ.Value = new decimal(new int[] { this.gyroMouseStickMaxZ.Value = new decimal(new int[] {
880, 830,
0, 0,
0, 0,
0}); 0});

2
DS4Windows/DS4Forms/Options.cs
View File

@ -951,7 +951,7 @@ namespace DS4Windows.Forms
gyroMStickTrigBehaveCk.Checked = true; gyroMStickTrigBehaveCk.Checked = true;
gyroMouseStickEvalCombo.SelectedIndex = 0; gyroMouseStickEvalCombo.SelectedIndex = 0;
gyroMouseStickDZ.Value = 30; gyroMouseStickDZ.Value = 30;
gyroMouseStickMaxZ.Value = 840; gyroMouseStickMaxZ.Value = 830;
gyroMouseStickAntiDeadX.Value = 0.4m; gyroMouseStickAntiDeadX.Value = 0.4m;
gyroMouseStickAntiDeadY.Value = 0.4m; gyroMouseStickAntiDeadY.Value = 0.4m;
gyroMousestickXAxisCom.SelectedIndex = 0; gyroMousestickXAxisCom.SelectedIndex = 0;