This commit is contained in:
Serge
2023-08-06 16:48:25 +02:00
parent e33c13bd19
commit 5c613af9f2
3 changed files with 36 additions and 27 deletions

View File

@@ -300,7 +300,7 @@ public static class AppConfig
public static bool NoAuraColor()
{
return ContainsModel("GA401") || ContainsModel("X13");
return ContainsModel("GA401") || ContainsModel("X13") || ContainsModel("GA503RM");
}
public static bool IsStrix()
@@ -322,4 +322,33 @@ public static class AppConfig
{
return ContainsModel("13QY");
}
public static bool NoAutoUltimate()
{
return ContainsModel("G614") || ContainsModel("GU604");
}
public static bool IsManualModeRequired()
{
if (!IsMode("auto_apply_power"))
return false;
return
Is("manual_mode") ||
ContainsModel("GU604") ||
ContainsModel("G733");
}
public static bool IsFanRequired()
{
return ContainsModel("GA402X") || ContainsModel("G513");
}
public static bool IsPowerRequired()
{
return ContainsModel("FX507") || ContainsModel("FX517") || ContainsModel("FX707");
}
}

View File

@@ -49,10 +49,6 @@ namespace GHelper.Gpu
}
bool NoAutoUltimate()
{
return AppConfig.ContainsModel("G614") || AppConfig.ContainsModel("M16");
}
public void SetGPUMode(int GPUMode, int auto = 0)
{
@@ -84,7 +80,7 @@ namespace GHelper.Gpu
DialogResult dialogResult = MessageBox.Show(Properties.Strings.AlertUltimateOn, Properties.Strings.AlertUltimateTitle, MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.Yes)
{
if (NoAutoUltimate())
if (AppConfig.NoAutoUltimate())
{
Program.acpi.SetGPUEco(0);
Thread.Sleep(100);

View File

@@ -65,7 +65,7 @@ namespace GHelper.Mode
Modes.SetCurrent(mode);
Program.acpi.DeviceSet(AsusACPI.PerformanceMode, IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode");
Program.acpi.DeviceSet(AsusACPI.PerformanceMode, AppConfig.IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode");
if (AppConfig.Is("xgm_fan") && Program.acpi.IsXGConnected()) AsusUSB.ResetXGM();
@@ -143,7 +143,7 @@ namespace GHelper.Mode
}
// force set PPTs for missbehaving bios on FX507/517 series
if ((AppConfig.ContainsModel("FX507") || AppConfig.ContainsModel("FX517") || AppConfig.ContainsModel("FX707") || xgmFan) && !AppConfig.IsMode("auto_apply_power"))
if ((AppConfig.IsPowerRequired() || xgmFan) && !AppConfig.IsMode("auto_apply_power"))
{
Task.Run(async () =>
{
@@ -159,22 +159,6 @@ namespace GHelper.Mode
}
private static bool IsManualModeRequired()
{
if (!AppConfig.IsMode("auto_apply_power"))
return false;
return
AppConfig.Is("manual_mode") ||
AppConfig.ContainsModel("GU604") ||
AppConfig.ContainsModel("G733");
}
private static bool IsFanRequired()
{
return AppConfig.ContainsModel("GA402X") || AppConfig.ContainsModel("G513");
}
public void AutoPower(int delay = 0)
{
@@ -184,17 +168,17 @@ namespace GHelper.Mode
bool applyFans = AppConfig.IsMode("auto_apply");
//bool applyGPU = true;
if (applyPower)
if (applyPower && !applyFans)
{
// force fan curve for misbehaving bios PPTs on some models
if (!applyFans && IsFanRequired())
if (AppConfig.IsFanRequired())
{
delay = 500;
AutoFans(true);
}
// Fix for models that don't support PPT settings in all modes, setting a "manual" mode for them
if (IsManualModeRequired() && !applyFans)
if (AppConfig.IsManualModeRequired())
{
AutoFans(true);
}