diff --git a/app/AppConfig.cs b/app/AppConfig.cs index 783f2628..2f95adb4 100644 --- a/app/AppConfig.cs +++ b/app/AppConfig.cs @@ -105,6 +105,11 @@ public static class AppConfig return Get(name) == 1; } + public static bool IsNotFalse(string name) + { + return Get(name) != 0; + } + public static string GetString(string name, string empty = null) { if (config.ContainsKey(name)) diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index a5b993ec..010437f1 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -308,9 +308,36 @@ namespace GHelper } - public static void ApplyAuraPower(List flags) + public static void ApplyAuraPower() { + List flags = new(); + + // Keyboard + if (AppConfig.IsNotFalse("keyboard_awake")) flags.Add(AuraDev19b6.AwakeKeyb); + if (AppConfig.IsNotFalse("keyboard_boot")) flags.Add(AuraDev19b6.BootKeyb); + if (AppConfig.IsNotFalse("keyboard_sleep")) flags.Add(AuraDev19b6.SleepKeyb); + if (AppConfig.IsNotFalse("keyboard_shutdown")) flags.Add(AuraDev19b6.ShutdownKeyb); + + // Lightbar + if (AppConfig.IsNotFalse("keyboard_awake_bar")) flags.Add(AuraDev19b6.AwakeBar); + if (AppConfig.IsNotFalse("keyboard_boot_bar")) flags.Add(AuraDev19b6.BootBar); + if (AppConfig.IsNotFalse("keyboard_sleep_bar")) flags.Add(AuraDev19b6.SleepBar); + if (AppConfig.IsNotFalse("keyboard_shutdown_bar")) flags.Add(AuraDev19b6.ShutdownBar); + + // Lid + if (AppConfig.IsNotFalse("keyboard_awake_lid")) flags.Add(AuraDev19b6.AwakeLid); + if (AppConfig.IsNotFalse("keyboard_boot_lid")) flags.Add(AuraDev19b6.BootLid); + if (AppConfig.IsNotFalse("keyboard_sleep_lid")) flags.Add(AuraDev19b6.SleepLid); + if (AppConfig.IsNotFalse("keyboard_shutdown_lid")) flags.Add(AuraDev19b6.ShutdownLid); + + // Logo + if (AppConfig.IsNotFalse("keyboard_awake_logo")) flags.Add(AuraDev19b6.AwakeLogo); + if (AppConfig.IsNotFalse("keyboard_boot_logo")) flags.Add(AuraDev19b6.BootLogo); + if (AppConfig.IsNotFalse("keyboard_sleep_logo")) flags.Add(AuraDev19b6.SleepLogo); + if (AppConfig.IsNotFalse("keyboard_shutdown_logo")) flags.Add(AuraDev19b6.ShutdownLogo); + + byte[] msg = AuraDev19b6Extensions.ToBytes(flags.ToArray()); diff --git a/app/Extra.cs b/app/Extra.cs index c356ce7b..d2369b30 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -135,28 +135,28 @@ namespace GHelper comboKeyboardSpeed.SelectedValueChanged += ComboKeyboardSpeed_SelectedValueChanged; // Keyboard - checkAwake.Checked = !(AppConfig.Get("keyboard_awake") == 0); - checkBoot.Checked = !(AppConfig.Get("keyboard_boot") == 0); - checkSleep.Checked = !(AppConfig.Get("keyboard_sleep") == 0); - checkShutdown.Checked = !(AppConfig.Get("keyboard_shutdown") == 0); + checkAwake.Checked = AppConfig.IsNotFalse("keyboard_awake"); + checkBoot.Checked = AppConfig.IsNotFalse("keyboard_boot"); + checkSleep.Checked = AppConfig.IsNotFalse("keyboard_sleep"); + checkShutdown.Checked = AppConfig.IsNotFalse("keyboard_shutdown"); // Lightbar - checkAwakeBar.Checked = !(AppConfig.Get("keyboard_awake_bar") == 0); - checkBootBar.Checked = !(AppConfig.Get("keyboard_boot_bar") == 0); - checkSleepBar.Checked = !(AppConfig.Get("keyboard_sleep_bar") == 0); - checkShutdownBar.Checked = !(AppConfig.Get("keyboard_shutdown_bar") == 0); + checkAwakeBar.Checked = AppConfig.IsNotFalse("keyboard_awake_bar"); + checkBootBar.Checked = AppConfig.IsNotFalse("keyboard_boot_bar"); + checkSleepBar.Checked = AppConfig.IsNotFalse("keyboard_sleep_bar"); + checkShutdownBar.Checked = AppConfig.IsNotFalse("keyboard_shutdown_bar"); // Lid - checkAwakeLid.Checked = !(AppConfig.Get("keyboard_awake_lid") == 0); - checkBootLid.Checked = !(AppConfig.Get("keyboard_boot_lid") == 0); - checkSleepLid.Checked = !(AppConfig.Get("keyboard_sleep_lid") == 0); - checkShutdownLid.Checked = !(AppConfig.Get("keyboard_shutdown_lid") == 0); + checkAwakeLid.Checked = AppConfig.IsNotFalse("keyboard_awake_lid"); + checkBootLid.Checked = AppConfig.IsNotFalse("keyboard_boot_lid"); + checkSleepLid.Checked = AppConfig.IsNotFalse("keyboard_sleep_lid"); + checkShutdownLid.Checked = AppConfig.IsNotFalse("keyboard_shutdown_lid"); // Logo - checkAwakeLogo.Checked = !(AppConfig.Get("keyboard_awake_logo") == 0); - checkBootLogo.Checked = !(AppConfig.Get("keyboard_boot_logo") == 0); - checkSleepLogo.Checked = !(AppConfig.Get("keyboard_sleep_logo") == 0); - checkShutdownLogo.Checked = !(AppConfig.Get("keyboard_shutdown_logo") == 0); + checkAwakeLogo.Checked = AppConfig.IsNotFalse("keyboard_awake_logo"); + checkBootLogo.Checked = AppConfig.IsNotFalse("keyboard_boot_logo"); + checkSleepLogo.Checked = AppConfig.IsNotFalse("keyboard_sleep_logo"); + checkShutdownLogo.Checked = AppConfig.IsNotFalse("keyboard_shutdown_logo"); checkAwake.CheckedChanged += CheckPower_CheckedChanged; checkBoot.CheckedChanged += CheckPower_CheckedChanged; @@ -431,29 +431,7 @@ namespace GHelper AppConfig.Set("keyboard_sleep_logo", (checkSleepLogo.Checked ? 1 : 0)); AppConfig.Set("keyboard_shutdown_logo", (checkShutdownLogo.Checked ? 1 : 0)); - List flags = new List(); - - if (checkAwake.Checked) flags.Add(AuraDev19b6.AwakeKeyb); - if (checkBoot.Checked) flags.Add(AuraDev19b6.BootKeyb); - if (checkSleep.Checked) flags.Add(AuraDev19b6.SleepKeyb); - if (checkShutdown.Checked) flags.Add(AuraDev19b6.ShutdownKeyb); - - if (checkAwakeBar.Checked) flags.Add(AuraDev19b6.AwakeBar); - if (checkBootBar.Checked) flags.Add(AuraDev19b6.BootBar); - if (checkSleepBar.Checked) flags.Add(AuraDev19b6.SleepBar); - if (checkShutdownBar.Checked) flags.Add(AuraDev19b6.ShutdownBar); - - if (checkAwakeLid.Checked) flags.Add(AuraDev19b6.AwakeLid); - if (checkBootLid.Checked) flags.Add(AuraDev19b6.BootLid); - if (checkSleepLid.Checked) flags.Add(AuraDev19b6.SleepLid); - if (checkShutdownLid.Checked) flags.Add(AuraDev19b6.ShutdownLid); - - if (checkAwakeLogo.Checked) flags.Add(AuraDev19b6.AwakeLogo); - if (checkBootLogo.Checked) flags.Add(AuraDev19b6.BootLogo); - if (checkSleepLogo.Checked) flags.Add(AuraDev19b6.SleepLogo); - if (checkShutdownLogo.Checked) flags.Add(AuraDev19b6.ShutdownLogo); - - AsusUSB.ApplyAuraPower(flags); + AsusUSB.ApplyAuraPower(); } diff --git a/app/Settings.cs b/app/Settings.cs index 11053d4f..19643a38 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -861,6 +861,8 @@ namespace GHelper { InputDispatcher.SetBacklightAuto(true); + AsusUSB.ApplyAuraPower(); + if (Program.acpi.IsXGConnected()) AsusUSB.ApplyXGMLight(AppConfig.Is("xmg_light"));