adjustor 3.6.0__tar.gz → 3.6.2__tar.gz

{adjustor-3.6.0/src/adjustor.egg-info → adjustor-3.6.2}/PKG-INFO

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

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

{adjustor-3.6.0 → adjustor-3.6.2}/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.0 → adjustor-3.6.2}/src/adjustor/core/fan/core.py

@@ -99,9 +99,12 @@ def calculate_fan_speed(
 
 
 def set_fans_to_pwm(enable: bool, fan_info: FanInfo):
-    for _, fn_enable, _ in fan_info["fans"]:
+    for _, fn_enable, _, legacy in fan_info["fans"]:
         with open(fn_enable, "w") as f:
-            f.write("1" if enable else "0")
+            if enable:
+                f.write("1")
+            else:
+                f.write("0" if legacy else "2")
 
 
 def update_fan_speed(
@@ -121,10 +124,10 @@ def update_fan_speed(
     v_curr_int = min(255, max(0, int(v_curr * 255)))
     if not observe_only:
         if state is None or state["v_target_pwm"] != v_curr_int:
-            for v_fn, _, _ in fan_info["fans"]:
+            for v_fn, _, _, _ in fan_info["fans"]:
                 write_fan_speed(v_fn, v_curr_int)
 
-    fan_speeds = [read_fan_speed(rpm_fn) for _, _, rpm_fn in fan_info["fans"] if rpm_fn]
+    fan_speeds = [read_fan_speed(rpm_fn) for _, _, rpm_fn, _ in fan_info["fans"] if rpm_fn]
     return (
         in_setpoint,
         {
@@ -153,7 +156,7 @@ def fan_worker(
         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
+                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()
                 )

{adjustor-3.6.0 → adjustor-3.6.2}/src/adjustor/core/fan/utils.py

@@ -1,6 +1,7 @@
 import os
 
-FAN_HWMONS = ["oxpec"]
+FAN_HWMONS_LEGACY = ["oxpec"]
+FAN_HWMONS = ["oxp_ec"]
 HWMON_DIR = "/sys/class/hwmon"
 
 
@@ -53,7 +54,7 @@ def find_fans():
         with open(f"{HWMON_DIR}/{hwmon}/name") as f:
             name = f.read().strip()
 
-        if name not in FAN_HWMONS:
+        if name not in FAN_HWMONS and name not in FAN_HWMONS_LEGACY:
             continue
 
         for fn in os.listdir(f"{HWMON_DIR}/{hwmon}"):
@@ -73,6 +74,7 @@ def find_fans():
                         f"{HWMON_DIR}/{hwmon}/{fn}",
                         f"{HWMON_DIR}/{hwmon}/{fn}_enable",
                         speed_fn,
+                        name in FAN_HWMONS_LEGACY,
                     )
                 )
 
@@ -88,6 +90,7 @@ def read_fan_speed(path: str) -> int:
     with open(path, "r") as f:
         return int(f.read())
 
+
 def write_fan_speed(path: str, speed: int):
     with open(path, "w") as f:
-        f.write(str(speed))
+        f.write(str(speed))

{adjustor-3.6.0 → adjustor-3.6.2}/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.6.0 → adjustor-3.6.2}/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.6.0 → adjustor-3.6.2}/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.6.0 → adjustor-3.6.2/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.6.0
+Version: 3.6.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