adjustor 3.5.3__tar.gz → 3.5.4__tar.gz

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

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

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

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

@@ -1,5 +1,33 @@
+from typing import TypedDict
+
 from .alib import A, D, DeviceParams, AlibParams
 
+
+class DevicePreset(TypedDict):
+    tdp_limit: int
+    slow_limit: int
+    fast_limit: int
+    slow_time: int
+    stapm_time: int
+    temp_target: int
+    fan_curve: dict[int, float] | None
+
+
+class DevideProfile(TypedDict):
+    quiet: DevicePreset
+    balanced: DevicePreset
+    performance: DevicePreset
+    # Turbo is custom with max tdp values
+    turbo: DevicePreset
+
+    platform_profile_map: dict[str, int]
+    ppd_balanced_min: int
+    ppd_performance_min: int
+
+    alib: dict[str, AlibParams]
+    dev: dict[str, DeviceParams]
+
+
 PLATFORM_PROFILE_MAP = [
     ("low-power", 0),
     ("quiet", 0),
@@ -29,6 +57,7 @@ ALIB_PARAMS_5040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_7040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_6040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_8040: dict[str, AlibParams] = ALIB_PARAMS
+ALIB_PARAMS_HX370: dict[str, AlibParams] = ALIB_PARAMS
 
 DEV_PARAMS_30W: dict[str, DeviceParams] = {
     "stapm_limit": D(0, 4, 15, 30, 40),
@@ -69,12 +98,14 @@ DEV_PARAMS_5000: dict[str, DeviceParams] = DEV_PARAMS_25W
 DEV_PARAMS_6000: dict[str, DeviceParams] = DEV_PARAMS_30W
 DEV_PARAMS_7040: dict[str, DeviceParams] = DEV_PARAMS_30W
 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),
 }
 
 CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
@@ -88,4 +119,5 @@ CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
     "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),
 }

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

@@ -225,7 +225,7 @@ class AsusDriverPlugin(HHDPlugin):
             lim != self.old_conf["charge_limit"].to(str)
         ):
             self.queue_charge_limit = curr + APPLY_DELAY
-        
+
         if self.queue_charge_limit and self.queue_charge_limit < curr:
             self.queue_charge_limit = None
             match lim:
@@ -281,6 +281,9 @@ class AsusDriverPlugin(HHDPlugin):
                 self.sys_tdp = False
             tdp_reset = True
 
+        if mode is not None and self.startup:
+            tdp_reset = True
+
         # Handle EPP for presets
         if tdp_reset and mode != "custom":
             match mode:

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

@@ -64,7 +64,7 @@ class GeneralPowerPlugin(HHDPlugin):
                         logger.info("Unmasking TuneD in the case it was masked.")
                         os.system('systemctl unmask tuned')
                     subprocess.run(
-                        [tuned],
+                        [tuned,'active'],
                         check=True,
                         stdin=subprocess.DEVNULL,
                         stdout=subprocess.DEVNULL,
@@ -75,7 +75,7 @@ class GeneralPowerPlugin(HHDPlugin):
                     logger.warning(f"tuned-adm returned with error:\n{e}")
 
 
-        if not self.ppd_supported:
+        if not self.ppd_supported and not self.tuned_supported:
             del sets["children"]["profile"]
 
         # SchedExt
@@ -188,7 +188,7 @@ class GeneralPowerPlugin(HHDPlugin):
                         conf["tdp.general.profile"] = self.target
                 except Exception as e:
                     self.tuned_supported = False
-                    logger.warning(f"powerprofilectl returned with error:\n{e}")
+                    logger.warning(f"tuned-adm returned with error:\n{e}")
                     self.tuned_supported = False
 
         # Handle sched

{adjustor-3.5.3 → adjustor-3.5.4}/src/adjustor/drivers/lenovo/__init__.py

@@ -44,6 +44,7 @@ class LenovoDriverPlugin(HHDPlugin):
         self.old_conf = None
         self.sys_tdp = False
         self.fan_curve_set = False
+        self.notify_tdp = False
 
         bios_version = get_bios_version()
         logger.info(f"Lenovo BIOS version: {bios_version}")
@@ -326,6 +327,12 @@ class LenovoDriverPlugin(HHDPlugin):
         # Save current config
         self.old_conf = conf["tdp.lenovo"]
 
+        if self.notify_tdp:
+            self.notify_tdp = False
+            print(new_mode)
+            if conf.get("tdp.lenovo.tdp_rgb", False):
+                self.emit({"type": "special", "event": f"tdp_cycle_{new_mode}"})  # type: ignore
+
         if self.startup:
             self.startup = False
 
@@ -333,7 +340,7 @@ class LenovoDriverPlugin(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
             if ev["type"] == "ppd":
                 match ev["status"]:
                     case "power":
@@ -342,6 +349,9 @@ class LenovoDriverPlugin(HHDPlugin):
                         self.new_mode = "balanced"
                     case "performance":
                         self.new_mode = "performance"
+            print(ev)
+            if ev["type"] == "acpi" and ev.get("event", None) == "tdp":
+                self.notify_tdp = True
 
     def close(self):
         pass

{adjustor-3.5.3 → adjustor-3.5.4}/src/adjustor/drivers/lenovo/settings.yml

@@ -143,6 +143,12 @@ children:
             hint: >-
               Reset to the original fan curve provided by Lenovo in BIOS V28.
 
+  tdp_rgb:
+    type: bool
+    title: Show TDP changes with RGB
+    tags: [non-essential]
+    default: False
+
   charge_limit:
     tags: [advanced]
     type: bool

{adjustor-3.5.3 → adjustor-3.5.4}/src/adjustor/events.py

@@ -15,6 +15,7 @@ EVENT_MATCHES: Sequence[tuple[dict[str, Any], str]] = [
     ({"device_class": b"button/power"}, "powerbutton"),
     # Legion GO TDP event
     ({"bus_id": b"D320289E-8FEA-"}, "tdp"),
+    ({"device_class": b"wmi", "bus_id": b"PNP0C14:01"}, "tdp"), # Legion go
     # GPD Force hibernate thermal event
     # , 'type': 0xf100, 'data': 0x0100 ignore these attrs for now...
     ({"device_class": b"thermal_zone", "bus_id": b"LNXTHERM:00"}, "hibernate-thermal"),

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

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