adjustor 3.6.4__tar.gz → 3.7.0__tar.gz

{adjustor-3.6.4/src/adjustor.egg-info → adjustor-3.7.0}/PKG-INFO

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

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

{adjustor-3.6.4 → adjustor-3.7.0}/src/adjustor/core/const.py

@@ -131,6 +131,7 @@ CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     # GPD Win 4
     # model name    : AMD Ryzen 7 6800U with Radeon Graphics
     # 28W works fine, 30W is pushing it
+    "AMD Ryzen 7 5700U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
     "AMD Ryzen 7 5800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
     "AMD Ryzen 7 6800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
     "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),

{adjustor-3.6.4 → adjustor-3.7.0}/src/adjustor/drivers/lenovo/__init__.py

@@ -9,7 +9,6 @@ from adjustor.core.lenovo import (
     MIN_CURVE,
     TdpMode,
     get_bios_version,
-    get_charge_limit,
     get_full_fan_speed,
     get_power_light,
     get_power_light_v1,
@@ -33,7 +32,7 @@ TDP_DELAY = 0
 
 
 class LenovoDriverPlugin(HHDPlugin):
-    def __init__(self) -> None:
+    def __init__(self, legion_s=False) -> None:
         self.name = f"adjustor_lenovo"
         self.priority = 6
         self.log = "adjl"
@@ -42,13 +41,25 @@ class LenovoDriverPlugin(HHDPlugin):
         self.enforce_limits = True
         self.startup = True
         self.old_conf = None
+        self.prev_charge_limit = None
         self.sys_tdp = False
         self.fan_curve_set = False
-        self.notify_tdp = False
+        self.legion_s = legion_s
+        if legion_s:
+            self.max_watts = 33
+            self.max_watts_sppt = 33
+            self.max_watts_fppt = 35
+        else:
+            self.max_watts = 30
+            self.max_watts_sppt = 32
+            self.max_watts_fppt = 41
 
         bios_version = get_bios_version()
-        logger.info(f"Lenovo BIOS version: {bios_version}")
-        self.power_light_v2 = bios_version >= 35
+        if legion_s:
+            self.power_light_v2 = False
+        else:
+            logger.info(f"Lenovo BIOS version: {bios_version}")
+            self.power_light_v2 = bios_version >= 35
 
         self.queue_fan = None
         self.queue_tdp = None
@@ -65,12 +76,22 @@ class LenovoDriverPlugin(HHDPlugin):
 
         self.initialized = True
         out = {"tdp": {"lenovo": load_relative_yaml("settings.yml")}}
+        if self.legion_s:
+            out["tdp"]["lenovo"]["children"]["power_light"]["title"] = _("Power Light")
         if not self.power_light_v2:
             del out["tdp"]["lenovo"]["children"]["power_light_sleep"]
         if not self.enforce_limits:
             out["tdp"]["lenovo"]["children"]["tdp"]["modes"]["custom"]["children"][
                 "tdp"
             ]["max"] = 40
+        else:
+            out["tdp"]["lenovo"]["children"]["tdp"]["modes"]["custom"]["children"][
+                "tdp"
+            ]["max"] = self.max_watts
+        if self.max_watts > 30:
+            out["tdp"]["lenovo"]["children"]["tdp"]["modes"]["custom"][
+                "unit"
+            ] = f"→ {self.max_watts}W"
         return out
 
     def open(
@@ -106,8 +127,6 @@ class LenovoDriverPlugin(HHDPlugin):
             else:
                 conf["tdp.lenovo.power_light"] = get_power_light_v1()
 
-            conf["tdp.lenovo.charge_limit"] = get_charge_limit()
-
         # If not old config, exit, as values can not be set
         if not self.old_conf:
             self.old_conf = conf["tdp.lenovo"]
@@ -138,11 +157,10 @@ class LenovoDriverPlugin(HHDPlugin):
             ):
                 set_power_light(power_light_sleep, suspend=True)
 
-        charge_limit = conf["tdp.lenovo.charge_limit"].to(bool)
-        if charge_limit is not None and charge_limit != self.old_conf[
-            "charge_limit"
-        ].to(bool):
+        charge_limit = conf.get("tdp.lenovo.charge_limit", False)
+        if charge_limit != self.prev_charge_limit:
             set_charge_limit(charge_limit)
+            self.prev_charge_limit = charge_limit
 
         #
         # TDP
@@ -153,6 +171,7 @@ class LenovoDriverPlugin(HHDPlugin):
         new_tdp = self.new_tdp
         self.new_tdp = None
         new_mode = self.new_mode
+        notify_tdp = False
         self.new_mode = None
         if new_tdp:
             # For TDP values received from steam, set the appropriate
@@ -181,6 +200,7 @@ class LenovoDriverPlugin(HHDPlugin):
             if not new_tdp:
                 self.sys_tdp = False
             tdp_reset = True
+            notify_tdp = True
         conf["tdp.lenovo.tdp.mode"] = new_mode
 
         # Reset fan curve on mode change
@@ -215,7 +235,7 @@ class LenovoDriverPlugin(HHDPlugin):
 
             old_steady = steady
             if self.enforce_limits:
-                steady = min(max(steady, 4), 30)
+                steady = min(max(steady, 4), self.max_watts)
             else:
                 steady = min(max(steady, 0), 50)
             if old_steady != steady:
@@ -227,12 +247,12 @@ class LenovoDriverPlugin(HHDPlugin):
             if steady_updated and not new_tdp:
                 self.sys_tdp = False
 
-            if self.startup and (steady > 30 or steady < 7):
+            if self.startup and (steady > self.max_watts or steady < 7):
                 logger.warning(
                     f"TDP ({steady}) outside the device spec. Resetting for stability reasons."
                 )
-                steady = 30
-                conf["tdp.lenovo.tdp.custom.tdp"] = 30
+                steady = self.max_watts
+                conf["tdp.lenovo.tdp.custom.tdp"] = self.max_watts
                 steady_updated = True
 
             boost = conf["tdp.lenovo.tdp.custom.boost"].to(bool)
@@ -248,9 +268,14 @@ class LenovoDriverPlugin(HHDPlugin):
                 if boost:
                     set_steady_tdp(steady)
                     time.sleep(TDP_DELAY)
-                    set_slow_tdp(steady + 2)
+                    set_slow_tdp(steady + (self.max_watts_sppt - self.max_watts))
                     time.sleep(TDP_DELAY)
-                    set_fast_tdp(min(42, int(steady * 41 / 30)))
+                    set_fast_tdp(
+                        min(
+                            self.max_watts_fppt,
+                            int(steady * self.max_watts_fppt / self.max_watts),
+                        )
+                    )
                 else:
                     set_steady_tdp(steady)
                     time.sleep(TDP_DELAY)
@@ -327,9 +352,8 @@ class LenovoDriverPlugin(HHDPlugin):
         # Save current config
         self.old_conf = conf["tdp.lenovo"]
 
-        if self.notify_tdp:
-            self.notify_tdp = False
-            print(new_mode)
+        if notify_tdp:
+            notify_tdp = False
             if conf.get("tdp.lenovo.tdp_rgb", False):
                 self.emit({"type": "special", "event": f"tdp_cycle_{new_mode}"})  # type: ignore
 
@@ -349,9 +373,6 @@ 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.6.4 → adjustor-3.7.0}/src/adjustor/drivers/lenovo/settings.yml

