From 28abc935e605b9fb93cb173022bf58be79c2d2ca Mon Sep 17 00:00:00 2001 From: Bartosz Cichecki Date: Sun, 5 Nov 2023 23:26:29 +0100 Subject: [PATCH] Removed duplicate god mode option --- .../GodMode/AbstractGodModeController.cs | 2 -- .../Controllers/GodMode/GodModeControllerV2.cs | 3 --- LenovoLegionToolkit.Lib/Enums.cs | 1 - .../Settings/GodModeSettings.cs | 1 - LenovoLegionToolkit.Lib/Structs.cs | 4 ---- .../Resources/Resource.Designer.cs | 18 ------------------ .../Resources/Resource.resx | 6 ------ .../Dashboard/GodModeSettingsWindow.xaml | 7 ------- .../Dashboard/GodModeSettingsWindow.xaml.cs | 8 +------- 9 files changed, 1 insertion(+), 49 deletions(-) diff --git a/LenovoLegionToolkit.Lib/Controllers/GodMode/AbstractGodModeController.cs b/LenovoLegionToolkit.Lib/Controllers/GodMode/AbstractGodModeController.cs index d5145a89a5..7eb9fbfc4d 100644 --- a/LenovoLegionToolkit.Lib/Controllers/GodMode/AbstractGodModeController.cs +++ b/LenovoLegionToolkit.Lib/Controllers/GodMode/AbstractGodModeController.cs @@ -88,7 +88,6 @@ public Task SetStateAsync(GodModeState state) CPUPL1Tau = preset.CPUPL1Tau, APUsPPTPowerLimit = preset.APUsPPTPowerLimit, CPUTemperatureLimit = preset.CPUTemperatureLimit, - CPUToGPUDynamicBoost = preset.CPUToGPUDynamicBoost, GPUPowerBoost = preset.GPUPowerBoost, GPUConfigurableTGP = preset.GPUConfigurableTGP, GPUTemperatureLimit = preset.GPUTemperatureLimit, @@ -174,7 +173,6 @@ private async Task LoadStateFromStoreAsync(GodModeSettings.GodMode CPUPL1Tau = CreateStepperValue(defaultState.CPUPL1Tau, preset.CPUPL1Tau, preset.MinValueOffset, preset.MaxValueOffset), APUsPPTPowerLimit = CreateStepperValue(defaultState.APUsPPTPowerLimit, preset.APUsPPTPowerLimit, preset.MinValueOffset, preset.MaxValueOffset), CPUTemperatureLimit = CreateStepperValue(defaultState.CPUTemperatureLimit, preset.CPUTemperatureLimit, preset.MinValueOffset, preset.MaxValueOffset), - CPUToGPUDynamicBoost = CreateStepperValue(defaultState.CPUToGPUDynamicBoost, preset.CPUToGPUDynamicBoost), GPUPowerBoost = CreateStepperValue(defaultState.GPUPowerBoost, preset.GPUPowerBoost, preset.MinValueOffset, preset.MaxValueOffset), GPUConfigurableTGP = CreateStepperValue(defaultState.GPUConfigurableTGP, preset.GPUConfigurableTGP, preset.MinValueOffset, preset.MaxValueOffset), GPUTemperatureLimit = CreateStepperValue(defaultState.GPUTemperatureLimit, preset.GPUTemperatureLimit, preset.MinValueOffset, preset.MaxValueOffset), diff --git a/LenovoLegionToolkit.Lib/Controllers/GodMode/GodModeControllerV2.cs b/LenovoLegionToolkit.Lib/Controllers/GodMode/GodModeControllerV2.cs index 9403d515aa..a8e7953dc4 100644 --- a/LenovoLegionToolkit.Lib/Controllers/GodMode/GodModeControllerV2.cs +++ b/LenovoLegionToolkit.Lib/Controllers/GodMode/GodModeControllerV2.cs @@ -47,7 +47,6 @@ public override async Task ApplyStateAsync() { CapabilityID.CPUPL1Tau, preset.CPUPL1Tau }, { CapabilityID.APUsPPTPowerLimit, preset.APUsPPTPowerLimit }, { CapabilityID.CPUTemperatureLimit, preset.CPUTemperatureLimit }, - { CapabilityID.CPUToGPUDynamicBoost, preset.CPUToGPUDynamicBoost }, { CapabilityID.GPUPowerBoost, preset.GPUPowerBoost }, { CapabilityID.GPUConfigurableTGP, preset.GPUConfigurableTGP }, { CapabilityID.GPUTemperatureLimit, preset.GPUTemperatureLimit }, @@ -168,7 +167,6 @@ public override async Task> GetDefau CPUPL1Tau = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.CPUPL1Tau, powerMode), APUsPPTPowerLimit = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.APUsPPTPowerLimit, powerMode), CPUTemperatureLimit = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.CPUTemperatureLimit, powerMode), - CPUToGPUDynamicBoost = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.CPUToGPUDynamicBoost, powerMode), GPUPowerBoost = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.GPUPowerBoost, powerMode), GPUConfigurableTGP = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.GPUConfigurableTGP, powerMode), GPUTemperatureLimit = GetDefaultCapabilityIdValueInPowerMode(allCapabilityData, CapabilityID.GPUTemperatureLimit, powerMode), @@ -247,7 +245,6 @@ protected override async Task GetDefaultStateAsync() CPUPL1Tau = stepperValues.GetValueOrNull(CapabilityID.CPUPL1Tau), APUsPPTPowerLimit = stepperValues.GetValueOrNull(CapabilityID.APUsPPTPowerLimit), CPUTemperatureLimit = stepperValues.GetValueOrNull(CapabilityID.CPUTemperatureLimit), - CPUToGPUDynamicBoost = stepperValues.GetValueOrNull(CapabilityID.CPUToGPUDynamicBoost), GPUPowerBoost = stepperValues.GetValueOrNull(CapabilityID.GPUPowerBoost), GPUConfigurableTGP = stepperValues.GetValueOrNull(CapabilityID.GPUConfigurableTGP), GPUTemperatureLimit = stepperValues.GetValueOrNull(CapabilityID.GPUTemperatureLimit), diff --git a/LenovoLegionToolkit.Lib/Enums.cs b/LenovoLegionToolkit.Lib/Enums.cs index 330a60ed22..1d5758c442 100644 --- a/LenovoLegionToolkit.Lib/Enums.cs +++ b/LenovoLegionToolkit.Lib/Enums.cs @@ -52,7 +52,6 @@ public enum CapabilityID APUsPPTPowerLimit = 0x0105FF00, CPUCrossLoadingPowerLimit = 0x0106FF00, CPUPL1Tau = 0x0107FF00, - CPUToGPUDynamicBoost = 0x0201FF00, GPUPowerBoost = 0x0201FF00, GPUConfigurableTGP = 0x0202FF00, GPUTemperatureLimit = 0x0203FF00, diff --git a/LenovoLegionToolkit.Lib/Settings/GodModeSettings.cs b/LenovoLegionToolkit.Lib/Settings/GodModeSettings.cs index 42c8adf229..b4a47abe6e 100644 --- a/LenovoLegionToolkit.Lib/Settings/GodModeSettings.cs +++ b/LenovoLegionToolkit.Lib/Settings/GodModeSettings.cs @@ -18,7 +18,6 @@ public class Preset public StepperValue? CPUPL1Tau { get; init; } public StepperValue? APUsPPTPowerLimit { get; init; } public StepperValue? CPUTemperatureLimit { get; init; } - public StepperValue? CPUToGPUDynamicBoost { get; init; } public StepperValue? GPUPowerBoost { get; init; } public StepperValue? GPUConfigurableTGP { get; init; } public StepperValue? GPUTemperatureLimit { get; init; } diff --git a/LenovoLegionToolkit.Lib/Structs.cs b/LenovoLegionToolkit.Lib/Structs.cs index af6dd3decd..be94357eca 100644 --- a/LenovoLegionToolkit.Lib/Structs.cs +++ b/LenovoLegionToolkit.Lib/Structs.cs @@ -264,7 +264,6 @@ public readonly struct GodModeDefaults public int? CPUPL1Tau { get; init; } public int? APUsPPTPowerLimit { get; init; } public int? CPUTemperatureLimit { get; init; } - public int? CPUToGPUDynamicBoost { get; init; } public int? GPUPowerBoost { get; init; } public int? GPUConfigurableTGP { get; init; } public int? GPUTemperatureLimit { get; init; } @@ -281,7 +280,6 @@ public override string ToString() => $" {nameof(CPUPL1Tau)}: {CPUPL1Tau}," + $" {nameof(APUsPPTPowerLimit)}: {APUsPPTPowerLimit}," + $" {nameof(CPUTemperatureLimit)}: {CPUTemperatureLimit}," + - $" {nameof(CPUToGPUDynamicBoost)}: {CPUToGPUDynamicBoost}," + $" {nameof(GPUPowerBoost)}: {GPUPowerBoost}," + $" {nameof(GPUConfigurableTGP)}: {GPUConfigurableTGP}," + $" {nameof(GPUTemperatureLimit)}: {GPUTemperatureLimit}," + @@ -307,7 +305,6 @@ public readonly struct GodModePreset public StepperValue? CPUPL1Tau { get; init; } public StepperValue? APUsPPTPowerLimit { get; init; } public StepperValue? CPUTemperatureLimit { get; init; } - public StepperValue? CPUToGPUDynamicBoost { get; init; } public StepperValue? GPUPowerBoost { get; init; } public StepperValue? GPUConfigurableTGP { get; init; } public StepperValue? GPUTemperatureLimit { get; init; } @@ -327,7 +324,6 @@ public override string ToString() => $" {nameof(CPUPL1Tau)}: {CPUPL1Tau}," + $" {nameof(APUsPPTPowerLimit)}: {APUsPPTPowerLimit}," + $" {nameof(CPUTemperatureLimit)}: {CPUTemperatureLimit}," + - $" {nameof(CPUToGPUDynamicBoost)}: {CPUToGPUDynamicBoost}," + $" {nameof(GPUPowerBoost)}: {GPUPowerBoost}," + $" {nameof(GPUConfigurableTGP)}: {GPUConfigurableTGP}," + $" {nameof(GPUTemperatureLimit)}: {GPUTemperatureLimit}," + diff --git a/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs b/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs index 0ca71572a2..0ee9a04a9b 100644 --- a/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs +++ b/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs @@ -2139,24 +2139,6 @@ public static string GodModeSettingsWindow_CPU_Title { } } - /// - /// Looks up a localized string similar to CPU to GPU Dynamic Boost. - /// - public static string GodModeSettingsWindow_CPU_ToGpuDynamicBoostControl { - get { - return ResourceManager.GetString("GodModeSettingsWindow_CPU_ToGpuDynamicBoostControl", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to This is the maximum additional power that can be allocated to the GPU from the CPU based on CPU usage. The higher the value, the better the performance of applications that use the GPU.. - /// - public static string GodModeSettingsWindow_CPU_ToGpuDynamicBoostControl_Description { - get { - return ResourceManager.GetString("GodModeSettingsWindow_CPU_ToGpuDynamicBoostControl_Description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Name. /// diff --git a/LenovoLegionToolkit.WPF/Resources/Resource.resx b/LenovoLegionToolkit.WPF/Resources/Resource.resx index e5a794a207..f7cb3d2373 100644 --- a/LenovoLegionToolkit.WPF/Resources/Resource.resx +++ b/LenovoLegionToolkit.WPF/Resources/Resource.resx @@ -1895,12 +1895,6 @@ Requires restart. Updates - - CPU to GPU Dynamic Boost - - - This is the maximum additional power that can be allocated to the GPU from the CPU based on CPU usage. The higher the value, the better the performance of applications that use the GPU. - GPU to CPU Dynamic Boost diff --git a/LenovoLegionToolkit.WPF/Windows/Dashboard/GodModeSettingsWindow.xaml b/LenovoLegionToolkit.WPF/Windows/Dashboard/GodModeSettingsWindow.xaml index e636be342f..e225c1b6ee 100644 --- a/LenovoLegionToolkit.WPF/Windows/Dashboard/GodModeSettingsWindow.xaml +++ b/LenovoLegionToolkit.WPF/Windows/Dashboard/GodModeSettingsWindow.xaml @@ -176,13 +176,6 @@ Description="{x:Static resources:Resource.GodModeSettingsWindow_CPU_TempLimit_Description}" Unit="°C" /> - - ApplyAsync() CPUPL1Tau = preset.CPUPL1Tau?.WithValue(_cpuPL1TauControl.Value), APUsPPTPowerLimit = preset.APUsPPTPowerLimit?.WithValue(_apuSPPTPowerLimitControl.Value), CPUTemperatureLimit = preset.CPUTemperatureLimit?.WithValue(_cpuTemperatureLimitControl.Value), - CPUToGPUDynamicBoost = preset.CPUToGPUDynamicBoost?.WithValue(_cpuToGpuDynamicBoostControl.Value), GPUPowerBoost = preset.GPUPowerBoost?.WithValue(_gpuPowerBoostControl.Value), GPUConfigurableTGP = preset.GPUConfigurableTGP?.WithValue(_gpuConfigurableTGPControl.Value), GPUTemperatureLimit = preset.GPUTemperatureLimit?.WithValue(_gpuTemperatureLimitControl.Value), @@ -169,7 +168,6 @@ private async Task SetStateAsync(GodModeState state) _cpuPL1TauControl.Set(preset.CPUPL1Tau); _apuSPPTPowerLimitControl.Set(preset.APUsPPTPowerLimit); _cpuTemperatureLimitControl.Set(preset.CPUTemperatureLimit); - _cpuToGpuDynamicBoostControl.Set(preset.CPUToGPUDynamicBoost); _gpuPowerBoostControl.Set(preset.GPUPowerBoost); _gpuConfigurableTGPControl.Set(preset.GPUConfigurableTGP); _gpuTemperatureLimitControl.Set(preset.GPUTemperatureLimit); @@ -219,8 +217,7 @@ private async Task SetStateAsync(GodModeState state) _cpuCrossLoadingLimitControl, _cpuPL1TauControl, _apuSPPTPowerLimitControl, - _cpuTemperatureLimitControl, - _cpuToGpuDynamicBoostControl + _cpuTemperatureLimitControl }.Any(v => v.Visibility == Visibility.Visible); var gpuSectionVisible = new[] @@ -274,9 +271,6 @@ private async void SetDefaults(GodModeDefaults defaults) if (_cpuTemperatureLimitControl.Visibility == Visibility.Visible && defaults.CPUTemperatureLimit is { } cpuTemperatureLimit) _cpuTemperatureLimitControl.Value = cpuTemperatureLimit; - if (_cpuToGpuDynamicBoostControl.Visibility == Visibility.Visible && defaults.CPUToGPUDynamicBoost is { } cpuToGPUDynamicBoost) - _cpuToGpuDynamicBoostControl.Value = cpuToGPUDynamicBoost; - if (_gpuPowerBoostControl.Visibility == Visibility.Visible && defaults.GPUPowerBoost is { } gpuPowerBoost) _gpuPowerBoostControl.Value = gpuPowerBoost;