adjustor 3.5.4__tar.gz → 3.6.1__tar.gz

{adjustor-3.5.4/src/adjustor.egg-info → adjustor-3.6.1}/PKG-INFO

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

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

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/core/const.py

@@ -120,4 +120,5 @@ CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     "AMD Ryzen 7 8840U": (DEV_PARAMS_8040, ALIB_PARAMS_8040),
     # AMD Athlon Silver 3050e (Win600, will it support tdp?)
     "AMD Ryzen AI 9 HX 370": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370),
+    "AMD Ryzen AI HX 360": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370),
 }

adjustor-3.6.1/src/adjustor/core/fan/__init__.py

@@ -0,0 +1 @@
+from .core import get_fan_info, fan_worker

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/core/fan/alg.py

@@ -34,7 +34,6 @@ UPDATE_FREQUENCY = 5
 UPDATE_T = 1 / UPDATE_FREQUENCY
 SETPOINT_UPDATE_FREQUENCY = 1
 SETPOINT_UPDATE_T = 1 / SETPOINT_UPDATE_FREQUENCY
-HYSTERESIS_RATIO = 0.25
 
 
 def _calculate_jerk(speed_span, decel_ratio, freq, time):
@@ -133,12 +132,12 @@ def update_setpoint(temp: float, curr: int, fan_curve: dict[int, float]):
     # Add some hysterisis to avoid dithering
     if idx > 0:
         prev = targets[idx - 1]
-        if temp < prev + (curr - prev) * HYSTERESIS_RATIO:
+        if temp < prev:
             return prev
 
     if idx < len(targets) - 1:
         next = targets[idx + 1]
-        if temp > next - (next - curr) * HYSTERESIS_RATIO:
+        if temp > next:
             return next
 
     return curr

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/core/fan/core.py

@@ -1,6 +1,7 @@
 import logging
 import time
 from typing import TypedDict
+from threading import Lock, Event
 
 from .alg import (
     SETPOINT_UPDATE_T,
@@ -40,10 +41,12 @@ class FanState(TypedDict):
     v_curr: float
     v_target: float
     v_target_pwm: int
+    t_target: int
     v_rpm: list[int]
     t_junction: float
     t_edge: float
     fan_data: FanData
+    in_setpoint: bool
 
 
 def get_fan_info() -> FanInfo | None:
@@ -131,11 +134,37 @@ def update_fan_speed(
             "v_rpm": fan_speeds,
             "t_junction": t_junction,
             "t_edge": t_edge,
+            "t_target": data["t_target"],
             "fan_data": data,
+            "in_setpoint": in_setpoint,
         },
     )
 
 
+def fan_worker(
+    info: FanInfo,
+    should_exit: Event,
+    lock: Lock,
+    fan_curve: dict[int, float],
+    state: FanState,
+    junction: Event,
+):
+    try:
+        set_fans_to_pwm(True, info)
+        while not should_exit.is_set():
+            with lock:
+                state_tmp = state or None # First time state will be empty
+                in_setpoint, state_tmp = update_fan_speed(
+                    state_tmp, info, fan_curve, junction.is_set()
+                )
+                state.update(state_tmp)
+            time.sleep(SETPOINT_UPDATE_T if in_setpoint else UPDATE_T)
+    except Exception as e:
+        logger.error(f"Fan worker failed:\n{e}")
+    finally:
+        set_fans_to_pwm(False, info)
+
+
 def fan_pwm_tester(normal_curve: bool = True, observe_only: bool = False):
     fan_info = get_fan_info()
     if fan_info is None:
@@ -181,12 +210,22 @@ def fan_pwm_tester(normal_curve: bool = True, observe_only: bool = False):
 
         state = None
         for i in range(10000000):
