adjustor 3.7.5__tar.gz → 3.7.7__tar.gz

{adjustor-3.7.5/src/adjustor.egg-info → adjustor-3.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adjustor
-Version: 3.7.5
+Version: 3.7.7
 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.7.5 → adjustor-3.7.7}/pyproject.toml

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

{adjustor-3.7.5 → adjustor-3.7.7}/src/adjustor/core/const.py

@@ -27,17 +27,17 @@ class DevideProfile(TypedDict):
     alib: dict[str, AlibParams]
     dev: dict[str, DeviceParams]
 
-
-PLATFORM_PROFILE_MAP = [
-    ("low-power", 0),
-    ("quiet", 0),
-    ("balanced", 13),
-    ("performance", 20),
-]
+# internal name for ppd, platform_profile choices, min TDP for
+# profile to apply, tdp target to apply when selecting profile
 ENERGY_MAP = [
-    ("power", 0),
-    ("balanced", 13),
-    ("performance", 20),
+    ("power", ["low-power", "quiet"], 0, 8),
+    ("balanced", ["balanced"], 13, 15),
+    ("performance", ["performance"], 20, 25),
+]
+ENERGY_MAP_18W = [
+    ("low-power", ["low-power", "quiet"], 0, 5),
+    ("balanced", ["balanced"], 8, 12),
+    ("performance", ["performance"], 13, 18),
 ]
 
 ALIB_PARAMS = {
@@ -112,33 +112,48 @@ DEV_PARAMS_8040: dict[str, DeviceParams] = DEV_PARAMS_30W
 DEV_PARAMS_HX370: dict[str, DeviceParams] = DEV_PARAMS_30W
 DEV_PARAMS_LEGO = DEV_PARAMS_30W
 
-DEV_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams], bool]] = {
-    "NEO-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
-    "V3": (DEV_PARAMS_28W, ALIB_PARAMS_8040, False),
-    "83E1": (DEV_PARAMS_LEGO, ALIB_PARAMS_7040, False),
-    "ONEXPLAYER F1Pro": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, False),
-    "ONEXPLAYER F1 EVA-02": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, False),
+DEV_DATA: dict[
+    str,
+    tuple[
+        dict[str, DeviceParams],
+        dict[str, AlibParams],
+        bool,
+        list[tuple[str, list[str], int, int]],
+    ],
+] = {
+    "NEO-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False, ENERGY_MAP),
+    "V3": (DEV_PARAMS_28W, ALIB_PARAMS_8040, False, ENERGY_MAP),
+    "83E1": (DEV_PARAMS_LEGO, ALIB_PARAMS_7040, False, ENERGY_MAP),
+    "ONEXPLAYER F1Pro": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, False, ENERGY_MAP),
+    "ONEXPLAYER F1 EVA-02": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, False, ENERGY_MAP),
     # GPD Devices are 28W max
-    "G1618-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
-    "G1617-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
-    "G1619-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
-    "G1619-05": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
+    "G1618-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False, ENERGY_MAP),
+    "G1617-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False, ENERGY_MAP),
+    "G1619-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False, ENERGY_MAP),
+    "G1619-05": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False, ENERGY_MAP),
 }
 
-CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
-    "AMD Ryzen Z1 Extreme": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
-    "AMD Ryzen Z1": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
+CPU_DATA: dict[
+    str,
+    tuple[
+        dict[str, DeviceParams],
+        dict[str, AlibParams],
+        list[tuple[str, list[str], int, int]],
+    ],
+] = {
+    "AMD Ryzen Z1 Extreme": (DEV_PARAMS_7040, ALIB_PARAMS_7040, ENERGY_MAP),
+    "AMD Ryzen Z1": (DEV_PARAMS_7040, ALIB_PARAMS_7040, ENERGY_MAP),
     # Ayaneo AIR Pro, max is 18W
-    "AMD Ryzen 5 5560U": (DEV_PARAMS_18W, ALIB_PARAMS_5040),
+    "AMD Ryzen 5 5560U": (DEV_PARAMS_18W, ALIB_PARAMS_5040, ENERGY_MAP_18W),
     # 28W works fine, 30W is pushing it
-    "AMD Ryzen 7 5700U": (DEV_PARAMS_5000, ALIB_PARAMS_5040),
-    "AMD Ryzen 7 5800U": (DEV_PARAMS_5000, ALIB_PARAMS_5040),
+    "AMD Ryzen 7 5700U": (DEV_PARAMS_5000, ALIB_PARAMS_5040, ENERGY_MAP),
+    "AMD Ryzen 7 5800U": (DEV_PARAMS_5000, ALIB_PARAMS_5040, ENERGY_MAP),
     # GPD Win 4
     # model name    : AMD Ryzen 7 6800U with Radeon Graphics
-    "AMD Ryzen 7 6800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
-    "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
-    "AMD Ryzen 7 8840U": (DEV_PARAMS_8040, ALIB_PARAMS_8040),
+    "AMD Ryzen 7 6800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040, ENERGY_MAP),
+    "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040, ENERGY_MAP),
+    "AMD Ryzen 7 8840U": (DEV_PARAMS_8040, ALIB_PARAMS_8040, ENERGY_MAP),
     # 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),
+    "AMD Ryzen AI 9 HX 370": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, ENERGY_MAP),
+    "AMD Ryzen AI HX 360": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, ENERGY_MAP),
 }

