From cba6a09f6857f8230652d8f8de4ba5d334906afa Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Wed, 3 Apr 2019 20:39:30 -0500 Subject: [PATCH] Disable force feedback for now. Related to issue #616 --- DS4Windows/DS4Control/ControlService.cs | 9 ++++++--- DS4Windows/DS4Control/ScpUtil.cs | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs index 12d25dc..b6aeeb1 100644 --- a/DS4Windows/DS4Control/ControlService.cs +++ b/DS4Windows/DS4Control/ControlService.cs @@ -426,10 +426,11 @@ namespace DS4Windows useDInputOnly[i] = false; x360controls[i] = new Xbox360Controller(vigemTestClient); int devIndex = i; - x360controls[i].FeedbackReceived += (sender, args) => + /*x360controls[i].FeedbackReceived += (sender, args) => { SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex); }; + */ x360controls[i].Connect(); LogDebug("X360 Controller #" + (i + 1) + " connected"); } @@ -682,10 +683,11 @@ namespace DS4Windows useDInputOnly[Index] = false; x360controls[Index] = new Xbox360Controller(vigemTestClient); int devIndex = Index; - x360controls[Index].FeedbackReceived += (sender, args) => + /*x360controls[Index].FeedbackReceived += (sender, args) => { SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex); }; + */ x360controls[Index].Connect(); LogDebug("X360 Controller #" + (Index + 1) + " connected"); } @@ -1058,10 +1060,11 @@ namespace DS4Windows { LogDebug("Plugging in X360 Controller #" + (ind + 1)); x360controls[ind] = new Xbox360Controller(vigemTestClient); - x360controls[ind].FeedbackReceived += (eventsender, args) => + /*x360controls[ind].FeedbackReceived += (eventsender, args) => { SetDevRumble(device, args.LargeMotor, args.SmallMotor, ind); }; + */ x360controls[ind].Connect(); useDInputOnly[ind] = false; LogDebug("X360 Controller #" + (ind + 1) + " connected"); diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs index 9d51b3c..ed0a84f 100644 --- a/DS4Windows/DS4Control/ScpUtil.cs +++ b/DS4Windows/DS4Control/ScpUtil.cs @@ -3064,6 +3064,11 @@ namespace DS4Windows if (xinputStatus && xinputPlug) { 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(); Global.useDInputOnly[device] = false; AppLogger.LogToGui("X360 Controller # " + (device + 1) + " connected", false);