FIX: Update DualSense HID support so OutputReports function properly (ISXB-787) (#1900)

* DualSense Edge has a larger OutputReportSize and regular DS controller

* Use actual OutputReport side from the HID descriptor instead of hard-coded value

Author: timkeo

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -15,6 +15,7 @@ however, it has to be formatted properly to pass verification tests.
 - Physical keyboards used on Android/ChromeOS could have keys "stuck" reporting as pressed after a long press and release [ISXB-475](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-475).
 - NullReferenceException thrown when right-clicking an empty Action Map list in Input Actions Editor windows [ISXB-833](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-833).
 - Fixed an issue where `System.ObjectDisposedException` would be thrown when deleting the last ActionMap item in the Input Actions Asset editor.
+- Fixed DualSense Edge's vibration and light bar not working on Windows
 
 ### Changed
 - For Unity 6.0 and above, when an `EventSystem` GameObject is created in the Editor it will have the

Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepad.cs

@@ -86,8 +86,14 @@ public class DualShockGamepad : Gamepad, IDualShockHaptics
         /// <summary>
         /// The last used/added DualShock controller.
         /// </summary>
+        /// <value>Equivalent to <see cref="Gamepad.leftTrigger"/>.</value>
         public new static DualShockGamepad current { get; private set; }
 
+        /// <summary>
+        /// If the controller is connected over HID, returns <see cref="HID.HID.HIDDeviceDescriptor"/> data parsed from <see cref="InputDeviceDescription.capabilities"/>.
+        /// </summary>
+        internal HID.HID.HIDDeviceDescriptor hidDescriptor { get; private set; }
+
         /// <inheritdoc />
         public override void MakeCurrent()
         {
@@ -118,6 +124,9 @@ protected override void FinishSetup()
             R2 = rightTrigger;
             L3 = leftStickButton;
             R3 = rightStickButton;
+
+            if (m_Description.capabilities != null && m_Description.interfaceName == "HID")
+                hidDescriptor = HID.HID.HIDDeviceDescriptor.FromJson(m_Description.capabilities);
         }
 
         /// <inheritdoc />

Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockGamepadHID.cs

@@ -99,11 +99,11 @@ internal struct DualSenseHIDUSBOutputReport : IInputDeviceCommandInfo
         [FieldOffset(InputDeviceCommand.BaseCommandSize + 0)] public byte reportId;
         [FieldOffset(InputDeviceCommand.BaseCommandSize + 1)] public DualSenseHIDOutputReportPayload payload;
 
-        public static DualSenseHIDUSBOutputReport Create(DualSenseHIDOutputReportPayload payload)
+        public static DualSenseHIDUSBOutputReport Create(DualSenseHIDOutputReportPayload payload, int outputReportSize)
         {
             return new DualSenseHIDUSBOutputReport
             {
-                baseCommand = new InputDeviceCommand(Type, kSize),
+                baseCommand = new InputDeviceCommand(Type, InputDeviceCommand.kBaseCommandSize + outputReportSize),
                 reportId = 2,
                 payload = payload
             };
@@ -127,11 +127,11 @@ internal struct DualSenseHIDBluetoothOutputReport : IInputDeviceCommandInfo
 
         [FieldOffset(InputDeviceCommand.BaseCommandSize + 0)] public unsafe fixed byte rawData[74];
 
-        public static DualSenseHIDBluetoothOutputReport Create(DualSenseHIDOutputReportPayload payload, byte outputSequenceId)
+        public static DualSenseHIDBluetoothOutputReport Create(DualSenseHIDOutputReportPayload payload, byte outputSequenceId, int outputReportSize)
         {
             var report = new DualSenseHIDBluetoothOutputReport
             {
-                baseCommand = new InputDeviceCommand(Type, kSize),
+                baseCommand = new InputDeviceCommand(Type, InputDeviceCommand.kBaseCommandSize + outputReportSize),
                 reportId = 0x31,
                 tag1 = (byte)((outputSequenceId & 0xf) << 4),
                 tag2 = 0x10,
@@ -317,11 +317,11 @@ public void SetColor(Color color)
             blueColor = (byte)Mathf.Clamp(color.b * 255, 0, 255);
         }
 
-        public static DualShockHIDOutputReport Create()
+        public static DualShockHIDOutputReport Create(int outputReportSize)
         {
             return new DualShockHIDOutputReport
             {
-                baseCommand = new InputDeviceCommand(Type, kSize),
+                baseCommand = new InputDeviceCommand(Type, InputDeviceCommand.kBaseCommandSize + outputReportSize),
                 reportId = kReportId,
             };
         }
@@ -439,7 +439,7 @@ public bool SetMotorSpeedsAndLightBarColor(float? lowFrequency, float? highFrequ
 
             ////FIXME: Bluetooth reports are not working
             //var command = DualSenseHIDBluetoothOutputReport.Create(payload, ++outputSequenceId);
-            var command = DualSenseHIDUSBOutputReport.Create(payload);
+            var command = DualSenseHIDUSBOutputReport.Create(payload, hidDescriptor.outputReportSize);
             return ExecuteCommand(ref command) >= 0;
         }
 
@@ -732,7 +732,7 @@ public override void PauseHaptics()
             if (!m_LowFrequencyMotorSpeed.HasValue && !m_HighFrequenceyMotorSpeed.HasValue && !m_LightBarColor.HasValue)
                 return;
 
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
             command.SetMotorSpeeds(0f, 0f);
             ////REVIEW: when pausing&resuming haptics, you probably don't want the lightbar color to change
             if (m_LightBarColor.HasValue)
@@ -746,7 +746,7 @@ public override void ResetHaptics()
             if (!m_LowFrequencyMotorSpeed.HasValue && !m_HighFrequenceyMotorSpeed.HasValue && !m_LightBarColor.HasValue)
                 return;
 
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
             command.SetMotorSpeeds(0f, 0f);
             if (m_LightBarColor.HasValue)
                 command.SetColor(Color.black);
@@ -763,7 +763,7 @@ public override void ResumeHaptics()
             if (!m_LowFrequencyMotorSpeed.HasValue && !m_HighFrequenceyMotorSpeed.HasValue && !m_LightBarColor.HasValue)
                 return;
 
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
 
             if (m_LowFrequencyMotorSpeed.HasValue || m_HighFrequenceyMotorSpeed.HasValue)
                 command.SetMotorSpeeds(m_LowFrequencyMotorSpeed.Value, m_HighFrequenceyMotorSpeed.Value);
@@ -777,7 +777,7 @@ public override void ResumeHaptics()
 
         public override void SetLightBarColor(Color color)
         {
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
             command.SetColor(color);
 
             ExecuteCommand(ref command);
@@ -787,7 +787,7 @@ public override void SetLightBarColor(Color color)
 
         public override void SetMotorSpeeds(float lowFrequency, float highFrequency)
         {
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
             command.SetMotorSpeeds(lowFrequency, highFrequency);
 
             ExecuteCommand(ref command);
@@ -815,7 +815,7 @@ public override void SetMotorSpeeds(float lowFrequency, float highFrequency)
         /// for the respective documentation regarding setting rumble and light bar color.</remarks>
         public bool SetMotorSpeedsAndLightBarColor(float lowFrequency, float highFrequency, Color color)
         {
-            var command = DualShockHIDOutputReport.Create();
+            var command = DualShockHIDOutputReport.Create(hidDescriptor.outputReportSize);
             command.SetMotorSpeeds(lowFrequency, highFrequency);
             command.SetColor(color);