{adjustor-3.7.5 → adjustor-3.7.7}/src/adjustor/drivers/amd/ppd.py

@@ -138,22 +138,24 @@ def create_interface(legacy: bool):
             # TODO
             return handle
 
-        def update_profile(self):
-            for line in sys.stdin:
-                if not line:
-                    break
-                profile = line.strip()
-                if profile not in SUPPORTED_PROFILES_REVERSE:
-                    continue
+        def set_profile(self, profile):
+            if profile not in SUPPORTED_PROFILES_REVERSE:
+                return
 
-                self.profile = profile
-                self.PropertiesChanged(
-                    iface(legacy), {"ActiveProfile": self.profile}, []
-                )
-            return True
+            self.profile = SUPPORTED_PROFILES_REVERSE[profile]
+            self.PropertiesChanged(iface(legacy), {"ActiveProfile": self.profile}, [])
 
     return HhdPpd
 
+def update_profile(services):
+    for line in sys.stdin:
+        if not line:
+            break
+        profile = line.strip()
+        
+        for s in services:
+            s.set_profile(profile)
+    return True
 
 if __name__ == "__main__":
     mainloop = None
@@ -164,12 +166,32 @@ if __name__ == "__main__":
         orig_fl = fcntl.fcntl(sys.stdin, fcntl.F_GETFL)
         fcntl.fcntl(sys.stdin, fcntl.F_SETFL, orig_fl | os.O_NONBLOCK)
 
-        legacy = True
+        legacy = False
         session_bus = dbus.SystemBus()
-        name = dbus.service.BusName(iface(legacy), session_bus)
-        object = create_interface(legacy)(session_bus)
+        
+        claimed = False
+        try:
+            name1 = dbus.service.BusName(iface(False), session_bus)
+            claimed = True
+        except Exception:
+            pass
+        
+        try:
+            name2 = dbus.service.BusName(iface(True), session_bus)
+            claimed = True
+        except Exception:
+            pass
+        
+        if not claimed:
+            sys.exit(1)
+
+        services = [
+            create_interface(False)(session_bus),
+            create_interface(True)(session_bus),
+        ]
+
+        GLib.timeout_add(100, lambda: update_profile(services))
 
-        GLib.timeout_add(100, object.update_profile)
         mainloop = GLib.MainLoop()
         mainloop.run()
     except KeyboardInterrupt:

{adjustor-3.7.5 → adjustor-3.7.7}/src/adjustor/drivers/smu/__init__.py

@@ -44,8 +44,8 @@ class SmuQamPlugin(HHDPlugin):
     def __init__(
         self,
         dev: dict[str, DeviceParams],
-        pp_map: list[tuple[str, int]] | None,
-        energy_map: list[tuple[str, int]] | None,
+        pp_map: list[tuple[str, list[str], int, int]] | None,
+        pp_enable: bool = True,
         init_tdp: bool = True,
     ) -> None:
         self.name = f"adjustor_smu_qam"
@@ -80,19 +80,15 @@ class SmuQamPlugin(HHDPlugin):
         # startup
         self.init_tdp = init_tdp
 
-        self.energy_map = energy_map
-        if pp_map:
+        self.pp_map = pp_map
+        if pp_enable and pp_map:
             self.pps = get_platform_choices() or []
-            if self.pps:
-                self.pp_map = pp_map
-            else:
+            if not self.pps:
                 logger.warning(
                     f"Platform profile map was provided but device does not have platform profiles."
                 )
-                self.pp_map = None
         else:
             self.pps = []
-            self.pp_map = None
 
     def settings(self):
         if not self.enabled:
@@ -205,18 +201,16 @@ class SmuQamPlugin(HHDPlugin):
             conf["tdp.smu.std.skin_limit"] = new_tdp
             conf["tdp.smu.std.stapm_limit"] = new_tdp
 
