From 887e769bc60423ffe9e29bbcaa28cd0d53702bf0 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:43:26 +0200 Subject: [PATCH] Vivobook Mux code cleanup --- app/AsusACPI.cs | 5 +++-- app/Gpu/GPUModeControl.cs | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/AsusACPI.cs b/app/AsusACPI.cs index 795185aa..ba827fca 100644 --- a/app/AsusACPI.cs +++ b/app/AsusACPI.cs @@ -72,7 +72,7 @@ public class AsusACPI public const uint GPUXGConnected = 0x00090018; public const uint GPUXG = 0x00090019; - public const uint GPUMux = 0x00090016; + public const uint GPUMuxROG = 0x00090016; public const uint GPUMuxVivo = 0x00090026; public const uint BatteryLimit = 0x00120057; @@ -171,7 +171,8 @@ public class AsusACPI private bool? _allAMD = null; private bool? _overdrive = null; - public static uint GPUEco => AppConfig.IsVivoZenbook() ? GPUEcoVivo : GPUEcoROG; + public static uint GPUEco => AppConfig.IsVivoZenbook() ? GPUEcoVivo : GPUEcoROG; + public static uint GPUMux => AppConfig.IsVivoZenbook() ? GPUMuxVivo : GPUMuxROG; [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)] private static extern IntPtr CreateFile( diff --git a/app/Gpu/GPUModeControl.cs b/app/Gpu/GPUModeControl.cs index 84be4686..5e47b83f 100644 --- a/app/Gpu/GPUModeControl.cs +++ b/app/Gpu/GPUModeControl.cs @@ -25,8 +25,6 @@ namespace GHelper.Gpu int eco = Program.acpi.DeviceGet(AsusACPI.GPUEco); int mux = Program.acpi.DeviceGet(AsusACPI.GPUMux); - if (mux < 0) mux = Program.acpi.DeviceGet(AsusACPI.GPUMuxVivo); - Logger.WriteLine("Eco flag : " + eco); Logger.WriteLine("Mux flag : " + mux); @@ -83,7 +81,6 @@ namespace GHelper.Gpu if (dialogResult == DialogResult.Yes) { status = Program.acpi.DeviceSet(AsusACPI.GPUMux, 1, "GPUMux"); - if (status != 1) Program.acpi.DeviceSet(AsusACPI.GPUMuxVivo, 1, "GPUMuxVivo"); restart = true; changed = true; } @@ -99,7 +96,6 @@ namespace GHelper.Gpu Thread.Sleep(100); } status = Program.acpi.DeviceSet(AsusACPI.GPUMux, 0, "GPUMux"); - if (status != 1) Program.acpi.DeviceSet(AsusACPI.GPUMuxVivo, 0, "GPUMuxVivo"); restart = true; changed = true; }