jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Touchpad toggle fix for FA507 https://github.com/seerge/g-helper/issues/1589

Browse Source
This commit is contained in:
Serge
2023-11-12 20:27:50 +01:00
parent 3249072ee5
commit 96ade7c9a0
6 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/USB/AsusHid.cs
View File

@@ -12,7 +12,7 @@ public static class AsusHid
static int[] deviceIds = { 0x1a30, 0x1854, 0x1869, 0x1866, 0x19b6, 0x1822, 0x1837, 0x1854, 0x184a, 0x183d, 0x8502, 0x1807, 0x17e0, 0x18c6, 0x1abe };
static HidStream _stream;
static HidStream auraStream;
public static HidStream FindHidStream(byte reportId, int minFeatureLength = 1)
{
@@ -50,23 +50,23 @@ public static class AsusHid
return null;
}
static void WriteData(HidStream stream, byte[] data)
static void WriteData(HidStream stream, byte[] data, string log = "USB")
{
try
{
stream.Write(data);
Logger.WriteLine("USB " + stream.Device.ProductID + ": " + BitConverter.ToString(data));
Logger.WriteLine($"{log} " + stream.Device.ProductID + ": " + BitConverter.ToString(data));
}
catch (Exception ex)
{
Debug.WriteLine($"Error writing to HID device: {ex.Message} {BitConverter.ToString(data)}");
Debug.WriteLine($"Error writing {log} to HID device: {ex.Message} {BitConverter.ToString(data)}");
}
}
public static void Write(byte[] data, byte reportId = AURA_ID)
public static void Write(byte[] data, byte reportId = AURA_ID, string log = "USB")
{
using (var stream = FindHidStream(reportId))
WriteData(stream, data);
WriteData(stream, data, log);
}
public static void Write(List<byte[]> dataList, byte reportId = AURA_ID)
{
@@ -75,19 +75,19 @@ public static class AsusHid
WriteData(stream, data);
}
public static void WriteAura(byte[] data, byte reportId = AURA_ID)
public static void WriteAura(byte[] data)
{
if (_stream == null) _stream = FindHidStream(reportId);
if (_stream == null) return;
if (auraStream == null) auraStream = FindHidStream(AURA_ID);
if (auraStream == null) return;
try
{
_stream.Write(data);
auraStream.Write(data);
}
catch (Exception ex)
{
_stream.Dispose();
auraStream.Dispose();
Debug.WriteLine($"Error writing data to HID device: {ex.Message}");
}
}

8
app/USB/Aura.cs
View File

@@ -58,7 +58,7 @@ namespace GHelper.USB
static bool isOldHeatmap = AppConfig.Is("old_heatmap");
static System.Timers.Timer timer = new System.Timers.Timer(80);
static System.Timers.Timer timer = new System.Timers.Timer(1000);
static byte[] AuraPowerMessage(AuraPower flags)
{
@@ -286,15 +286,15 @@ namespace GHelper.USB
if (delay) await Task.Delay(TimeSpan.FromSeconds(1));
if (isTuf) Program.acpi.TUFKeyboardBrightness(brightness);
AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xba, 0xc5, 0xc4, (byte)brightness });
if (AppConfig.ContainsModel("GA503")) AsusHid.Write(new byte[] { AsusHid.INPUT_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, AsusHid.INPUT_ID);
AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, AsusHid.AURA_ID, log);
if (AppConfig.ContainsModel("GA503")) AsusHid.Write(new byte[] { AsusHid.INPUT_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, AsusHid.INPUT_ID, log);
});
}
public static void ApplyAuraPower()
public static void ApplyPower()
{
AuraPower flags = new();