-            if self.pp_map and conf["tdp.smu.platform_profile"].to(str) != "disabled":
-                pp = self.pp_map[0][0]
-                for npp, tdp in self.pp_map:
-                    if tdp < new_tdp and npp in self.pps:
-                        pp = npp
-                conf["tdp.smu.platform_profile"] = pp
-
-            if self.energy_map:
-                ep = self.energy_map[0][0]
-                for nep, tdp in self.energy_map:
+            if self.pp_map:
+                pp = ep = self.pp_map[0][0]
+                for nep, npps, tdp, target in self.pp_map:
                     if tdp < new_tdp:
                         ep = nep
+                        for npp in npps:
+                            if npp in self.pps:
+                                pp = npp
+                if self.pps and conf.get("tdp.smu.platform_profile", "disabled") != "disabled":
+                    conf["tdp.smu.platform_profile"] = pp
                 conf["tdp.smu.energy_policy"] = ep
 
             if new_boost:
@@ -310,15 +304,13 @@ class SmuQamPlugin(HHDPlugin):
                 self.new_tdp = ev["tdp"]
                 self.sys_tdp = ev["tdp"] is not None
 
-            if ev["type"] == "ppd":
-                # TODO: Make tunable per device
-                match ev["status"]:
-                    case "power":
-                        self.new_tdp = 8
-                    case "balanced":
-                        self.new_tdp = 15
-                    case "performance":
-                        self.new_tdp = 25
+            if ev["type"] == "ppd" and self.pp_map:
+                for ep, pps, tdp, target in self.pp_map:
+                    if ep == ev["status"]:
+                        self.new_tdp = target
+                        break
+                else:
+                    logger.warning(f"Energy profile '{ev['status']}' not found in map.")
 
             if ev["type"] == "special" and ev.get("event", None) == "wakeup":
                 logger.info(
@@ -462,6 +454,12 @@ class SmuDriverPlugin(HHDPlugin):
                 self.is_set = False
             self.old_pp = new_pp
 
+        # Inform ppd instantly to avoid lag in slider
+        new_target = conf["tdp.smu.energy_policy"].to(str)
+        if new_target != self.old_target:
+            self.old_target = new_target
+            self.emit({"type": "energy", "status": new_target})  # type: ignore
+
         if conf["tdp.smu.apply"].to(bool):
             conf["tdp.smu.apply"] = False
 
@@ -471,11 +469,6 @@ class SmuDriverPlugin(HHDPlugin):
                     set_platform_profile(cpp)
                     time.sleep(PP_DELAY)
 
-            new_target = conf["tdp.smu.energy_policy"].to(str)
-            if new_target != self.old_target:
-                self.old_target = new_target
-                self.emit({"type": "energy", "status": new_target})  # type: ignore
-
             alib(
                 new_vals,
                 self.cpu,

{adjustor-3.7.5 → adjustor-3.7.7}/src/adjustor/hhd.py

@@ -10,7 +10,7 @@ from hhd.plugins.plugin import Emitter
 from hhd.utils import expanduser
 
 from adjustor.core.acpi import check_perms, initialize
-from adjustor.core.const import CPU_DATA, DEV_DATA, PLATFORM_PROFILE_MAP, ENERGY_MAP
+from adjustor.core.const import CPU_DATA, DEV_DATA
 
 from .i18n import _
 
@@ -284,7 +284,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         drivers_matched = False
 
     if not drivers_matched and prod in DEV_DATA:
-        dev, cpu, pp_enable = DEV_DATA[prod]
+        dev, cpu, pp_enable, energy_map = DEV_DATA[prod]
 
         try:
             # Set values for the steam slider
@@ -308,8 +308,8 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         drivers.append(
             SmuQamPlugin(
                 dev,
-                PLATFORM_PROFILE_MAP if pp_enable else None,
-                ENERGY_MAP,
+                energy_map,
+                pp_enable=pp_enable,
                 init_tdp=not prod == "83E1",
             ),
         )
@@ -317,7 +317,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         use_acpi_call = True
 
     if not drivers_matched:
-        for name, (dev, cpu) in CPU_DATA.items():
+        for name, (dev, cpu, energy_map) in CPU_DATA.items():
             if name in cpuinfo:
                 drivers.append(
                     SmuDriverPlugin(
@@ -327,7 +327,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
                     )
                 )
                 drivers.append(
-                    SmuQamPlugin(dev, PLATFORM_PROFILE_MAP, ENERGY_MAP),
+                    SmuQamPlugin(dev, energy_map),
                 )
                 use_acpi_call = True
                 break
@@ -336,7 +336,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         from .drivers.general import GeneralPowerPlugin
 
         logger.info(f"No tdp drivers found for this device, using generic plugin.")
-        
+
         is_steamdeck = "Jupiter" in prod or "Galileo" in prod
         return [GeneralPowerPlugin(is_steamdeck=is_steamdeck)]
 

{adjustor-3.7.5 → adjustor-3.7.7/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adjustor
-Version: 3.7.5
+Version: 3.7.7
 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