adjustor 3.6.1__tar.gz → 3.6.3__tar.gz

{adjustor-3.6.1/src/adjustor.egg-info → adjustor-3.6.3}/PKG-INFO

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

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

{adjustor-3.6.1 → adjustor-3.6.3}/src/adjustor/core/const.py

@@ -93,6 +93,17 @@ DEV_PARAMS_25W: dict[str, DeviceParams] = {
     # Temp
     "temp_target": D(60, 70, 85, 90, 100),
 }
+DEV_PARAMS_28W: dict[str, DeviceParams] = {
+    "stapm_limit": D(0, 4, 15, 28, 32),
+    "skin_limit": D(0, 4, 15, 28, 32),
+    "slow_limit": D(0, 4, 20, 30, 35),
+    "fast_limit": D(0, 4, 25, 32, 37),
+    # Times
+    "slow_time": D(5, 5, 10, 10, 10),
+    "stapm_time": D(100, 100, 100, 200, 200),
+    # Temp
+    "temp_target": D(60, 70, 85, 90, 100),
+}
 
 DEV_PARAMS_5000: dict[str, DeviceParams] = DEV_PARAMS_25W
 DEV_PARAMS_6000: dict[str, DeviceParams] = DEV_PARAMS_30W
@@ -106,6 +117,12 @@ DEV_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams], bool]]
     "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),
+    "ONEXPLAYER F1 EVA-02": (DEV_PARAMS_HX370, ALIB_PARAMS_HX370, False),
+    # GPD Devices are 28W max
+    "G1618-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
+    "G1617-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
+    "G1619-04": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
+    "G1619-05": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
 }
 
 CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {

{adjustor-3.6.1 → adjustor-3.6.3}/src/adjustor/core/fan/core.py

@@ -99,9 +99,12 @@ def calculate_fan_speed(
 
 
 def set_fans_to_pwm(enable: bool, fan_info: FanInfo):
-    for _, fn_enable, _ in fan_info["fans"]:
+    for _, fn_enable, _, legacy in fan_info["fans"]:
         with open(fn_enable, "w") as f:
-            f.write("1" if enable else "0")
+            if enable:
+                f.write("1")
+            else:
+                f.write("0" if legacy else "2")
 
 
 def update_fan_speed(
@@ -121,10 +124,10 @@ def update_fan_speed(
     v_curr_int = min(255, max(0, int(v_curr * 255)))
     if not observe_only:
         if state is None or state["v_target_pwm"] != v_curr_int:
-            for v_fn, _, _ in fan_info["fans"]:
+            for v_fn, _, _, _ in fan_info["fans"]:
                 write_fan_speed(v_fn, v_curr_int)
 
-    fan_speeds = [read_fan_speed(rpm_fn) for _, _, rpm_fn in fan_info["fans"] if rpm_fn]
+    fan_speeds = [read_fan_speed(rpm_fn) for _, _, rpm_fn, _ in fan_info["fans"] if rpm_fn]
     return (
         in_setpoint,
         {
@@ -153,7 +156,7 @@ def fan_worker(
         set_fans_to_pwm(True, info)
         while not should_exit.is_set():
             with lock:
-                state_tmp = state or None # First time state will be empty
+                state_tmp = state or None  # First time state will be empty
                 in_setpoint, state_tmp = update_fan_speed(
                     state_tmp, info, fan_curve, junction.is_set()
                 )

{adjustor-3.6.1 → adjustor-3.6.3}/src/adjustor/core/fan/utils.py

@@ -1,6 +1,7 @@
 import os
 
-FAN_HWMONS = ["oxpec"]
+FAN_HWMONS_LEGACY = ["oxpec"]
+FAN_HWMONS = ["oxp_ec"]
 HWMON_DIR = "/sys/class/hwmon"
 
 
@@ -53,7 +54,7 @@ def find_fans():
         with open(f"{HWMON_DIR}/{hwmon}/name") as f:
             name = f.read().strip()
 
-        if name not in FAN_HWMONS:
+        if name not in FAN_HWMONS and name not in FAN_HWMONS_LEGACY:
             continue
 
         for fn in os.listdir(f"{HWMON_DIR}/{hwmon}"):
@@ -73,6 +74,7 @@ def find_fans():
                         f"{HWMON_DIR}/{hwmon}/{fn}",
                         f"{HWMON_DIR}/{hwmon}/{fn}_enable",
                         speed_fn,
+                        name in FAN_HWMONS_LEGACY,
                     )
                 )
 
@@ -88,6 +90,7 @@ def read_fan_speed(path: str) -> int:
     with open(path, "r") as f:
         return int(f.read())
 
+
 def write_fan_speed(path: str, speed: int):
     with open(path, "w") as f:
-        f.write(str(speed))
+        f.write(str(speed))

{adjustor-3.6.1 → adjustor-3.6.3/src/adjustor.egg-info}/PKG-INFO

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