-            in_setpoint, state = update_fan_speed(state, fan_info, fan_curve, False, observe_only=observe_only)
-            
-            print(f"\n> {i:05d}: {'in setpoint' if in_setpoint else 'updating'}{' (observe)' if observe_only else ''}")
-            print(f"  Junction: {state['t_junction']:.2f}C, Edge: {state['t_edge']:.2f}C")
-            print(f"  Current: {state['v_curr']*100:.1f}%, Target: {state['v_target']*100:.1f}%")
-            print(f"  Fan speeds: {' '.join(map(lambda rpm: f"{rpm:4d}rpm/{MAX_FAN}rpm ({100*rpm/MAX_FAN:.1f}%)", state['v_rpm']))}")
+            in_setpoint, state = update_fan_speed(
+                state, fan_info, fan_curve, False, observe_only=observe_only
+            )
+
+            print(
+                f"\n> {i:05d}: {'in setpoint' if in_setpoint else 'updating'}{' (observe)' if observe_only else ''}"
+            )
+            print(
+                f"  Junction: {state['t_junction']:.2f}C, Edge: {state['t_edge']:.2f}C"
+            )
+            print(
+                f"  Current: {state['v_curr']*100:.1f}%, Target: {state['v_target']*100:.1f}%"
+            )
+            print(
+                f"  Fan speeds: {' '.join(map(lambda rpm: f"{rpm:4d}rpm/{MAX_FAN}rpm ({100*rpm/MAX_FAN:.1f}%)", state['v_rpm']))}"
+            )
             time.sleep(SETPOINT_UPDATE_T if in_setpoint else UPDATE_T)
     except KeyboardInterrupt:
         print("Exiting fan test.")

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/drivers/asus/__init__.py

@@ -169,7 +169,9 @@ class AsusDriverPlugin(HHDPlugin):
         path_exists = os.path.exists(EXTREME_FN)
         extreme_supported = EXTREME_ENABLE and path_exists
         if self.extreme_supported is None:
-            logger.info(f"Extreme standby enabled: {EXTREME_ENABLE}, file exists: {extreme_supported}. Enabled: {extreme_supported}")
+            logger.info(
+                f"Extreme standby enabled: {EXTREME_ENABLE}, file exists: {extreme_supported}. Enabled: {extreme_supported}"
+            )
         self.extreme_supported = extreme_supported
         if not self.extreme_supported:
             del out["tdp"]["asus"]["children"]["extreme_standby"]
@@ -177,21 +179,25 @@ class AsusDriverPlugin(HHDPlugin):
         # Set units
         if self.allyx:
             out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["quiet"]["unit"] = "13W"
-            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["balanced"]["unit"] = "17W"
+            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["balanced"][
+                "unit"
+            ] = "17W"
             out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["performance"][
                 "unit"
             ] = "25/30W"
         else:
             out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["quiet"]["unit"] = "10W"
-            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["balanced"]["unit"] = "15W"
+            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["balanced"][
+                "unit"
+            ] = "15W"
             out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["performance"][
                 "unit"
             ] = "25/30W"
 
         if not self.enforce_limits:
-            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["custom"]["children"]["tdp"][
-                "max"
-            ] = 50
+            out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["custom"]["children"][
+                "tdp"
+            ]["max"] = 50
         return out
 
     def open(
@@ -298,6 +304,7 @@ class AsusDriverPlugin(HHDPlugin):
                     new_target = "performance"
 
         # In custom mode, re-apply settings with debounce
+        tdp_set = False
         if mode == "custom":
             # Check user changed values
             if new_tdp:
@@ -410,7 +417,7 @@ class AsusDriverPlugin(HHDPlugin):
 
         # Check if fan curve has changed
         # Use debounce logic on these changes
-        if tdp_reset and manual_fan_curve:
+        if ((tdp_reset and mode != "custom") or tdp_set) and manual_fan_curve:
             self.queue_fan = curr + APPLY_DELAY
 
         for i in POINTS:
@@ -431,7 +438,7 @@ class AsusDriverPlugin(HHDPlugin):
                 self.queue_tdp = curr + APPLY_DELAY
 
         apply_curve = self.queue_fan and self.queue_fan < curr
-        if apply_curve:
+        if apply_curve or tdp_set:
             try:
                 if conf["tdp.asus.fan.mode"].to(str) == "manual":
                     set_fan_curve(
@@ -475,7 +482,7 @@ class AsusDriverPlugin(HHDPlugin):
                     with open(EXTREME_FN, "r") as f:
                         cval = f.read().strip() == "1"
                     if nval != cval:
-                        logger.info (f"Setting extreme standby to '{standby}'")
+                        logger.info(f"Setting extreme standby to '{standby}'")
                         with open(EXTREME_FN, "w") as f:
                             f.write("1" if standby == "enabled" else "0")
                     else:
@@ -487,7 +494,7 @@ class AsusDriverPlugin(HHDPlugin):
         for ev in events:
             if ev["type"] == "tdp":
                 self.new_tdp = ev["tdp"]
-                self.sys_tdp = ev['tdp'] is not None
+                self.sys_tdp = ev["tdp"] is not None
             elif ev["type"] == "ppd":
                 match ev["status"]:
                     case "power":
@@ -496,10 +503,12 @@ class AsusDriverPlugin(HHDPlugin):
                         self.new_mode = "balanced"
                     case "performance":
                         self.new_mode = "performance"
-            elif ev['type'] == 'special' and ev.get('event', None) == "wakeup":
-                logger.info(f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds.")
+            elif ev["type"] == "special" and ev.get("event", None) == "wakeup":
+                logger.info(
+                    f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds."
+                )
                 self.queue_tdp = time.time() + SLEEP_DELAY
-            elif self.cycle_tdp and ev['type'] == "special" and ev['event'] == "xbox_y":
+            elif self.cycle_tdp and ev["type"] == "special" and ev["event"] == "xbox_y":
                 match self.mode:
                     case "quiet":
                         self.new_mode = "balanced"

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/drivers/general/__init__.py

@@ -32,6 +32,7 @@ class GeneralPowerPlugin(HHDPlugin):
         self.ovr_enabled = False
         self.should_exit = Event()
         self.t_sys = None
+        self.currentTarget = None
 
     def settings(self):
         sets = load_relative_yaml("./settings.yml")
@@ -151,10 +152,11 @@ class GeneralPowerPlugin(HHDPlugin):
                 "balanced": "balanced",
                 "performance": "throughput-performance"
             }
+
             new_profile = ppd_tuned_mapping.get(conf.get("tdp.general.profile", self.target))
-            if new_profile != self.target and new_profile and self.target:
-                logger.info(f"Setting TuneD profile to '{new_profile}'")
-                self.target = new_profile
+            if new_profile != self.currentTarget and new_profile and self.currentTarget:
+                logger.info(f"Setting TuneD profile to '{new_profile}' from '{self.target}'")
+                self.currentTarget = new_profile
                 try:
                     subprocess.run(
                         [shutil.which('tuned-adm'), "profile", new_profile],
@@ -162,6 +164,7 @@ class GeneralPowerPlugin(HHDPlugin):
                         stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE,
                     )
+
                 except Exception as e:
                     self.tuned_supported = False
                     logger.warning(f"tuned-adm returned with error:\n{e}")
@@ -176,13 +179,13 @@ class GeneralPowerPlugin(HHDPlugin):
                         stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE,
                     )
-
                     tuned_ppd_mapping = {
                         "powersave": "power-saver",
                         "balanced": "balanced",
                         "throughput-performance": "performance"
                     }
-                    self.target = tuned_ppd_mapping.get(res.stdout.decode().split(":")[1].strip())  # type: ignore
+                    self.currentTarget = res.stdout.decode().split(":")[1].strip()
+                    self.target = tuned_ppd_mapping.get(self.currentTarget)  # type: ignore
 
                     if self.target != conf["tdp.general.profile"].to(str):
                         conf["tdp.general.profile"] = self.target

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/drivers/smu/__init__.py

@@ -1,11 +1,13 @@
 import logging
 import time
+from threading import Event as TEvent, Lock, Thread
 from typing import Sequence
 
 from hhd.plugins import Context, Event, HHDPlugin, load_relative_yaml
 from hhd.plugins.conf import Config
 
 from adjustor.core.alib import AlibParams, DeviceParams, alib
+from adjustor.core.fan import fan_worker, get_fan_info
 from adjustor.core.platform import get_platform_choices, set_platform_profile
 from adjustor.i18n import _
 
@@ -15,6 +17,27 @@ PP_DELAY = 0.2
 APPLY_DELAY = 1
 SLEEP_DELAY = 4
 
+DEFAULT_EDGE = {
+    40: 25,
+    45: 25,
+    50: 40,
+    55: 45,
+    60: 50,
+    65: 55,
+    70: 70,
+    80: 85,
+    90: 100,
+}
+DEFAULT_TCTL = {
+    40: 40,
+    50: 45,
+    60: 50,
+    70: 80,
+    80: 90,
+    90: 100,
+    100: 100,
+}
+
 
 class SmuQamPlugin(HHDPlugin):
 
@@ -44,6 +67,14 @@ class SmuQamPlugin(HHDPlugin):
         self.is_set = False
         self.lims = self.dev.get("skin_limit", self.dev.get("stapm_limit", None))
 
+        self.fan_info = None
+        self.fan_t = None
+        self.fan_should_exit = TEvent()
+        self.fan_junction = TEvent()
+        self.fan_lock = Lock()
+        self.fan_curve = {}
+        self.fan_state = {}
+
         # Workaround for debugging on the legion go
         # Avoids sending SMU commands that will conflict with Lenovo TDP on
         # startup
@@ -87,6 +118,33 @@ class SmuQamPlugin(HHDPlugin):
                 {"min": dmin, "max": dmax, "default": default}
             )
 
