The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-25 08:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable force feedback for now.

Browse Source 
Related to issue #616
This commit is contained in:
Travis Nickles 2019-04-03 20:39:30 -05:00
parent 2e62bad0f6
commit cba6a09f68
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DS4Windows/DS4Control/ControlService.cs
View File

@ -426,10 +426,11 @@ namespace DS4Windows
useDInputOnly[i] = false; useDInputOnly[i] = false;
x360controls[i] = new Xbox360Controller(vigemTestClient); x360controls[i] = new Xbox360Controller(vigemTestClient);
int devIndex = i; int devIndex = i;
x360controls[i].FeedbackReceived += (sender, args) => /*x360controls[i].FeedbackReceived += (sender, args) =>
{ {
SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex); SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex);
}; };
*/
x360controls[i].Connect(); x360controls[i].Connect();
LogDebug("X360 Controller #" + (i + 1) + " connected"); LogDebug("X360 Controller #" + (i + 1) + " connected");
} }
@ -682,10 +683,11 @@ namespace DS4Windows
useDInputOnly[Index] = false; useDInputOnly[Index] = false;
x360controls[Index] = new Xbox360Controller(vigemTestClient); x360controls[Index] = new Xbox360Controller(vigemTestClient);
int devIndex = Index; int devIndex = Index;
x360controls[Index].FeedbackReceived += (sender, args) => /*x360controls[Index].FeedbackReceived += (sender, args) =>
{ {
SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex); SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex);
}; };
*/
x360controls[Index].Connect(); x360controls[Index].Connect();
LogDebug("X360 Controller #" + (Index + 1) + " connected"); LogDebug("X360 Controller #" + (Index + 1) + " connected");
} }
@ -1058,10 +1060,11 @@ namespace DS4Windows
{ {
LogDebug("Plugging in X360 Controller #" + (ind + 1)); LogDebug("Plugging in X360 Controller #" + (ind + 1));
x360controls[ind] = new Xbox360Controller(vigemTestClient); x360controls[ind] = new Xbox360Controller(vigemTestClient);
x360controls[ind].FeedbackReceived += (eventsender, args) => /*x360controls[ind].FeedbackReceived += (eventsender, args) =>
{ {
SetDevRumble(device, args.LargeMotor, args.SmallMotor, ind); SetDevRumble(device, args.LargeMotor, args.SmallMotor, ind);
}; };
*/
x360controls[ind].Connect(); x360controls[ind].Connect();
useDInputOnly[ind] = false; useDInputOnly[ind] = false;
LogDebug("X360 Controller #" + (ind + 1) + " connected"); LogDebug("X360 Controller #" + (ind + 1) + " connected");

5
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -3064,6 +3064,11 @@ namespace DS4Windows
if (xinputStatus && xinputPlug) if (xinputStatus && xinputPlug)
{ {
control.x360controls[device] = new Nefarius.ViGEm.Client.Targets.Xbox360Controller(control.vigemTestClient); control.x360controls[device] = new Nefarius.ViGEm.Client.Targets.Xbox360Controller(control.vigemTestClient);
/*control.x360controls[device].FeedbackReceived += (eventsender, args) =>
{
control.SetDevRumble(tempDev, args.LargeMotor, args.SmallMotor, device);
};
*/
control.x360controls[device].Connect(); control.x360controls[device].Connect();
Global.useDInputOnly[device] = false; Global.useDInputOnly[device] = false;
AppLogger.LogToGui("X360 Controller # " + (device + 1) + " connected", false); AppLogger.LogToGui("X360 Controller # " + (device + 1) + " connected", false);