adjustor 2.1.0__tar.gz → 2.1.2__tar.gz

{adjustor-2.1.0/src/adjustor.egg-info → adjustor-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.0
+Version: 2.1.2
 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.0 → adjustor-2.1.2}/pyproject.toml

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

{adjustor-2.1.0 → adjustor-2.1.2}/src/adjustor/drivers/asus/__init__.py

@@ -73,6 +73,8 @@ def set_fan_curve(points: list[int], curve: list[int]):
     for fan in (1, 2):
         with open(os.path.join(dir, f"pwm{fan}_enable"), "w") as f:
             f.write(f"1")
+        if fan == 1:
+            time.sleep(TDP_DELAY)
 
     return True
 
@@ -87,14 +89,16 @@ def disable_fan_curve():
 
     for fan in (1, 2):
         with open(os.path.join(dir, f"pwm{fan}_enable"), "w") as f:
-            f.write(f"3")
+            f.write(f"2")
+        if fan == 1:
+            time.sleep(TDP_DELAY)
 
     return True
 
 
 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
@@ -116,7 +120,7 @@ class AsusDriverPlugin(HHDPlugin):
         self.initialized = True
         out = {"tdp": {"asus": load_relative_yaml("settings.yml")}}
         if not self.enforce_limits:
-            out["tdp"]["asus"]["children"]["tdp"]["max"] = 40
+            out["tdp"]["asus"]["children"]["tdp"]["max"] = 50
         return out
 
     def open(
@@ -189,17 +193,19 @@ class AsusDriverPlugin(HHDPlugin):
 
             self.queue_tdp = None
             if boost:
-                set_tdp("steady", CTDP_FN, steady)
+                time.sleep(TDP_DELAY)
+                set_tdp("fast", FTDP_FN, min(MAX_TDP, int(steady * 53 / 30)))
                 time.sleep(TDP_DELAY)
                 set_tdp("slow", STDP_FN, min(MAX_TDP, int(steady * 43 / 30)))
                 time.sleep(TDP_DELAY)
-                set_tdp("fast", FTDP_FN, min(MAX_TDP, int(steady * 53 / 30)))
-            else:
                 set_tdp("steady", CTDP_FN, steady)
+            else:
+                time.sleep(TDP_DELAY)
+                set_tdp("fast", FTDP_FN, steady)
                 time.sleep(TDP_DELAY)
                 set_tdp("slow", STDP_FN, steady)
                 time.sleep(TDP_DELAY)
-                set_tdp("fast", FTDP_FN, steady)
+                set_tdp("steady", CTDP_FN, steady)
 
         # Handle fan curve resets
         if conf["tdp.asus.fan.manual.reset"].to(bool):
@@ -207,31 +213,37 @@ class AsusDriverPlugin(HHDPlugin):
             for k, v in zip(POINTS, DEFAULT_CURVE):
                 conf[f"tdp.asus.fan.manual.st{k}"] = v
 
-        # Handle fan curve limits
-        if conf["tdp.asus.fan.manual.enforce_limits"].to(bool):
-            for k, v in zip(POINTS, MIN_CURVE):
-                if conf[f"tdp.asus.fan.manual.st{k}"].to(int) < v:
-                    conf[f"tdp.asus.fan.manual.st{k}"] = v
+        # # Handle fan curve limits
+        # if conf["tdp.asus.fan.manual.enforce_limits"].to(bool):
+        #     for k, v in zip(POINTS, MIN_CURVE):
+        #         if conf[f"tdp.asus.fan.manual.st{k}"].to(int) < v:
+        #             conf[f"tdp.asus.fan.manual.st{k}"] = v
 
         # Check if fan curve has changed
         # Use debounce logic on these changes
         if tdp_set and conf["tdp.asus.fan.mode"].to(str) == "manual":
             self.queue_fan = curr + APPLY_DELAY
-        if conf["tdp.asus.fan.mode"].to(str) != self.old_conf["fan.mode"].to(str):
-            self.queue_fan = curr + APPLY_DELAY
         for i in POINTS:
             if conf[f"tdp.asus.fan.manual.st{i}"].to(int) != self.old_conf[
                 f"fan.manual.st{i}"
             ].to(int):
                 self.queue_fan = curr + APPLY_DELAY
+        # If mode changes, only apply curve if set to manual
+        # otherwise disable and reset tdp
+        if conf["tdp.asus.fan.mode"].to(str) != self.old_conf["fan.mode"].to(str):
+            if conf["tdp.asus.fan.mode"].to(str) == "manual":
+                self.queue_fan = curr + APPLY_DELAY
+            else:
+                try:
+                    disable_fan_curve()
+                except Exception as e:
+                    logger.error(f"Could not disable fan curve. Error:\n{e}")
+                self.queue_tdp = curr + APPLY_DELAY
 
         apply_curve = self.queue_fan and self.queue_fan < curr
         if apply_curve:
             try:
-                # Always disable fan curve first
-                disable_fan_curve()
                 if conf["tdp.asus.fan.mode"].to(str) == "manual":
-                    time.sleep(TDP_DELAY)
                     set_fan_curve(
                         POINTS,
                         [

{adjustor-2.1.0 → adjustor-2.1.2}/src/adjustor/drivers/asus/settings.yml

@@ -2,7 +2,7 @@ title: Asus TDP
 type: container
 tags: [hide-title]
 hint: >-
-  Uses the interface of Legion Space to set the TDP of the device.
+  Uses the interface of Armory Crate to set the TDP of the device.
 children:
   tdp:
     type: int
@@ -10,15 +10,14 @@ children:
     hint: >-
       Average TDP Target.
 
-      Sets the values STAMP and Skin Power Limit to it.
-      If it is not, it sets the Slow limit equal to TDP and the Fast
-      limit to +2W.
+      Sets the values STAMP and Skin Power Limit to it without boost.
+      With boost, it sets the fast value to 53/30*tdp and the slow value to 43/30*tdp.
       Boost is recommended for desktop use.
 
     min: 5
     max: 30
     step: 1
-    default: 30
+    default: 15
     unit: W
   boost:
     type: bool
@@ -84,16 +83,16 @@ children:
             <<: *speed_template
             title: 100C
             default: 75
-
-          enforce_limits:
-            title: Enforce Minimums
-            type: bool
-            default: True
-            hint: >-
-              Enforce a reasonable minimum fan curve.
             
           reset:
             title: Restore Default
             type: action
             hint: >-
-              Restore a default sane fan curve.
+              Restore a default sane fan curve.
+
+          disclaimer:
+            title: Fan Curve Limitation
+            type: display
+            default: >-
+              Asus hardware limits the minimum fan curve depending on TDP.
+              The minimums are 25%, 50%, and 75% for low, middle, and high TDPs.

{adjustor-2.1.0 → adjustor-2.1.2}/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.0 → adjustor-2.1.2/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.0
+Version: 2.1.2
 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