add touchpad emulation alpha for the go s

Author: antheas

src/hhd/controller/virtual/sd/__init__.py

@@ -3,7 +3,11 @@
 from collections import defaultdict
 from typing import Sequence, cast
 
-from hhd.controller import Consumer, Event, Producer
+from hhd.controller import (
+    Consumer,
+    Event,
+    Producer,
+)
 from hhd.controller.lib.uhid import UhidDevice, BUS_USB
 from hhd.controller.lib.common import encode_axis, set_button
 from hhd.controller.lib.ccache import ControllerCache
@@ -100,6 +104,7 @@ def open(self) -> Sequence[int]:
         self.state: dict = defaultdict(lambda: 0)
         self.rumble = False
         self.touchpad_touch = False
+        self.touchpad_left = False
         curr = time.perf_counter()
         self.start = curr
         self.touchpad_down = curr
@@ -229,7 +234,7 @@ def produce(self, fds: Sequence[int]) -> Sequence[Event]:
                                     "weak_magnitude": right / (2**16 - 1),
                                 }
                             )
-                        case 0x8f:
+                        case 0x8F:
                             pass
                         case _:
                             logger.info(
@@ -270,57 +275,42 @@ def consume(self, events: Sequence[Event]):
                             logger.warning(
                                 f"Encoding '{ev['code']}' with {ev['value']} overflowed."
                             )
-                    # DPAD is weird
                     match code:
-                        case "hat_x":
-                            self.state["hat_x"] = ev["value"]
-                            # patch_dpad_val(
-                            #     new_rep,
-                            #     self.ofs,
-                            #     self.state["hat_x"],
-                            #     self.state["hat_y"],
-                            # )
-                        case "hat_y":
-                            self.state["hat_y"] = ev["value"]
-                            # patch_dpad_val(
-                            #     new_rep,
-                            #     self.ofs,
-                            #     self.state["hat_x"],
-                            #     self.state["hat_y"],
-                            # )
                         case "gyro_ts" | "accel_ts" | "imu_ts":
                             send = True
                             self.last_imu = time.perf_counter()
                             self.last_imu_ts = ev["value"]
-                            # new_rep[self.ofs + 27 : self.ofs + 31] = int(
-                            #     ev["value"] / DS5_EDGE_DELTA_TIME_NS
-                            # ).to_bytes(8, byteorder="little", signed=False)[:4]
                 case "button":
-                    if code in SD_BTN_MAP:
+                    if not self.enable_touchpad and code.startswith("touchpad"):
+                        continue
+                    if code == "touchpad_touch":
+                        self.touchpad_touch = ev["value"]
+                        if not self.touchpad_left:
+                            set_button(
+                                new_rep,
+                                SD_BTN_MAP["touchpad_touch"],
+                                ev["value"] or self.touchpad_touch,
+                            )
+                    elif code == "touchpad_left":
+                        set_button(
+                            new_rep,
+                            SD_BTN_MAP["touchpad_touch"],
+                            ev["value"] or self.touchpad_touch,
+                        )
+                        set_button(
+                            new_rep,
+                            SD_BTN_MAP["touchpad_left"],
+                            ev["value"],
+                        )
+                        encode_axis(
+                            new_rep,
+                            SD_AXIS_MAP["touchpad_force"],
+                            ev["value"],
+                        )
+                        self.touchpad_left = ev["value"]
+                    elif code in SD_BTN_MAP:
                         set_button(new_rep, SD_BTN_MAP[code], ev["value"])
 
-                    # # Fix touchpad click requiring touch
-                    # if code == "touchpad_touch":
-                    #     self.touchpad_touch = ev["value"]
-                    # if code == "touchpad_left":
-                    #     set_button(
-                    #         new_rep,
-                    #         SD_BTN_MAP["touchpad_touch"],
-                    #         ev["value"] or self.touchpad_touch,
-                    #     )
-                    # # Also add right click
-                    # if code == "touchpad_right":
-                    #     set_button(
-                    #         new_rep,
-                    #         SD_BTN_MAP["touchpad_touch"],
-                    #         ev["value"] or self.touchpad_touch,
-                    #     )
-                    #     set_button(
-                    #         new_rep,
-                    #         SD_BTN_MAP["touchpad_touch2"],
-                    #         ev["value"],
-                    #     )
-
         # If the IMU breaks, smoothly re-enable the controller
         failover = self.last_imu + MAX_IMU_SYNC_DELAY < curr
         if self.sync_gyro and failover and not self.imu_failed:

src/hhd/controller/virtual/sd/const.py

@@ -48,6 +48,9 @@
 )
 
 SD_AXIS_MAP = {
+    "touchpad_x": AM((20 << 3), "u16", scale=2**14 - 2, offset=2**14),
+    "touchpad_y": AM((22 << 3), "u16", scale=2**14 - 2, offset=2**14),
+    "touchpad_force": AM((58 << 3), "u16", scale=2**14 - 2),
     "accel_x": AM((24 << 3), "i16", scale=1600, bounds=(-(2**15) + 2, 2**15 - 1)),
     "accel_y": AM((26 << 3), "i16", scale=-1600, bounds=(-(2**15) + 2, 2**15 - 1)),
     "accel_z": AM((28 << 3), "i16", scale=1600, bounds=(-(2**15) + 2, 2**15 - 1)),
@@ -89,6 +92,8 @@
     "dpad_right": BM((9 << 3) + 6),
     "dpad_up": BM((9 << 3) + 7),
     "ls": BM((10 << 3) + 1),
+    "touchpad_touch": BM((10 << 3) + 3),
+    "touchpad_left": BM((10 << 3) + 5),
     "extra_r2": BM((10 << 3) + 7),
     "rs": BM((11 << 3) + 5),
     "extra_r1": BM((13 << 3) + 5),

src/hhd/device/legion_go/slim/base.py

@@ -227,7 +227,7 @@ def controller_loop_xinput(
     debug = DEBUG_MODE
 
     # Output
-    touchpad_enable = "disabled"  # conf.get("touchpad", "disabled")
+    touchpad_enable = conf.get("touchpad", "disabled")
     d_producers, d_outs, d_params = get_outputs(
         conf["xinput"],
         None,

src/hhd/device/legion_go/slim/controller.yml

@@ -57,17 +57,17 @@ children:
         hint: >-
           SteamOS style mapping.
 
-  # touchpad:
-  #   type: multiple
-  #   title: Touchpad Emulation
-  #   default: disabled
-  #   tags: [ non-essential, ordinal ]
-  #   hint: >-
-  #     Passthrough the touchpad to the controller (Dualsense only).
-  #   options:
-  #     disabled: Disabled
-  #     gamemode: Gamemode
-  #     always: Always
+  touchpad:
+    type: multiple
+    title: Touchpad Emulation [ALPHA]
+    default: disabled
+    tags: [ non-essential, ordinal ]
+    hint: >-
+      Passthrough the touchpad to the controller.
+    options:
+      disabled: Disabled
+      gamemode: Gamemode
+      always: Always
 
   freq:
     type: multiple

src/hhd/plugins/outputs.py

@@ -128,9 +128,11 @@ def get_outputs(
         case "sd":
             UInputDevice.close_cached()
             Dualsense.close_cached()
+            uses_touch = touchpad == "controller" and steam_check is not False
             d = SteamdeckController(
                 name="Steam Controller (HHD)",
                 pid=0x12FF,
+                touchpad=uses_touch
             )
             producers.append(d)
             consumers.append(d)