fix: not getting key/wheel events when wireless

Julusian · Nov 19, 2021 · 64fbb01 · 64fbb01
1 parent ce1c721
commit 64fbb01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/core/src/device.ts b/packages/core/src/device.ts
@@ -21,12 +21,12 @@ export class XencelabsQuickKeysDevice extends EventEmitter<XencelabsQuickKeysEve
 	public static async create(device: HIDDevice): Promise<XencelabsQuickKeysDevice> {
 		const wrappedDevice = new XencelabsQuickKeysDevice(device)
 
-		// Ask the device to stream presses
-		await wrappedDevice.subscribeToKeyEvents()
-
 		// Now setup the hid events
 		wrappedDevice.subscribeToHIDEvents()
 
+		// Ask the device to stream presses
+		await wrappedDevice.subscribeToKeyEvents()
+
 		return wrappedDevice
 	}
 
@@ -77,6 +77,8 @@ export class XencelabsQuickKeysDevice extends EventEmitter<XencelabsQuickKeysEve
 		buffer.writeUInt8(0xb0, 1)
 		buffer.writeUInt8(0x04, 2)
 
+		this.insertHeader(buffer)
+
 		return this.device.sendReports([buffer])
 	}
 

diff --git a/packages/webhid/src/device.ts b/packages/webhid/src/device.ts
@@ -34,7 +34,7 @@ export class WebHIDDevice extends EventEmitter implements CoreHIDDevice {
 		return Buffer.from(view.buffer)
 	}
 	public async sendReports(buffers: Buffer[]): Promise<void> {
-		return this.reportQueue.add(async () => {
+		await this.reportQueue.add(async () => {
 			for (const data of buffers) {
 				await this.device.sendReport(data[0], new Uint8Array(data.slice(1)))
 			}