adjustor 3.4.6__tar.gz → 3.5.0__tar.gz

{adjustor-3.4.6/src/adjustor.egg-info → adjustor-3.5.0}/PKG-INFO

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

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

{adjustor-3.4.6 → adjustor-3.5.0}/src/adjustor/drivers/asus/__init__.py

@@ -13,14 +13,18 @@ logger = logging.getLogger(__name__)
 APPLY_DELAY = 0.7
 TDP_DELAY = 0.1
 SLEEP_DELAY = 4
-MIN_TDP_START = 7
-MAX_TDP_START = 30
+MIN_TDP = 7
+MAX_TDP = 30
 # FIXME: add AC/DC values
-MAX_TDP = 35
+MAX_TDP_BOOST = 35
 
 FTDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_fppt"
 STDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_pl2_sppt"
 CTDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_pl1_spl"
+EXTREME_FN = "/sys/devices/platform/asus-nb-wmi/mcu_powersave"
+EXTREME_ENABLE = bool(os.environ.get("HHD_ALLY_POWERSAVE", None))
+# This setting can really mess up the controller
+EXTREME_DELAY = 3.8
 
 FAN_CURVE_ENDPOINT = "/sys/class/hwmon"
 FAN_CURVE_NAME = "asus_custom_fan_curve"
@@ -137,9 +141,13 @@ class AsusDriverPlugin(HHDPlugin):
         self.mode = None
         self.cycle_tdp = None
 
+        self.extreme_standby = None
+        self.extreme_supported = None
+
         self.queue_fan = None
         self.queue_tdp = None
         self.queue_charge_limit = None
+        self.queue_extreme = None
         self.new_tdp = None
         self.new_mode = None
         self.old_target = None
@@ -157,6 +165,14 @@ class AsusDriverPlugin(HHDPlugin):
         self.initialized = True
         out = {"tdp": {"asus": load_relative_yaml("settings.yml")}}
 
+        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}")
+        self.extreme_supported = extreme_supported
+        if not self.extreme_supported:
+            del out["tdp"]["asus"]["children"]["extreme_standby"]
+
         # Set units
         if self.allyx:
             out["tdp"]["asus"]["children"]["tdp_v2"]["modes"]["quiet"]["unit"] = "13W"
@@ -242,14 +258,15 @@ class AsusDriverPlugin(HHDPlugin):
         if new_tdp:
             # For TDP values received from steam, set the appropriate
             # mode to get a better experience.
-            if new_tdp == (13 if ally_x else 10):
-                mode = "quiet"
-            elif new_tdp == (17 if ally_x else 15):
-                mode = "balanced"
-            elif new_tdp == 25 or new_tdp == 30:
-                mode = "performance"
-            else:
-                mode = "custom"
+            # if new_tdp == (13 if ally_x else 10):
+            #     mode = "quiet"
+            # elif new_tdp == (17 if ally_x else 15):
+            #     mode = "balanced"
+            # elif new_tdp == 25 or new_tdp == 30:
+            #     mode = "performance"
+            # else:
+            #     mode = "custom"
+            mode = "custom"
             conf["tdp.asus.tdp_v2.mode"] = mode
         elif new_mode:
             mode = new_mode
@@ -286,6 +303,14 @@ class AsusDriverPlugin(HHDPlugin):
             else:
                 steady = conf["tdp.asus.tdp_v2.custom.tdp"].to(int)
 
+            if self.enforce_limits:
+                if steady < MIN_TDP:
+                    steady = MIN_TDP
+                    conf["tdp.asus.tdp_v2.custom.tdp"] = steady
+                elif steady > MAX_TDP:
+                    steady = MAX_TDP
+                    conf["tdp.asus.tdp_v2.custom.tdp"] = steady
+
             steady_updated = steady and steady != self.old_conf["tdp_v2.custom.tdp"].to(
                 int
             )
@@ -294,11 +319,11 @@ class AsusDriverPlugin(HHDPlugin):
 
             steady_updated |= tdp_reset
 
-            if self.startup and (steady > MAX_TDP_START or steady < MIN_TDP_START):
+            if self.startup and (steady > MAX_TDP or steady < MIN_TDP):
                 logger.warning(
                     f"TDP ({steady}) outside the device spec. Resetting for stability reasons."
                 )
-                steady = min(max(steady, MIN_TDP_START), MAX_TDP_START)
+                steady = min(max(steady, MIN_TDP), MAX_TDP)
                 conf["tdp.asus.tdp_v2.custom.tdp"] = steady
                 steady_updated = True
 
@@ -331,13 +356,13 @@ class AsusDriverPlugin(HHDPlugin):
                     set_tdp(
                         "fast",
                         FTDP_FN,
-                        min(max(steady, MAX_TDP), int(steady * 35 / 25)),
+                        min(max(steady, MAX_TDP_BOOST), int(steady * 35 / 25)),
                     )
                     time.sleep(TDP_DELAY)
                     set_tdp(
                         "slow",
                         STDP_FN,
-                        min(max(steady, MAX_TDP), int(steady * 30 / 25)),
+                        min(max(steady, MAX_TDP_BOOST), int(steady * 30 / 25)),
                     )
                     time.sleep(TDP_DELAY)
                     set_tdp("steady", CTDP_FN, steady)
@@ -433,6 +458,22 @@ class AsusDriverPlugin(HHDPlugin):
         if self.startup:
             self.startup = False
 
+        # Extreme standby
+        if self.extreme_supported:
+            standby = conf["tdp.asus.extreme_standby"].to(bool)
+            if standby != self.extreme_standby:
+                self.extreme_standby = standby
+                self.queue_extreme = curr + EXTREME_DELAY
+
+            if self.queue_extreme and self.queue_extreme < curr:
+                self.queue_extreme = None
+                try:
+                    logger.info (f"Setting extreme standby to '{standby}'")
+                    with open(EXTREME_FN, "w") as f:
+                        f.write("1" if standby == "enabled" else "0")
+                except Exception as e:
+                    logger.error(f"Could not set extreme standby. Error:\n{e}")
+
     def notify(self, events: Sequence[Event]):
         for ev in events:
             if ev["type"] == "tdp":

{adjustor-3.4.6 → adjustor-3.5.0}/src/adjustor/drivers/asus/settings.yml

@@ -142,4 +142,17 @@ children:
       p90: 90%
       p95: 95%
       disabled: Unset
-    default: disabled
+    default: disabled
+
+  extreme_standby:
+    type: multiple
+    title: Extreme Standby Mode
+    tags: [ non-essential, ordinal ]
+    options:
+      disabled: Disabled
+      enabled: Enabled
+    default: disabled
+    hint: >-
+      Lowers the power consumption of the device from 4% to 1% overnight.
+      Active only on battery. Turns off the power light and the controller 
+      requires longer to wake up.

{adjustor-3.4.6 → adjustor-3.5.0}/src/adjustor/hhd.py

@@ -269,6 +269,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     ):
         drivers.append(AsusDriverPlugin("RC72L" in prod))
         drivers_matched = True
+        min_tdp = 7
 
     if os.environ.get("HHD_ADJ_DEBUG") or os.environ.get("HHD_ENABLE_SMU"):
         drivers_matched = False

{adjustor-3.4.6 → adjustor-3.5.0/src/adjustor.egg-info}/PKG-INFO

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