@@ -147,14 +147,15 @@ children:
     type: bool
     title: Show TDP changes with RGB
     tags: [non-essential]
-    default: False
+    default: True
 
   charge_limit:
     tags: [advanced]
     type: bool
     title: Charge Limit (80%)
+    default: False
     hint: >-
-      Limits device charging to 80%. Lenovo EC method. Available since BIOSv29.
+      Limits device charging to 80%.
 
   power_light:
     tags: [advanced]

{adjustor-3.6.4 → adjustor-3.7.0}/src/adjustor/events.py

@@ -15,10 +15,11 @@ 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
+    ({"device_class": b"wmi", "bus_id": b"PNP0C14:01"}, "tdp"),  # Legion go
+    ({"device_class": b"wmi", "bus_id": b"PNP0C14:00"}, "tdp"),  # Legion go s
     # 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"),
+    # ({"device_class": b"thermal_zone", "bus_id": b"LNXTHERM:00"}, "hibernate-thermal"),
 ]
 
 GUARD_DELAY = 0.5

{adjustor-3.6.4 → adjustor-3.7.0}/src/adjustor/hhd.py

@@ -231,6 +231,10 @@ class AdjustorPlugin(HHDPlugin):
         self._stop()
 
 
+LEGION_GO_DMI = "83E1"
+LEGION_GO_S_DMIS = ["83L3"]
+
+
 def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     if len(existing):
         return existing
@@ -256,10 +260,15 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     default_tdp = 15
     max_tdp = 30
 
-    if prod == "83E1" and not bool(os.environ.get("HHD_ADJ_ALLY")):
-        drivers.append(LenovoDriverPlugin())
+    legion_s = prod in LEGION_GO_S_DMIS
+    if (prod == LEGION_GO_DMI or legion_s) and not bool(
+        os.environ.get("HHD_ADJ_ALLY")
+    ):
+        drivers.append(LenovoDriverPlugin(legion_s=legion_s))
         drivers_matched = True
         use_acpi_call = True
+    if legion_s:
+        max_tdp = 33
 
     if (
         "ROG Ally RC71L" in prod

{adjustor-3.6.4 → adjustor-3.7.0/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: adjustor
-Version: 3.6.4
+Version: 3.7.0
 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