diff --git a/app/Fans.cs b/app/Fans.cs index 94ef0b87..3425ae4f 100644 --- a/app/Fans.cs +++ b/app/Fans.cs @@ -232,13 +232,17 @@ namespace GHelper if (same) sameCount++; else sameCount = 0; - LabelFansResult("Max Speed - CPU: " + fanMax[(int)AsusFan.CPU] * 100 + ", GPU: " + fanMax[(int)AsusFan.GPU] * 100 + " (" + sameCount + "s)"); + string label = "Measuring Max Speed - CPU: " + fanMax[(int)AsusFan.CPU] * 100 + ", GPU: " + fanMax[(int)AsusFan.GPU] * 100; + if (fanMax[(int)AsusFan.Mid] > 10) label = label + ", Mid: " + fanMax[(int)AsusFan.Mid] * 100; + label = label + " (" + sameCount + "s)"; + + LabelFansResult(label); if (sameCount >= 15) { for (int i = 0; i < FAN_COUNT; i++) { - if (fanMax[i] > 30 && fanMax[i] < 80) AppConfig.Set("fan_max_" + i, fanMax[i]); + if (fanMax[i] > 30 && fanMax[i] < HardwareControl.INADEQUATE_MAX) AppConfig.Set("fan_max_" + i, fanMax[i]); } sameCount = 0; diff --git a/app/HardwareControl.cs b/app/HardwareControl.cs index 31081b7f..050f2872 100644 --- a/app/HardwareControl.cs +++ b/app/HardwareControl.cs @@ -13,7 +13,7 @@ public static class HardwareControl public const int DEFAULT_FAN_MIN = 18; public const int DEFAULT_FAN_MAX = 58; - const int INADEQUATE_MAX = 72; + public const int INADEQUATE_MAX = 85; public static IGpuControl? GpuControl; @@ -68,15 +68,10 @@ public static class HardwareControl for (int i = 0; i < 3; i++) { _fanMax[i] = AppConfig.Get("fan_max_" + i); - - if (_fanMax[i] > INADEQUATE_MAX) _fanMax[i] = -1; // skipping inadvequate settings - - if (_fanMax[i] < 0 && AppConfig.ContainsModel("401")) _fanMax[i] = 72; - if (_fanMax[i] < 0 && AppConfig.ContainsModel("503")) _fanMax[i] = 68; + if (_fanMax[i] > INADEQUATE_MAX) _fanMax[i] = -1; if (_fanMax[i] < 0) _fanMax[i] = DEFAULT_FAN_MAX; } - _fanRpm = AppConfig.IsNotFalse("fan_rpm"); }