FanControl: Change Silent setting name and a way to Clamp

ayufan · Sep 24, 2023 · ad9cf9a · ad9cf9a
1 parent 75b3bbc
commit ad9cf9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/FanControl/FanControllerSensors.cs b/FanControl/FanControllerSensors.cs
@@ -74,7 +74,7 @@ internal partial class FanController
                                 MinInput = 40,
                                 MaxInput = 95,
                                 A = 1.28f,
-                                B = Settings.Default.Silent4000RPMThreshold - 28,
+                                B = Settings.Default.Silent4000RPMTemp - 28,
                                 C = 3000f
                             }
                         },
@@ -110,7 +110,7 @@ internal partial class FanController
                                 MinInput = 40,
                                 MaxInput = 95,
                                 A = 1.28f,
-                                B = Settings.Default.Silent4000RPMThreshold - 28,
+                                B = Settings.Default.Silent4000RPMTemp - 28,
                                 C = 3000f
                             }
                         },

diff --git a/FanControl/Settings.cs b/FanControl/Settings.cs
@@ -23,15 +23,20 @@ public bool AlwaysOnTop
             set { Set("AlwaysOnTop", value); }
         }
 
-        public int Silent4000RPMThreshold
+        public int Silent4000RPMTemp
         {
-            get { return Get("Silent4000RPMThreshold", 85); }
-            set { Set("Silent4000RPMThreshold", Math.Min(Math.Max(80, value), 90)); }
+            get { return ClampSilent4000RPMTemp(Get("Silent4000RPMTemp", 85)); }
+            set { Set("Silent4000RPMTemp", ClampSilent4000RPMTemp(value)); }
         }
 
         public bool EnableExperimentalFeatures
         {
             get { return Instance.IsDEBUG; }
         }
+
+        private int ClampSilent4000RPMTemp(int value)
+        {
+            return Math.Clamp(value, 70, 90);
+        }
     }
 }