+        if not self.fan_info:
+            del out["tdp"]["qam"]["children"]["fan"]
+        else:
+            base = out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_edge"][
+                "children"
+            ]["st40"]
+            reset = out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_edge"][
+                "children"
+            ].pop("reset")
+            for k, v in DEFAULT_EDGE.items():
+                out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_edge"][
+                    "children"
+                ][f"st{k}"] = {**base, "title": f"{k}C", "default": v}
+            out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_edge"]["children"][
+                "reset"
+            ] = reset
+            reset = out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_junction"][
+                "children"
+            ].pop("reset")
+            for k, v in DEFAULT_TCTL.items():
+                out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_junction"][
+                    "children"
+                ][f"st{k}"] = {**base, "title": f"{k}C", "default": v}
+            out["tdp"]["qam"]["children"]["fan"]["modes"]["manual_junction"][
+                "children"
+            ]["reset"] = reset
+
         return out
 
     def open(
@@ -95,6 +153,7 @@ class SmuQamPlugin(HHDPlugin):
         context: Context,
     ):
         self.emit = emit
+        self.fan_info = get_fan_info()
 
     def update(self, conf: Config):
         self.enabled = conf["hhd.settings.tdp_enable"].to(bool)
@@ -191,12 +250,65 @@ class SmuQamPlugin(HHDPlugin):
         self.old_tdp = new_tdp
         self.old_boost = new_boost
 
+        if self.fan_info:
+            mode = conf["tdp.qam.fan.mode"].to(str)
+            if mode != "disabled":
+                with self.fan_lock:
+                    if conf[f"tdp.qam.fan.{mode}.reset"].to(bool):
+                        conf[f"tdp.qam.fan.{mode}.reset"] = False
+                        curve = DEFAULT_EDGE if "edge" in mode else DEFAULT_TCTL
+                        for k, v in curve.items():
+                            if f"tdp.qam.fan.{mode}.st{k}" in conf:
+                                conf[f"tdp.qam.fan.{mode}.st{k}"] = v
+
+                    for k, v in conf[f"tdp.qam.fan.{mode}"].to(dict).items():
+                        if not k.startswith("st"):
+                            continue
+                        self.fan_curve[int(k[2:])] = v / 100
+                    if self.fan_state:
+                        s = self.fan_state
+                        fan_speed = (
+                            f"{s['v_curr']*100:.1f}% @ {s['t_target']}C"
+                            if s["in_setpoint"]
+                            else f"{s['v_curr']*100:.1f}% → {s['v_target']*100:.1f}%"
+                        )
+                        conf[f"tdp.qam.fan.{mode}.info"] = (
+                            f"{fan_speed} ({', '.join(map(str, s['v_rpm']))} RPM)\n"
+                            + f"Tctl: {s['t_junction']:.2f}C, "
+                            + f"Edge: {s['t_edge']:.2f}C\n"
+                        )
+                    if "junction" in mode:
+                        self.fan_junction.set()
+                    else:
+                        self.fan_junction.clear()
+
+                if not self.fan_t:
+                    self.fan_should_exit.clear()
+                    self.fan_t = Thread(
+                        target=fan_worker,
+                        args=(
+                            self.fan_info,
+                            self.fan_should_exit,
+                            self.fan_lock,
+                            self.fan_curve,
+                            self.fan_state,
+                            self.fan_junction,
+                        ),
+                    )
+                    self.fan_t.start()
+            else:
+                if self.fan_t:
+                    self.fan_should_exit.set()
+                    self.fan_t.join()
+                    self.fan_t = None
+                    self.fan_state = {}
+
     def notify(self, events: Sequence[Event]):
         for ev in events:
             if ev["type"] == "tdp":
                 self.sys_tdp = True
                 self.new_tdp = ev["tdp"]
