adjustor 2.1.1__tar.gz → 2.1.3__tar.gz

{adjustor-2.1.1/src/adjustor.egg-info → adjustor-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.1
+Version: 2.1.3
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor

{adjustor-2.1.1 → adjustor-2.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adjustor"
-version = "2.1.1"
+version = "2.1.3"
 authors = [
   { name="Kapenekakis Antheas", email="pypi@antheas.dev" },
 ]

{adjustor-2.1.1 → adjustor-2.1.3}/src/adjustor/drivers/asus/__init__.py

@@ -98,7 +98,7 @@ def disable_fan_curve():
 
 class AsusDriverPlugin(HHDPlugin):
     def __init__(self) -> None:
-        self.name = f"asus"
+        self.name = f"adjustor_asus"
         self.priority = 6
         self.log = "adja"
         self.enabled = False

{adjustor-2.1.1 → adjustor-2.1.3}/src/adjustor/drivers/lenovo/__init__.py

@@ -8,11 +8,8 @@ from hhd.plugins.conf import Config
 from adjustor.core.lenovo import (
     MIN_CURVE,
     TdpMode,
-    get_fan_curve,
-    get_fast_tdp,
     get_full_fan_speed,
     get_power_light,
-    get_steady_tdp,
     get_tdp_mode,
     set_fan_curve,
     set_fast_tdp,
@@ -141,6 +138,14 @@ class LenovoDriverPlugin(HHDPlugin):
             # Check user changed values
             steady = conf["tdp.lenovo.tdp.custom.tdp"].to(int)
 
+            old_steady = steady
+            if self.enforce_limits:
+                steady = min(max(steady, 4), 30)
+            else:
+                steady = min(max(steady, 0), 50)
+            if old_steady != steady:
+                conf["tdp.lenovo.tdp.custom.tdp"] = steady
+
             steady_updated = steady and steady != self.old_conf["tdp.custom.tdp"].to(
                 int
             )
@@ -189,10 +194,15 @@ class LenovoDriverPlugin(HHDPlugin):
                 conf[f"tdp.lenovo.fan.manual.st{(i + 1)*10}"] = v
 
         # Handle fan curve limits
-        if conf["tdp.lenovo.fan.manual.enforce_limits"].to(bool):
-            for i, v in enumerate(MIN_CURVE):
-                if conf[f"tdp.lenovo.fan.manual.st{(i + 1)*10}"].to(int) < v:
-                    conf[f"tdp.lenovo.fan.manual.st{(i + 1)*10}"] = v
+        for i, v in enumerate(MIN_CURVE):
+            val = conf[f"tdp.lenovo.fan.manual.st{(i + 1)*10}"].to(int)
+            old_val = val
+            if conf["tdp.lenovo.fan.manual.enforce_limits"].to(bool) and val < v:
+                val = v
+
+            val = max(min(val, 115), 0)
+            if old_val != val:
+                conf[f"tdp.lenovo.fan.manual.st{(i + 1)*10}"] = val
 
         # Check if fan curve has changed
         # Use debounce logic on these changes

{adjustor-2.1.1 → adjustor-2.1.3}/src/adjustor/hhd.py

@@ -22,7 +22,7 @@ CONFLICTING_PLUGINS = {
 
 
 class AdjustorInitPlugin(HHDPlugin):
-    def __init__(self) -> None:
+    def __init__(self, use_acpi_call: bool = True) -> None:
         self.name = f"adjustor_init"
         self.priority = 5
         self.log = "adji"
@@ -31,6 +31,7 @@ class AdjustorInitPlugin(HHDPlugin):
         self.safe_mode = False
         self.enabled = False
         self.action_enabled = False
+        self.use_acpi_call = use_acpi_call
 
     def open(self, emit: Emitter, context: Context):
         self.context = context
@@ -78,15 +79,16 @@ class AdjustorInitPlugin(HHDPlugin):
                 self.enabled = False
                 return
 
-        initialize()
-        if not check_perms():
-            conf["hhd.settings.tdp_enable"] = False
-            conf["tdp.tdp.tdp_error"] = (
-                "Can not write to 'acpi_call'. It is required for TDP."
-            )
-            self.failed = True
-            self.enabled = False
-            return
+        if self.use_acpi_call:
+            initialize()
+            if not check_perms():
+                conf["hhd.settings.tdp_enable"] = False
+                conf["tdp.tdp.tdp_error"] = (
+                    "Can not write to 'acpi_call'. It is required for TDP."
+                )
+                self.failed = True
+                self.enabled = False
+                return
 
         self.failed = False
         self.enabled = True
@@ -177,10 +179,12 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     with open("/proc/cpuinfo") as f:
         cpuinfo = f.read().strip()
 
+    use_acpi_call = False
     drivers_matched = False
     if prod == "83E1":
         drivers.append(LenovoDriverPlugin())
         drivers_matched = True
+        use_acpi_call = True
 
     if "ROG Ally RC71L" in prod:
         drivers.append(AsusDriverPlugin())
@@ -205,6 +209,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
             ),
         )
         drivers_matched = True
+        use_acpi_call = True
 
     if not drivers_matched:
         for name, (dev, cpu) in CPU_DATA.items():
@@ -219,6 +224,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
                 drivers.append(
                     SmuQamPlugin(dev, ROG_ALLY_PP_MAP),
                 )
+                use_acpi_call = True
                 break
 
     if not drivers:
@@ -227,6 +233,6 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
 
     return [
         *drivers,
-        AdjustorInitPlugin(),
+        AdjustorInitPlugin(use_acpi_call=use_acpi_call),
         AdjustorPlugin(),
     ]

{adjustor-2.1.1 → adjustor-2.1.3/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.1
+Version: 2.1.3
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor