uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: support more mouse buttons (#936)

Browse Source 
* feat: support more mouse buttons (#834)

* Remove unused style.

* Retrigger CI

* fix: more button click and texts

* fix: the mouse button 4-8 naming

* feat: allow extra mouse buttons if userConfig version >= 4.1.1

* fix: version comparison

* fix: read correctly the right module informations
This commit is contained in:
dgyimesi
2019-08-23 22:00:01 +02:00
committed by László Monda
parent fae83a4148
commit 49d31f90f7
13 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/uhk-usb/src/uhk-operations.ts
View File

@@ -1,4 +1,4 @@
import { HardwareModuleInfo, LogService, UhkBuffer } from 'uhk-common';
import { LeftModuleInfo, LogService, RightModuleInfo, UhkBuffer } from 'uhk-common';
import { DataOption, KBoot, Properties, UsbPeripheral } from 'kboot';
import {
@@ -248,7 +248,7 @@ export class UhkOperations {
return false;
}
public async getLeftModuleVersionInfo(): Promise<HardwareModuleInfo> {
public async getLeftModuleVersionInfo(): Promise<LeftModuleInfo> {
try {
this.logService.debug('[DeviceOperation] USB[T]: Read left module version information');
@@ -277,7 +277,7 @@ export class UhkOperations {
};
}
public async getRightModuleVersionInfo(): Promise<HardwareModuleInfo> {
public async getRightModuleVersionInfo(): Promise<RightModuleInfo> {
this.logService.debug('[DeviceOperation] USB[T]: Read right module version information');
const command = Buffer.from([UsbCommand.GetProperty, DevicePropertyIds.ProtocolVersions]);
@@ -287,7 +287,11 @@ export class UhkOperations {
uhkBuffer.readUInt8();
return {
firmwareVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`
firmwareVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
deviceProtocolVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
moduleProtocolVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
userConfigVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
hardwareConfigVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`
};
}