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

fix: permission detection on win and mac (#650)

Browse Source
This commit is contained in:
Róbert Kiss
2018-05-21 11:00:57 +02:00
committed by László Monda
parent a6678bd537
commit 609aba856a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/uhk-usb/src/uhk-hid-device.ts
+9 -5
View File
@@ -50,10 +50,14 @@ export class UhkHidDevice {
return true; return true;
} }
const devs = devices(); if (process.platform === 'linux') {
const devs = devices();
this._hasPermission = devs.some((x: Device) => x.vendorId === Constants.VENDOR_ID && this._hasPermission = devs.some((x: Device) => x.vendorId === Constants.VENDOR_ID &&
(x.productId === Constants.PRODUCT_ID || x.productId === Constants.BOOTLOADER_ID)); (x.productId === Constants.PRODUCT_ID || x.productId === Constants.BOOTLOADER_ID));
} else {
this._hasPermission = true;
}
return this._hasPermission; return this._hasPermission;
} catch (err) { } catch (err) {
@@ -255,8 +259,8 @@ export class UhkHidDevice {
x.productId === Constants.PRODUCT_ID && x.productId === Constants.PRODUCT_ID &&
// hidapi can not read the interface number on Mac, so check the usage page and usage // hidapi can not read the interface number on Mac, so check the usage page and usage
((x.usagePage === 128 && x.usage === 129) || // Old firmware ((x.usagePage === 128 && x.usage === 129) || // Old firmware
(x.usagePage === (0xFF00 | 0x00) && x.usage === 0x01) || // New firmware (x.usagePage === (0xFF00 | 0x00) && x.usage === 0x01) || // New firmware
x.interface === 0)); x.interface === 0));
if (!dev) { if (!dev) {
this.logService.debug('[UhkHidDevice] UHK Device not found:'); this.logService.debug('[UhkHidDevice] UHK Device not found:');