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

feat(device): Wait for read user/hardware config until device is ready (#443)

Browse Source 
* feat(device): Wait for read user/hardware config until device is ready

* ci: remove uhk-web test runners until not I will fix the chome on mac
This commit is contained in:
Róbert Kiss
2017-10-14 00:55:16 +02:00
committed by László Monda
parent 235034bc68
commit 01b07a3ab7
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -50,7 +50,7 @@
}, },
"scripts": { "scripts": {
"postinstall": "lerna bootstrap", "postinstall": "lerna bootstrap",
"test":"run-p -sn test:test-serializer test:uhk-common test:uhk-web", "test":"run-p -sn test:test-serializer test:uhk-common",
"test:test-serializer": "lerna exec --scope test-serializer npm test", "test:test-serializer": "lerna exec --scope test-serializer npm test",
"test:uhk-common": "lerna exec --scope uhk-common npm test", "test:uhk-common": "lerna exec --scope uhk-common npm test",
"test:uhk-web": "lerna exec --scope uhk-web npm test", "test:uhk-web": "lerna exec --scope uhk-web npm test",

1
packages/uhk-agent/src/services/device.service.ts
View File

@@ -46,6 +46,7 @@ export class DeviceService {
*/ */
public async loadConfigurations(event: Electron.Event): Promise<void> { public async loadConfigurations(event: Electron.Event): Promise<void> {
try { try {
await this.device.waitUntilKeyboardBusy();
const userConfiguration = await this.loadConfiguration( const userConfiguration = await this.loadConfiguration(
SystemPropertyIds.MaxUserConfigSize, SystemPropertyIds.MaxUserConfigSize,
UsbCommand.ReadUserConfig, UsbCommand.ReadUserConfig,

2
packages/uhk-usb/src/uhk-hid-device.ts
View File

@@ -165,7 +165,7 @@ export class UhkHidDevice {
this._device = null; this._device = null;
} }
private async waitUntilKeyboardBusy(): Promise<void> { public async waitUntilKeyboardBusy(): Promise<void> {
while (true) { while (true) {
const buffer = await this.write(new Buffer([UsbCommand.GetKeyboardState])); const buffer = await this.write(new Buffer([UsbCommand.GetKeyboardState]));
if (buffer[1] === 0) { if (buffer[1] === 0) {