From bdba153ddc8509b70f33adffc3633530334b7100 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 20 Apr 2024 18:57:10 +0200 Subject: [PATCH] Slash Lighting tweaks https://github.com/seerge/g-helper/issues/2381 --- app/AnimeMatrix/AniMatrixControl.cs | 7 ++++++- app/AnimeMatrix/SlashDevice.cs | 10 ++++++++-- app/AsusMouseSettings.cs | 15 ++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app/AnimeMatrix/AniMatrixControl.cs b/app/AnimeMatrix/AniMatrixControl.cs index f70ef0cd..8d57e417 100644 --- a/app/AnimeMatrix/AniMatrixControl.cs +++ b/app/AnimeMatrix/AniMatrixControl.cs @@ -117,7 +117,12 @@ namespace GHelper.AnimeMatrix public void SetLidMode(bool force = false) { bool matrixLid = AppConfig.Is("matrix_lid"); - if (deviceSlash is not null) deviceSlash.SetLidMode(matrixLid); + + if (deviceSlash is not null) + { + deviceSlash.SetLidMode(matrixLid); + deviceSlash.SetSleepActive(!matrixLid); + } if (matrixLid || force) { diff --git a/app/AnimeMatrix/SlashDevice.cs b/app/AnimeMatrix/SlashDevice.cs index cd464ec6..f2027260 100644 --- a/app/AnimeMatrix/SlashDevice.cs +++ b/app/AnimeMatrix/SlashDevice.cs @@ -137,12 +137,18 @@ namespace GHelper.AnimeMatrix public void SetBatterySaver(bool status) { - Set(Packet(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), "SlashBatterySaver"); + Set(Packet(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), $"SlashBatterySaver {status}"); } public void SetLidMode(bool status) { - Set(Packet(0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00)); + Set(Packet(0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00), $"DisableLidClose {status}"); + } + + public void SetSleepActive(bool status) + { + Set(Packet(0xD2, 0x02, 0x01, 0x08, 0xA1), "SleepInit"); + Set(Packet(0xD3, 0x03, 0x01, 0x08, 0xA1, 0x00, 0xFF, status ? (byte)0x01 : (byte)0x00, 0x02, 0xFF, 0xFF), $"Sleep {status}"); } public void Set(Packet packet, string? log = null) diff --git a/app/AsusMouseSettings.cs b/app/AsusMouseSettings.cs index c1803c88..220270f8 100644 --- a/app/AsusMouseSettings.cs +++ b/app/AsusMouseSettings.cs @@ -866,14 +866,23 @@ namespace GHelper private void VisualizeCurrentDPIProfile() { - if (mouse.DpiProfile > mouse.DpiSettings.Count()) + if (mouse.DpiProfile > mouse.DpiSettings.Length) { Logger.WriteLine($"Wrong mouse DPI: {mouse.DpiProfile}"); return; } - AsusMouseDPI dpi = mouse.DpiSettings[mouse.DpiProfile - 1]; - + AsusMouseDPI dpi; + + try + { + dpi = mouse.DpiSettings[mouse.DpiProfile - 1]; + } catch (Exception ex) + { + Logger.WriteLine($"Wrong mouse DPI: {mouse.DpiProfile} {mouse.DpiSettings.Length} {ex.Message}"); + return; + } + if (dpi is null) { return;