CHANGE: Make DualSenseHIDInputReport public so it can be used in child devices (#1945)

* Make Dualsense Input Report public

* Add test for dualsense recognition

* Retrieve Lightbar color

* BUMP: Version 1.9.0

---------

Co-authored-by: Håkan Sidenvall <[email protected]>

Author: lewish-unity

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/Plugins/DualShockTests.cs

@@ -177,6 +177,25 @@ public void Devices_SupportsDualShockAsHID_WithJustPIDAndVID(int vendorId, int p
         Assert.That(device, Is.AssignableTo<DualShockGamepad>());
     }
 
+    [Test]
+    [Category("Devices")]
+    [TestCase(0x54C, 0xCE6)]
+    [TestCase(0x54C, 0xDF2)] //Dualsense Edge
+    public void Devices_SupportsDualsenseAsHID_WithJustPIDAndVID(int vendorId, int productId)
+    {
+        var device = InputSystem.AddDevice(new InputDeviceDescription
+        {
+            interfaceName = "HID",
+            capabilities = new HID.HIDDeviceDescriptor
+            {
+                vendorId = vendorId,
+                productId = productId,
+            }.ToJson()
+        });
+
+        Assert.That(device, Is.AssignableTo<DualSenseGamepadHID>());
+    }
+
 #if UNITY_WSA
     [Test]
     [Category("Devices")]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -33,6 +33,9 @@ however, it has to be formatted properly to pass verification tests.
   set by `InputSystem.settings.maxEventsBytesPerUpdate`. This additional information is available in development builds
   only.
 
+### Changed
+- Changed `DualSenseHIDInputReport` from internal to public visibility
+
 ## [1.8.2] - 2024-04-29
 
 ### Added

Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs

@@ -16,7 +16,7 @@ public static partial class InputSystem
         // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
         // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
         //       "-preview" suffixes here.
-        internal const string kAssemblyVersion = "1.8.3";
-        internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8";
+        internal const string kAssemblyVersion = "1.9.0";
+        internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.9";
     }
 }

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from "Keyboard" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from "Mouse" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.3
+//     version 1.9.0
 //     from "Touchscreen" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

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

@@ -17,7 +17,7 @@ namespace UnityEngine.InputSystem.DualShock.LowLevel
     /// See ConvertInputReport for the exact conversion.
     /// </summary>
     [StructLayout(LayoutKind.Explicit, Size = 9 /* !!! Beware !!! If you plan to increase this, think about how you gonna fit 10 byte state events because we can only shrink events in IEventPreProcessor */)]
-    internal struct DualSenseHIDInputReport : IInputStateTypeInfo
+    public struct DualSenseHIDInputReport : IInputStateTypeInfo
     {
         public static FourCC Format = new FourCC('D', 'S', 'V', 'S'); // DualSense Virtual State
         public FourCC format => Format;
@@ -349,7 +349,7 @@ public class DualSenseGamepadHID : DualShockGamepad, IEventMerger, IEventPreProc
 
         private float? m_LowFrequencyMotorSpeed;
         private float? m_HighFrequenceyMotorSpeed;
-        private Color? m_LightBarColor;
+        protected Color? m_LightBarColor;
         private byte outputSequenceId;
 
         protected override void FinishSetup()