Skip to content

Commit a38a7be

Browse files
committed
Make fan curve grey if it's not active
1 parent 26a8c27 commit a38a7be

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

app/AppConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ public static bool IsResetRequired()
659659

660660
public static bool IsFanRequired()
661661
{
662-
return ContainsModel("GA402X") || ContainsModel("G513") || ContainsModel("G713R") || ContainsModel("G713P") || ContainsModel("GU605") || ContainsModel("GA605") || ContainsModel("G634J") || ContainsModel("G834J") || ContainsModel("G614J") || ContainsModel("G814J") || ContainsModel("FX507V") || ContainsModel("G614F") || ContainsModel("G614R");
662+
return IsManualModeRequired() || ContainsModel("GA402X") || ContainsModel("G513") || ContainsModel("G713R") || ContainsModel("G713P") || ContainsModel("GU605") || ContainsModel("GA605") || ContainsModel("G634J") || ContainsModel("G834J") || ContainsModel("G614J") || ContainsModel("G814J") || ContainsModel("FX507V") || ContainsModel("G614F") || ContainsModel("G614R");
663663
}
664664

665665
public static bool IsAMDLight()

app/Fans.cs

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,8 @@ private void VisualiseAdvanced()
408408
panelAdvancedApply.Visible = false;
409409
panelDownload.Visible = true;
410410

411-
} else
411+
}
412+
else
412413
{
413414
panelDownload.Visible = false;
414415
}
@@ -829,7 +830,7 @@ public void InitPowerPlan()
829830

830831
comboPowerMode.Enabled = !batterySaver;
831832

832-
if (batterySaver)
833+
if (batterySaver)
833834
comboPowerMode.SelectedIndex = 0;
834835
else
835836
comboPowerMode.SelectedValue = powerMode;
@@ -934,7 +935,7 @@ public void InitPower()
934935
labelLeftSlow.Text = "sPPT (CPU 2 min boost)";
935936
labelLeftFast.Text = "fPPT (CPU 2 sec boost)";
936937
panelFast.Visible = modeC1;
937-
938+
938939
}
939940
else
940941
{
@@ -957,7 +958,7 @@ public void InitPower()
957958

958959
if (limit_cpu > AsusACPI.MaxCPU) limit_cpu = AsusACPI.MaxCPU;
959960
if (limit_cpu < AsusACPI.MinCPU) limit_cpu = AsusACPI.MinCPU;
960-
961+
961962
if (limit_slow > AsusACPI.MaxTotal) limit_slow = AsusACPI.MaxTotal;
962963
if (limit_slow < AsusACPI.MinTotal) limit_slow = AsusACPI.MinTotal;
963964

@@ -1051,7 +1052,7 @@ public void InitFans()
10511052
{
10521053
if (chartCount > 2)
10531054
Size = MinimumSize = new Size(Size.Width, Math.Max(MinimumSize.Height, (int)(ControlHelper.GetDpiScale(this).Value * (chartCount * 200 + 100))));
1054-
1055+
10551056
}
10561057
catch (Exception ex)
10571058
{
@@ -1065,7 +1066,25 @@ public void InitFans()
10651066
LoadProfile(seriesCPU, AsusFan.CPU);
10661067
LoadProfile(seriesGPU, AsusFan.GPU);
10671068

1068-
checkApplyFans.Checked = AppConfig.IsMode("auto_apply");
1069+
bool autoFans = AppConfig.IsMode("auto_apply_power") && AppConfig.IsFanRequired();
1070+
bool applyFans = AppConfig.IsMode("auto_apply");
1071+
1072+
checkApplyFans.Checked = applyFans;
1073+
1074+
if (autoFans || applyFans)
1075+
{
1076+
seriesCPU.Color = colorStandard;
1077+
seriesGPU.Color = colorTurbo;
1078+
seriesMid.Color = colorEco;
1079+
seriesXGM.Color = Color.Orange;
1080+
}
1081+
else
1082+
{
1083+
seriesCPU.Color = Color.Gray;
1084+
seriesGPU.Color = Color.Gray;
1085+
seriesMid.Color = Color.Gray;
1086+
seriesXGM.Color = Color.Gray;
1087+
}
10691088

10701089
}
10711090

@@ -1159,13 +1178,13 @@ private void ButtonReset_Click(object? sender, EventArgs e)
11591178
trackGPUClockLimit.Value = NvidiaGpuControl.MaxClockLimit;
11601179
trackGPUCore.Value = 0;
11611180
trackGPUMemory.Value = 0;
1162-
1181+
11631182
trackGPUBoost.Value = AsusACPI.MaxGPUBoost;
11641183
trackGPUTemp.Value = AsusACPI.MaxGPUTemp;
11651184

11661185
//AppConfig.SetMode("gpu_boost", trackGPUBoost.Value);
11671186
//AppConfig.SetMode("gpu_temp", trackGPUTemp.Value);
1168-
1187+
11691188
AppConfig.RemoveMode("gpu_boost");
11701189
AppConfig.RemoveMode("gpu_temp");
11711190

app/Mode/ModeControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public void AutoPower(bool launchAsAdmin = false)
226226
bool applyPower = AppConfig.IsMode("auto_apply_power");
227227
bool applyFans = AppConfig.IsMode("auto_apply");
228228

229-
if (applyPower && !applyFans && (AppConfig.IsFanRequired() || AppConfig.IsManualModeRequired()))
229+
if (applyPower && !applyFans && AppConfig.IsFanRequired())
230230
{
231231
AutoFans(true);
232232
Thread.Sleep(500);

0 commit comments

Comments
 (0)