XGM USB device detection tweaks #5008

Author: seerge

app/USB/XGM.cs

@@ -1,23 +1,37 @@
 // Reference : thanks to https://github.com/RomanYazvinsky/ for initial discovery of XGM payloads
 
 using HidSharp;
+using HidSharp.Reports;
 using System.Text;
 
 namespace GHelper.USB
 {
     public static class XGM
     {
+        const byte XGM_REPORT_ID = 0x5e;
         const int ASUS_ID = 0x0b05;
-        static readonly int[] deviceIds = { 0x1970, 0x1a9a, 0x1C29};
+        static readonly int[] deviceIds = { 0x1970, 0x1a9a, 0x1C29, 0x19b6};
 
         public static HidDevice? GetDevice()
         {
             try
             {
+                var devices = DeviceList.Local.GetHidDevices(ASUS_ID).Where(device =>
+                    deviceIds.Contains(device.ProductID) &&
+                    device.CanOpen);
+
+                /*
+                foreach (var device in devices)
+                {
+                    var report = device.GetReportDescriptor().TryGetReport(ReportType.Feature, XGM_REPORT_ID, out _);
+                    Logger.WriteLine($"Found XGM Device: PID={device.ProductID}, MaxFeatureReportLength={device.GetMaxFeatureReportLength()}, Report={report}");
+                }
+                */
+
                 return DeviceList.Local.GetHidDevices(ASUS_ID).FirstOrDefault(device =>
                     deviceIds.Contains(device.ProductID) &&
                     device.CanOpen &&
-                    device.GetMaxFeatureReportLength() >= 300);
+                    device.GetReportDescriptor().TryGetReport(ReportType.Feature, XGM_REPORT_ID, out _));
             }
             catch (Exception ex)
             {
@@ -44,7 +58,7 @@ public static void Write(byte[] data)
 
                 using (HidStream hidStream = device.Open())
                 {
-                    byte[] payload = new byte[300];
+                    byte[] payload = new byte[device.GetMaxFeatureReportLength()];
                     data.CopyTo(payload, 0);
                     hidStream.SetFeature(payload);
                     Logger.WriteLine($"XGM-{device.ProductID}|{device.GetMaxFeatureReportLength()}:{BitConverter.ToString(data)}");
@@ -71,7 +85,7 @@ public static void Init()
 
         public static void Light(bool status)
         {
-            Write([0x5e, 0xc5, status ? (byte)0x50 : (byte)0]);
+            Write([XGM_REPORT_ID, 0xc5, status ? (byte)0x50 : (byte)0]);
         }
 
         public static void InitLight()
@@ -86,7 +100,7 @@ public static void Reset()
         {
             Task.Run(() =>
             {
-                if (IsConnected()) Write([0x5e, 0xd1, 0x02]);
+                if (IsConnected()) Write([XGM_REPORT_ID, 0xd1, 0x02]);
             });
         }
 
@@ -98,7 +112,7 @@ public static void SetFan(byte[] curve)
                 {
                     if (AsusACPI.IsInvalidCurve(curve)) return;
                     byte[] msg = new byte[19];
-                    Array.Copy(new byte[] { 0x5e, 0xd1, 0x01 }, msg, 3);
+                    Array.Copy(new byte[] { XGM_REPORT_ID, 0xd1, 0x01 }, msg, 3);
                     Array.Copy(curve, 0, msg, 3, curve.Length);
                     Write(msg);
                 }