dualsense-ts 2.0.13 → 2.1.30

package/src/elements/index.ts

@@ -7,9 +7,11 @@ export * from "./analog";
 export * from "./axis";
 export * from "./dpad";
 export * from "./gyroscope";
+export * from "./increment";
 export * from "./momentary";
 export * from "./motion";
 export * from "./mute";
+export * from "./touch";
 export * from "./touchpad";
 export * from "./trigger";
 export * from "./unisense";

package/src/elements/touch.ts

@@ -0,0 +1,16 @@
+import { Analog } from "./analog";
+import { Increment } from "./increment";
+
+/**
+ * Represents a touchpad touch, treated like an analog joystick input
+ * with [0,0] representing the center of the touchpad.
+ */
+export class Touch extends Analog {
+  public readonly state: Touch = this;
+  public readonly contact = this.button;
+  public readonly tracker: Increment = new Increment();
+
+  public get active(): boolean {
+    return this.contact.active;
+  }
+}

package/src/elements/touchpad.ts

@@ -1,39 +1,25 @@
-import { Axis } from "./axis";
 import { Momentary } from "./momentary";
+import { Touch } from "./touch";
 import { Input, InputParams } from "../input";
 
 export class Touchpad extends Input<Touchpad> {
   public readonly state: Touchpad = this;
 
   public get active(): boolean {
-    return (
-      this.x1.active ||
-      this.y1.active ||
-      this.x2.active ||
-      this.y2.active ||
-      this.button.active
-    );
+    return this.left.contact.active;
   }
 
-  public readonly x1;
-  public readonly y1;
-  public readonly x2;
-  public readonly y2;
-  public readonly button;
+  public readonly button: Momentary;
+
+  // Left is the default touch, outside multi-touch
+  public readonly left: Touch;
+  public readonly right: Touch;
 
   constructor(params: InputParams) {
     super(params);
 
     this.button = new Momentary({ icon: "[__]" });
-
-    this.x1 = new Axis({ icon: "[X1]" });
-
-    this.y1 = new Axis({ icon: "[Y1]" });
-
-    this.x2 = new Axis({ icon: "[X2]" });
-
-    this.y2 = new Axis({ icon: "[Y2]" });
+    this.left = new Touch();
+    this.right = new Touch();
   }
-
-  public readonly direction: number = 0;
 }

package/src/elements/unisense.ts

@@ -26,13 +26,15 @@ export class Unisense extends Input<Unisense> {
       params?.trigger || {
         icon: "2",
         name: "Trigger",
-        threshold: (1 / 255) * 6,
+        threshold: (1 / 255) * 3,
       }
     );
     this.bumper = new Momentary(
       params?.bumper || { icon: "1", name: "Bumper" }
     );
-    this.analog = new Analog(params?.analog || { icon: "⨁", name: "Analog" });
+    this.analog = new Analog(
+      params?.analog || { icon: "⨁", name: "Analog", threshold: (1 / 128) * 3 }
+    );
     this.haptic = new Haptic();
   }
 

package/src/hid/dualsense_hid.ts

@@ -47,9 +47,9 @@ export interface DualsenseHIDState {
   [InputId.AccelZ]: number;
 }
 
-// Maps a HID input of 0...255 to -1...1
-export function mapAxis(value: number): number {
-  return (2 / 255) * Math.max(0, Math.min(255, value)) - 1;
+// Maps a HID input of 0...n to -1...1
+export function mapAxis(value: number, max: number = 255): number {
+  return (2 / max) * Math.max(0, Math.min(max, value)) - 1;
 }
 
 // Maps a HID input of 0...255 to 0...1
@@ -163,12 +163,18 @@ export class DualsenseHID extends EventEmitter {
     // 1 reserved byte
     state[InputId.TouchId0] = report.readUint8(32) & 0x7f;
     state[InputId.TouchContact0] = (report.readUint8(32) & 0x80) === 0;
-    state[InputId.TouchX0] = (report.readUint16LE(33) << 20) >> 20;
-    state[InputId.TouchY0] = report.readUint16LE(34) >> 4;
+    state[InputId.TouchX0] = mapAxis(
+      (report.readUint16LE(33) << 20) >> 20,
+      1920
+    );
+    state[InputId.TouchY0] = mapAxis(report.readUint16LE(34) >> 4, 1080);
     state[InputId.TouchId1] = report.readUint8(36) & 0x7f;
     state[InputId.TouchContact1] = (report.readUint8(36) & 0x80) === 0;
-    state[InputId.TouchX1] = (report.readUint16LE(37) << 20) >> 20;
-    state[InputId.TouchY1] = report.readUint16LE(38) >> 4;
+    state[InputId.TouchX1] = mapAxis(
+      (report.readUint16LE(37) << 20) >> 20,
+      1920
+    );
+    state[InputId.TouchY1] = mapAxis(report.readUint16LE(38) >> 4, 1080);
     // 12 reserved bytes
     state[InputId.Status] = (report.readUint8(53) & 4) > 0;
 

package/src/input.ts

@@ -75,9 +75,11 @@ export abstract class Input<Type>
   /**
    * Resolves on the next change to this input's state.
    */
-  public next(): Promise<IteratorResult<this>> {
+  public next(
+    type: "press" | "release" | "change" = "change"
+  ): Promise<IteratorResult<this>> {
     return new Promise<IteratorResult<this>>((resolve) => {
-      this.once("change", () => {
+      this.once(type, () => {
         resolve({ value: this, done: false });
       });
     });
@@ -86,9 +88,11 @@ export abstract class Input<Type>
   /**
    * Resolves on the next change to this input's state.
    */
-  public promise(): Promise<this> {
+  public promise(
+    type: "press" | "release" | "change" = "change"
+  ): Promise<this> {
     return new Promise<this>((resolve) => {
-      this.once("change", () => resolve(this));
+      this.once(type, () => resolve(this));
     });
   }