update gpd win 4 gyro matrix

Author: antheas

src/hhd/device/gpd/win/__init__.py

@@ -12,31 +12,35 @@
 )
 from hhd.plugins.settings import HHDSettings
 
-GPD_WMIS = {
-    "G1618-04": "GPD Win 4",
-    "G1617-01": "GPD Win Mini",
-    "G1619-05": "GPD Win Max 2 2023",
+from .const import GPD_WIN_MAX_2_2023_MAPPINGS
+
+GPD_CONFS = {
+    "G1618-04": {"name": "GPD Win 4", "hrtimer": True},
+    "G1617-01": {"name": "GPD Win Mini", "touchpad": True},
+    "G1619-05": {
+        "name": "GPD Win Max 2 2023",
+        "hrtimer": True,
+        "touchpad": True,
+        "mapping": GPD_WIN_MAX_2_2023_MAPPINGS,
+    },
 }
 
-GPD_CONFS = {"G1619-05": {"hrtimer": True}, "G1618-04": {"hrtimer": True}}
-
-GPD_TOUCHPAD = ["G1617-01", "G1619-05"]
-
 
 class GpdWinControllersPlugin(HHDPlugin):
     name = "gpd_win_controllers"
     priority = 18
     log = "gpdw"
 
-    def __init__(self, dmi: str, name: str) -> None:
+    def __init__(self, dmi: str, dconf: dict) -> None:
         self.t = None
         self.should_exit = None
         self.updated = Event()
         self.started = False
         self.t = None
 
         self.dmi = dmi
-        self.name = f"gpd_win_controllers@'{name}'"
+        self.dconf = dconf
+        self.name = f"gpd_win_controllers@'{dconf.get('name', 'ukn')}'"
 
     def open(
         self,
@@ -53,7 +57,7 @@ def settings(self) -> HHDSettings:
             get_outputs_config(can_disable=False, has_leds=False)
         )
 
-        if self.dmi in GPD_TOUCHPAD:
+        if self.dconf.get("touchpad", False):
             base["controllers"]["gpd_win"]["children"][
                 "touchpad"
             ] = get_touchpad_config()
@@ -91,7 +95,7 @@ def start(self, conf):
                 self.context,
                 self.should_exit,
                 self.updated,
-                GPD_CONFS.get(self.dmi, {}),
+                self.dconf,
             ),
         )
         self.t.start()
@@ -112,8 +116,8 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     # Match just product number, should be enough for now
     with open("/sys/devices/virtual/dmi/id/product_name") as f:
         dmi = f.read().strip()
-        name = GPD_WMIS.get(dmi)
-        if not name:
+        dconf = GPD_CONFS.get(dmi, None)
+        if not dconf:
             return []
 
-    return [GpdWinControllersPlugin(dmi, name)]
+    return [GpdWinControllersPlugin(dmi, dconf)]

src/hhd/device/gpd/win/base.py

@@ -15,7 +15,11 @@
 from hhd.controller.physical.imu import CombinedImu, HrtimerTrigger
 from hhd.plugins import Config, Context, Emitter, get_outputs
 
-from .const import GPD_TOUCHPAD_AXIS_MAP, GPD_TOUCHPAD_BUTTON_MAP
+from .const import (
+    GPD_TOUCHPAD_AXIS_MAP,
+    GPD_TOUCHPAD_BUTTON_MAP,
+    GPD_WIN_DEFAULT_MAPPINGS,
+)
 
 ERROR_DELAY = 1
 SELECT_TIMEOUT = 1
@@ -32,16 +36,6 @@
 TOUCHPAD_VID_2 = 0x0911
 TOUCHPAD_PID_2 = 0x5288
 
-GPD_WIN_MAPPINGS: dict[str, tuple[Axis, str | None, float, float | None]] = {
-    "accel_x": ("accel_z", "accel", 1, 3),
-    "accel_y": ("accel_x", "accel", 1, 3),
-    "accel_z": ("accel_y", "accel", 1, 3),
-    "anglvel_x": ("gyro_x", "anglvel", 1, None),
-    "anglvel_y": ("gyro_z", "anglvel", -1, None),
-    "anglvel_z": ("gyro_y", "anglvel", -1, None),
-    "timestamp": ("gyro_ts", None, 1, None),
-}
-
 BACK_BUTTON_DELAY = 0.1
 
 # /dev/input/event17 Microsoft X-Box 360 pad usb-0000:73:00.3-4.1/input0
@@ -174,7 +168,7 @@ def plugin_run(
         if not found_gamepad:
             time.sleep(ERROR_DELAY)
             if first:
-                logger.warning("Controller in Mouse mode. Waiting...")
+                logger.info("Controller in Mouse mode. Waiting...")
             first = False
             continue
 
@@ -206,7 +200,11 @@ def controller_loop(conf: Config, should_exit: TEvent, updated: TEvent, dconf: d
     )
 
     # Imu
-    d_imu = CombinedImu(conf["imu_hz"].to(int), GPD_WIN_MAPPINGS, gyro_scale="0.000266")
+    d_imu = CombinedImu(
+        conf["imu_hz"].to(int),
+        dconf.get("mapping", GPD_WIN_DEFAULT_MAPPINGS),
+        # gyro_scale="0.000266", #TODO: Find what this affects
+    )
     d_timer = HrtimerTrigger(conf["imu_hz"].to(int), [HrtimerTrigger.IMU_NAMES])
 
     # Inputs

src/hhd/device/gpd/win/const.py

@@ -15,3 +15,23 @@
         "touchpad_y": [B("ABS_Y")],  # also ABS_MT_POSITION_Y
     }
 )
+
+GPD_WIN_DEFAULT_MAPPINGS: dict[str, tuple[Axis, str | None, float, float | None]] = {
+    "accel_x": ("accel_z", "accel", 1, 3),
+    "accel_y": ("accel_x", "accel", 1, 3),
+    "accel_z": ("accel_y", "accel", 1, 3),
+    "anglvel_x": ("gyro_x", "anglvel", 1, None),
+    "anglvel_y": ("gyro_z", "anglvel", -1, None),
+    "anglvel_z": ("gyro_y", "anglvel", -1, None),
+    "timestamp": ("gyro_ts", None, 1, None),
+}
+
+GPD_WIN_MAX_2_2023_MAPPINGS: dict[str, tuple[Axis, str | None, float, float | None]] = {
+    "accel_x": ("accel_z", "accel", 1, 3),
+    "accel_y": ("accel_x", "accel", 1, 3),
+    "accel_z": ("accel_y", "accel", 1, 3),
+    "anglvel_x": ("gyro_z", "anglvel", 1, None),
+    "anglvel_y": ("gyro_x", "anglvel", -1, None),
+    "anglvel_z": ("gyro_y", "anglvel", -1, None),
+    "timestamp": ("gyro_ts", None, 1, None),
+}

src/hhd/device/rog_ally/hid.py

@@ -173,7 +173,6 @@ def __call__(self, dev: Device, events: Sequence[Event]):
             ]
 
         for r in cmds:
-            logger.warning(r.hex())
             dev.write(r)