adjustor 2.1.4__tar.gz → 2.1.5__tar.gz

{adjustor-2.1.4/src/adjustor.egg-info → adjustor-2.1.5}/PKG-INFO

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

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

{adjustor-2.1.4 → adjustor-2.1.5}/src/adjustor/drivers/asus/__init__.py

@@ -32,6 +32,20 @@ MIN_CURVE = [2, 5, 17, 17, 17, 17, 17, 17]
 DEFAULT_CURVE = [5, 10, 20, 35, 55, 75, 75, 75]
 
 
+def set_charge_limit(lim: int):
+    try:
+        # FIXME: Hardcoded path, should match using another characteristic
+        logger.info(f"Setting charge limit to {lim:d} %.")
+        with open(
+            "/sys/class/power_supply/BAT0/charge_control_end_threshold", "w"
+        ) as f:
+            f.write(f"{lim}\n")
+        return True
+    except Exception as e:
+        logger.error(f"Failed to write battery limit with error:\n{e}")
+        return False
+
+
 def set_tdp(pretty: str, fn: str, val: int):
     logger.info(f"Setting tdp value '{pretty}' to {val} by writing to:\n{fn}")
     try:
@@ -148,6 +162,30 @@ class AsusDriverPlugin(HHDPlugin):
 
         curr = time.time()
 
+        # Charge limit
+        lim = conf["tdp.asus.charge_limit"].to(str)
+        if (self.startup and lim != "disabled") or (
+            lim != self.old_conf["charge_limit"].to(str)
+        ):
+            match lim:
+                case "p65":
+                    set_charge_limit(65)
+                case "p70":
+                    set_charge_limit(70)
+                case "p80":
+                    set_charge_limit(80)
+                case "p85":
+                    set_charge_limit(85)
+                case "p90":
+                    set_charge_limit(90)
+                case "p95":
+                    set_charge_limit(95)
+                case "disabled":
+                    # Avoid writing charge limit on startup if
+                    # disabled
+                    if not self.startup:
+                        set_charge_limit(100)
+
         #
         # TDP
         #

{adjustor-2.1.4 → adjustor-2.1.5}/src/adjustor/drivers/asus/settings.yml

@@ -95,4 +95,32 @@ children:
             type: display
             default: >-
               Asus hardware limits the minimum fan curve depending on TDP.
-              The minimums are 25%, 50%, and 75% for low, middle, and high TDPs.
+              The minimums are 25%, 50%, and 75% for low, medium, and high TDPs.
+
+  charge_limit:
+    type: multiple
+    title: Charge Limit (%)
+    tags: [ non-essential ]
+    hint: >-
+      Applies a charge limit to the battery, 75% and up.
+    options:
+      disabled: Disabled
+      p65: 65%
+      p70: 70%
+      p80: 80%
+      p85: 85%
+      p90: 90%
+      p95: 95%
+    default: disabled
+  
+  disclaimer:
+    title: Sleep Bug
+    type: display
+    tags: [ non-essential ]
+    default: >-
+      There is an Asus kernel/BIOS bug that will sometimes limit TDP to 10W
+      after sleep.
+      As the kernel driver is used, this is unfixable from within
+      Handheld Daemon (currently investigated).
+      As an alternative, use SimpleDeckyTDP with RyzenAdj after
+      disabling TDP controls from "Settings".

{adjustor-2.1.4 → adjustor-2.1.5}/src/adjustor/drivers/smu/smu.yml

@@ -1,7 +1,6 @@
 type: container
 title: Advanced Configurator
 tags: [advanced, expert]
-hint: >-
 children:
   apply:
     type: action

{adjustor-2.1.4 → adjustor-2.1.5}/src/adjustor/hhd.py

@@ -1,16 +1,18 @@
 import logging
 import os
-from threading import Event as TEvent, Thread
+from threading import Event as TEvent
+from threading import Thread
 from typing import Sequence
 
-from hhd.utils import expanduser
 from hhd.plugins import Context, HHDPlugin, HHDSettings, load_relative_yaml
 from hhd.plugins.conf import Config
 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, ROG_ALLY_PP_MAP
 
+from .i18n import _
 from .utils import exists_sentinel, install_sentinel, remove_sentinel
 
 logger = logging.getLogger(__name__)
@@ -55,7 +57,7 @@ class AdjustorInitPlugin(HHDPlugin):
             conf["hhd.settings.tdp_enable"] = False
         if self.safe_mode:
             logger.warning(f"Due to a sentinel error, auto-start is disabled.")
-            conf["tdp.tdp.tdp_error"] = (
+            conf["tdp.tdp.tdp_error"] = _(
                 "Due to a suspected crash, auto-start was disabled."
             )
             conf["hhd.settings.tdp_enable"] = False
@@ -68,9 +70,8 @@ class AdjustorInitPlugin(HHDPlugin):
 
         for name, path in CONFLICTING_PLUGINS.items():
             if os.path.exists(expanduser(path, self.context)):
-                err = (
-                    f'Found plugin "{name}" at the following path:\n{path}\n'
-                    + "TDP Controls can not be enabled while other TDP plugins are installed."
+                err = f'Found plugin "{name}" at the following path:\n{path}\n' + _(
+                    "TDP Controls can not be enabled while other TDP plugins are installed."
                 )
                 conf["tdp.tdp.tdp_error"] = err
                 conf["hhd.settings.tdp_enable"] = False
@@ -169,8 +170,8 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     if len(existing):
         return existing
 
-    from .drivers.lenovo import LenovoDriverPlugin
     from .drivers.asus import AsusDriverPlugin
+    from .drivers.lenovo import LenovoDriverPlugin
     from .drivers.smu import SmuDriverPlugin, SmuQamPlugin
 
     drivers = []

adjustor-2.1.5/src/adjustor/i18n.py

@@ -0,0 +1,2 @@
+def _(arg: str):
+    return arg

{adjustor-2.1.4 → adjustor-2.1.5/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.4
+Version: 2.1.5
 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-2.1.4 → adjustor-2.1.5}/src/adjustor.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/adjustor/__init__.py
 src/adjustor/__main__.py
 src/adjustor/events.py
 src/adjustor/hhd.py
+src/adjustor/i18n.py
 src/adjustor/settings.yml
 src/adjustor/utils.py
 src/adjustor.egg-info/PKG-INFO