diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 53c914b2..ab293a4a 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -15,7 +15,7 @@ AnyCPU False True - 0.141 + 0.142 diff --git a/app/USB/AsusHid.cs b/app/USB/AsusHid.cs index fcd89da4..62838bd5 100644 --- a/app/USB/AsusHid.cs +++ b/app/USB/AsusHid.cs @@ -13,7 +13,6 @@ public static class AsusHid static int[] deviceIds = { 0x1a30, 0x1854, 0x1869, 0x1866, 0x19b6, 0x1822, 0x1837, 0x1854, 0x184a, 0x183d, 0x8502, 0x1807, 0x17e0, 0x18c6, 0x1abe }; static HidStream? auraStream; - static int featureLength; public static IEnumerable? FindDevices(byte reportId) { @@ -95,10 +94,7 @@ public static class AsusHid foreach (var data in dataList) try { - var payload = new byte[device.GetMaxFeatureReportLength()]; - Array.Copy(data, payload, data.Length); - stream.SetFeature(payload); - //stream.Write(data); + stream.Write(data); Logger.WriteLine($"{log} {device.ProductID.ToString("X")}: {BitConverter.ToString(data)}"); } catch (Exception ex) @@ -111,20 +107,12 @@ public static class AsusHid public static void WriteAura(byte[] data) { - if (auraStream == null) - { - auraStream = FindHidStream(AURA_ID); - if (auraStream == null) return; - - featureLength = auraStream.Device.GetMaxFeatureReportLength(); - } + if (auraStream == null) auraStream = FindHidStream(AURA_ID); + if (auraStream == null) return; try { - var payload = new byte[featureLength]; - Array.Copy(data, payload, data.Length); - auraStream.SetFeature(payload); - //auraStream.Write(data); + auraStream.Write(data); } catch (Exception ex) { diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs index 296a13dd..7ccbc29c 100644 --- a/app/USB/Aura.cs +++ b/app/USB/Aura.cs @@ -84,8 +84,6 @@ namespace GHelper.USB static public bool isSingleColor = false; - static bool isOldHeatmap = AppConfig.Is("old_heatmap"); - static System.Timers.Timer timer = new System.Timers.Timer(1000); private static Dictionary _modesSingleColor = new Dictionary @@ -543,11 +541,11 @@ namespace GHelper.USB if (init) { - Init(); + //Init(); AsusHid.WriteAura(new byte[] { AsusHid.AURA_ID, 0xbc, 1 }); } - byte[] buffer = new byte[64]; + byte[] buffer = new byte[12]; buffer[0] = AsusHid.AURA_ID; buffer[1] = 0xbc; buffer[2] = 1;