diff --git a/package-lock.json b/package-lock.json index edf7400a..f4cdfce3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uhk-agent", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/uhk-usb/package-lock.json b/packages/uhk-usb/package-lock.json index 3afb5622..9d364cab 100644 --- a/packages/uhk-usb/package-lock.json +++ b/packages/uhk-usb/package-lock.json @@ -1,14 +1,11 @@ { - "name": "uhk-usb", - "version": "1.0.0", - "lockfileVersion": 1, "requires": true, + "lockfileVersion": 1, "dependencies": { "@types/node": { "version": "8.0.28", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.28.tgz", - "integrity": "sha512-HupkFXEv3O3KSzcr3Ylfajg0kaerBg1DyaZzRBBQfrU3NN1mTBRE7sCveqHwXLS5Yrjvww8qFzkzYQQakG9FuQ==", - "dev": true + "integrity": "sha512-HupkFXEv3O3KSzcr3Ylfajg0kaerBg1DyaZzRBBQfrU3NN1mTBRE7sCveqHwXLS5Yrjvww8qFzkzYQQakG9FuQ==" }, "ansi-regex": { "version": "2.1.1", diff --git a/packages/uhk-usb/src/uhk-hid-device.ts b/packages/uhk-usb/src/uhk-hid-device.ts index 4ad36f36..b9191f48 100644 --- a/packages/uhk-usb/src/uhk-hid-device.ts +++ b/packages/uhk-usb/src/uhk-hid-device.ts @@ -1,4 +1,4 @@ -import { cloneDeep, isEqual } from 'lodash-es'; +import { cloneDeep, isEqual } from 'lodash'; import { Device, devices, HID } from 'node-hid'; import { CommandLineArgs, LogService } from 'uhk-common'; diff --git a/packages/usb/reenumerate.js b/packages/usb/reenumerate.js index 10fc61df..52fe5726 100755 --- a/packages/usb/reenumerate.js +++ b/packages/usb/reenumerate.js @@ -2,9 +2,12 @@ const uhk = require('./uhk'); const program = require('commander'); -program.parse(process.argv); +program + .option('-t, --timeout ', 'Bootloader timeout in ms', 5000) + .parse(process.argv); + const enumerationMode = program.args[0]; (async function() { - await uhk.reenumerate(enumerationMode); + await uhk.reenumerate(enumerationMode, program.timeout); })(); diff --git a/packages/usb/uhk.js b/packages/usb/uhk.js index f19bb891..227636dc 100644 --- a/packages/usb/uhk.js +++ b/packages/usb/uhk.js @@ -191,8 +191,7 @@ async function updateDeviceFirmware(firmwareImage, extension) { // USB commands -function reenumerate(enumerationMode) { - const bootloaderTimeoutMs = 5000; +function reenumerate(enumerationMode, bootloaderTimeoutMs=5000) { const pollingIntervalMs = 100; let pollingTimeoutMs = 10000;