From a66df0a3940dc50247c8823e7891486673e2f048 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:54:41 +0100 Subject: [PATCH] Allow setting GPU clock limit when clock offsets are default https://github.com/seerge/g-helper/issues/1557 --- app/Extra.cs | 2 +- app/Helpers/ProcessHelper.cs | 3 ++- app/Input/InputDispatcher.cs | 2 +- app/Mode/ModeControl.cs | 15 +++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Extra.cs b/app/Extra.cs index 787ab686..5dc5f3aa 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -153,7 +153,7 @@ namespace GHelper labelM1.Text = "FN+F2"; labelM2.Text = "FN+F3"; labelM3.Text = "FN+F4"; - labelM4.Visible = comboM4.Visible = textM4.Visible = false; + labelM4.Visible = comboM4.Visible = textM4.Visible = AppConfig.IsDUO(); labelFNF4.Visible = comboFNF4.Visible = textFNF4.Visible = false; } diff --git a/app/Helpers/ProcessHelper.cs b/app/Helpers/ProcessHelper.cs index 500d9d60..2f5286e6 100644 --- a/app/Helpers/ProcessHelper.cs +++ b/app/Helpers/ProcessHelper.cs @@ -133,9 +133,10 @@ namespace GHelper.Helpers cmd.StartInfo.Arguments = args; cmd.Start(); + Logger.WriteLine(args); + string result = cmd.StandardOutput.ReadToEnd().Replace(Environment.NewLine, " ").Trim(' '); - Logger.WriteLine(args); Logger.WriteLine(result); cmd.WaitForExit(); diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index 6723de4d..0ddf5408 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -68,7 +68,7 @@ namespace GHelper.Input SetBacklightAuto(); } - //Debug.WriteLine(iddle.TotalSeconds); + //Logger.WriteLine("Iddle: " + iddle.TotalSeconds); } public void Init() diff --git a/app/Mode/ModeControl.cs b/app/Mode/ModeControl.cs index d4c6d74c..adabb763 100644 --- a/app/Mode/ModeControl.cs +++ b/app/Mode/ModeControl.cs @@ -1,5 +1,4 @@ -using GHelper.Battery; -using GHelper.Gpu.NVidia; +using GHelper.Gpu.NVidia; using GHelper.Helpers; using Ryzen; @@ -71,7 +70,7 @@ namespace GHelper.Mode Modes.SetCurrent(mode); int status = Program.acpi.DeviceSet(AsusACPI.PerformanceMode, AppConfig.IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode"); - + // Vivobook fallback if (status != 1) { @@ -311,13 +310,13 @@ namespace GHelper.Mode int memory = AppConfig.GetMode("gpu_memory"); int clock_limit = AppConfig.GetMode("gpu_clock_limit"); - if (core == -1 && memory == -1) return; + if (core == -1 && memory == -1 && clock_limit == -1) return; //if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false; - if (Program.acpi.DeviceGet(AsusACPI.GPUEco) == 1) return; - if (HardwareControl.GpuControl is null) return; - if (!HardwareControl.GpuControl!.IsNvidia) return; + if (Program.acpi.DeviceGet(AsusACPI.GPUEco) == 1) { Logger.WriteLine("Clocks: Eco"); return; } + if (HardwareControl.GpuControl is null) { Logger.WriteLine("Clocks: NoGPUControl"); return; } + if (!HardwareControl.GpuControl!.IsNvidia) { Logger.WriteLine("Clocks: NotNvidia"); return; } using NvidiaGpuControl nvControl = (NvidiaGpuControl)HardwareControl.GpuControl; try @@ -328,7 +327,7 @@ namespace GHelper.Mode } catch (Exception ex) { - Logger.WriteLine(ex.ToString()); + Logger.WriteLine("Clocks Error:" + ex.ToString()); } settings.GPUInit();