From a9c104d3880cdf07335c7a4f677030df5d8cf7d2 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Thu, 27 Jul 2023 01:41:25 +0200 Subject: [PATCH] Duo keys --- app/AsusUSB.cs | 14 +++++++++++--- app/Input/InputDispatcher.cs | 10 +++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index 27762592..29539fd2 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -88,6 +88,11 @@ namespace GHelper } private static void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e) + { + SetHeatmap(); + } + + static void SetHeatmap(bool init = false) { float cpuTemp = (float)HardwareControl.GetCPUTemp(); int freeze = 20, cold = 40, warm = 65, hot = 90; @@ -100,7 +105,7 @@ namespace GHelper else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((float)cpuTemp - warm) / (hot - warm)); else color = Color.Red; - ApplyColor(color); + ApplyColor(color, init); } public static Dictionary GetSpeeds() @@ -423,8 +428,9 @@ namespace GHelper } } - public static void ApplyColor(Color color) + public static void ApplyColor(Color color, bool init = false) { + if (isTuf) { Program.acpi.TUFKeyboardRGB(0, color, 0); @@ -441,7 +447,7 @@ namespace GHelper msg[1] = 0xbc; msg[2] = 1; msg[3] = 1; - msg[4] = isStrix ? (byte)4 : (byte)0; + msg[4] = 4; for (int i = 0; i < 10; i++) { @@ -451,6 +457,7 @@ namespace GHelper } //Logger.WriteLine(BitConverter.ToString(msg)); + if (init) auraDevice.Write(new byte[] { AURA_HID_ID ,0xbc}); auraDevice.Write(msg); } @@ -465,6 +472,7 @@ namespace GHelper if (Mode == HEATMAP) { + SetHeatmap(true); timer.Enabled = true; return; } diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index 3fb27ac1..820d1ff8 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -2,7 +2,6 @@ using GHelper.Helpers; using GHelper.Mode; using Microsoft.Win32; -using NAudio.CoreAudioApi; using System.Diagnostics; using System.Management; @@ -150,9 +149,10 @@ namespace GHelper.Input public static bool NoMKeys() { - return AppConfig.ContainsModel("Z13") || - AppConfig.ContainsModel("FA506") || + return AppConfig.ContainsModel("Z13") || + AppConfig.ContainsModel("FA506") || AppConfig.ContainsModel("FX506") || + AppConfig.ContainsModel("Duo") || AppConfig.ContainsModel("FX505"); } @@ -179,7 +179,7 @@ namespace GHelper.Input } } - if (AppConfig.ContainsModel("Z13")) + if (AppConfig.ContainsModel("Z13") || AppConfig.ContainsModel("Duo")) { switch (e.Key) { @@ -534,7 +534,7 @@ namespace GHelper.Input AppConfig.Set("screenpad", brightness); - Program.acpi.DeviceSet(AsusACPI.ScreenPadBrightness, (brightness*255/100), "Screenpad"); + Program.acpi.DeviceSet(AsusACPI.ScreenPadBrightness, (brightness * 255 / 100), "Screenpad"); if (brightness == 0) Program.acpi.DeviceSet(AsusACPI.ScreenPadToggle, brightness, "ScreenpadToggle"); Program.toast.RunToast($"Screen Pad {brightness}", delta > 0 ? ToastIcon.BrightnessUp : ToastIcon.BrightnessDown);