adjustor 3.1.1__tar.gz → 3.1.3__tar.gz

{adjustor-3.1.1/src/adjustor.egg-info → adjustor-3.1.3}/PKG-INFO

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

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

{adjustor-3.1.1 → adjustor-3.1.3}/src/adjustor/drivers/amd/ppd.py

@@ -16,9 +16,9 @@ LEGACY_PATH = "/net/hadess/PowerProfiles"
 XML_PATH = "power-profiles-daemon.dbus.xml.in"
 
 SUPPORTED_PROFILES = {
-    "performance": "performance",
-    "balanced": "balanced",
     "power-saver": "power",
+    "balanced": "balanced",
+    "performance": "performance",
 }
 SUPPORTED_PROFILES_REVERSE = {v: k for k, v in SUPPORTED_PROFILES.items()}
 
@@ -76,12 +76,22 @@ def create_interface(legacy: bool):
         def GetAll(self, interface_name, sender=None):
             if interface_name == iface(legacy):
                 return {
-                    "Actions": dbus.Array(self.actions, signature="s"),
+                    "Actions": ["trickle_charge"],
                     "ActiveProfile": self.profile,
                     "ActiveProfileHolds": dbus.Array(self.profile_holds, signature="u"),
                     "PerformanceDegraded": "",
                     "PerformanceInhibited": "",
-                    "Profiles": [{"Profile": p} for p in SUPPORTED_PROFILES],
+                    "Profiles": [
+                        {
+                            "Profile": dbus.String(p, variant_level=1),
+                            "CpuDriver": dbus.String("amd_pstate", variant_level=1),
+                            "PlatformDriver": dbus.String(
+                                "platform_profile", variant_level=1
+                            ),
+                            "Driver": dbus.String("multiple", variant_level=1),
+                        }
+                        for p in SUPPORTED_PROFILES
+                    ],
                     "Version": "0.21",
                 }
             else:

{adjustor-3.1.1 → adjustor-3.1.3}/src/adjustor/drivers/asus/__init__.py

@@ -13,7 +13,8 @@ APPLY_DELAY = 1.5
 TDP_DELAY = 0.2
 MIN_TDP_START = 7
 MAX_TDP_START = 30
-MAX_TDP = 54
+# FIXME: add AC/DC values
+MAX_TDP = 35
 
 FTDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_fppt"
 STDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_pl2_sppt"
@@ -27,6 +28,17 @@ FAN_CURVE_NAME = "asus_custom_fan_curve"
 # [10 20 66 86 132 188 188 188] / 2.55
 # [ 4  8  ]
 
+# Unplugged values
+#       STAPM Slow Fast
+# perf  25 30 35
+# bal   15 20 25
+# power 10 14 17
+#
+# Plugged in values
+# perf  30 43 53
+# bal   15 20 25
+# power 10 14 17
+
 POINTS = [30, 40, 50, 60, 70, 80, 90, 100]
 MIN_CURVE = [2, 5, 17, 17, 17, 17, 17, 17]
 DEFAULT_CURVE = [5, 10, 20, 35, 55, 75, 75, 75]
@@ -242,10 +254,11 @@ class AsusDriverPlugin(HHDPlugin):
 
             self.queue_tdp = None
             if boost:
+                # TODO: Use different boost values depending on whether plugged in
                 time.sleep(TDP_DELAY)
-                set_tdp("fast", FTDP_FN, min(MAX_TDP, int(steady * 53 / 30)))
+                set_tdp("fast", FTDP_FN, min(MAX_TDP, int(steady * 35 / 25)))
                 time.sleep(TDP_DELAY)
-                set_tdp("slow", STDP_FN, min(MAX_TDP, int(steady * 43 / 30)))
+                set_tdp("slow", STDP_FN, min(MAX_TDP, int(steady * 30 / 25)))
                 time.sleep(TDP_DELAY)
                 set_tdp("steady", CTDP_FN, steady)
             else:

{adjustor-3.1.1 → adjustor-3.1.3/src/adjustor.egg-info}/PKG-INFO

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