-                self.sys_tdp = ev['tdp'] is not None
+                self.sys_tdp = ev["tdp"] is not None
 
             if ev["type"] == "ppd":
                 # TODO: Make tunable per device
@@ -207,13 +319,19 @@ class SmuQamPlugin(HHDPlugin):
                         self.new_tdp = 15
                     case "performance":
                         self.new_tdp = 25
-            
-            if ev['type'] == 'special' and ev.get('event', None) == "wakeup":
-                logger.info(f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds.")
+
+            if ev["type"] == "special" and ev.get("event", None) == "wakeup":
+                logger.info(
+                    f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds."
+                )
                 self.queued = time.time() + SLEEP_DELAY
 
     def close(self):
-        pass
+        if self.fan_t:
+            self.fan_should_exit.set()
+            self.fan_t.join()
+            self.fan_t = None
+            self.fan_state = {}
 
 
 class SmuDriverPlugin(HHDPlugin):

adjustor-3.6.1/src/adjustor/drivers/smu/qam.yml

@@ -0,0 +1,80 @@
+title: TDP Settings
+type: container
+tags: [ hide-title ]
+children:
+  tdp:
+    title: TDP
+    hint: >-
+      Controls all Ryzen SMU settings through preset curves.
+    type: int
+    step: 1
+    unit: W
+
+  boost:
+    title: TDP Boost
+    type: bool
+    default: True
+  
+  sys_tdp:
+    type: display
+    title: " "
+    tags: []
+  
+  fan:
+    type: mode
+    title: Custom Fan Curve
+    hint: >-
+      Allows you to set a custom fan curve and to choose the temperature
+      probe (Edge or Junction). Junction is the peak temperature of the
+      chip: responds faster and prevents throttling. Edge is the temperature
+      of the chip: responds slower and prevents overheating.
+
+    default: disabled
+    modes:
+      disabled:
+        type: container
+        title: Disabled
+
+      manual_edge:
+        type: container
+        title: Manual (Edge, Smooth)
+        tags: [ non-essential ]
+        children:
+
+          info:
+            title: ""
+            type: display
+
+          st40: &speed_template
+            hint: Sets the speed at the named temperature.
+            tags: [slim]
+            type: int
+            min: 0
+            max: 100
+            step: 2
+            unit: "%"
+            title: 40C
+            default: 25
+          
+          reset:
+            type: action
+            title: Reset to Default
+
+      manual_junction:
+        type: container
+        title: Manual (Tctl, Fast)
+        tags: [ non-essential ]
+        children:
+
+          info:
+            title: ""
+            type: display
+
+          st40:
+            <<: *speed_template
+            title: 40C
+            default: 40
+
+          reset:
+            type: action
+            title: Reset to Default

{adjustor-3.5.4 → adjustor-3.6.1}/src/adjustor/settings.yml

@@ -25,10 +25,7 @@ tdp:
       tags: [ non-essential ]
       default: >
         Handheld Daemon supports the TDP slider in Steam and can use its per
-        game profiles now. For the Legion Go and Ally, it also supports custom
-        fan curves and battery limits.
-        Consider it, unless you prefer Decky.
-        (Powercontrol supports fan curves for GPD and Ayaneo devices)
+        game profiles. It also supports custom fan curves and battery limits.
 
     decky_remove:
       title: Disable Decky TDP Plugins

{adjustor-3.5.4 → adjustor-3.6.1/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.5.4
+Version: 3.6.1
 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-3.5.4/src/adjustor/drivers/smu/qam.yml

@@ -1,21 +0,0 @@
-title: TDP Settings
-type: container
-tags: [ hide-title ]
-children:
-  tdp:
-    title: TDP
-    hint: >-
-      Controls all Ryzen SMU settings through preset curves.
-    type: int
-    step: 1
-    unit: W
-
-  boost:
-    title: TDP Boost
-    type: bool
-    default: True
-  
-  sys_tdp:
-    type: display
-    title: " "
-    tags: []