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

Move waitForKbootIdle() to uhk.js

Browse Source
This commit is contained in:
László Monda
2018-01-31 02:25:37 +01:00
parent 933a715ea5
commit 9589398834
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/usb/uhk.js
View File

@@ -204,6 +204,35 @@ async function jumpToModuleBootloader(device, moduleSlotId) {
await uhk.writeDevice(device, [uhk.usbCommands.jumpToModuleBootloader, moduleSlotId]);
};
async function waitForKbootIdle(device) {
const intervalMs = 100;
const pingMessageInterval = 500;
let timeoutMs = 10000;
return new Promise((resolve, reject) => {
const intervalId = setInterval(async function() {
const response = await uhk.writeDevice(device, [uhk.usbCommands.getDeviceProperty, uhk.devicePropertyIds.currentKbootCommand]);
const currentKbootCommand = response[1];
if (currentKbootCommand == 0) {
console.log('Bootloader pinged.');
resolve();
clearInterval(intervalId);
return;
} else if (timeoutMs % pingMessageInterval === 0) {
console.log("Cannot ping the bootloader. Please reconnect the left keyboard half. It probably needs several tries, so keep reconnecting until you see this message.");
};
timeoutMs -= intervalMs;
if (timeoutMs < 0) {
reject();
clearInterval(intervalId);
return;
}
}, intervalMs);
});
}
uhk = exports = module.exports = moduleExports = {
bufferToString,
getUint16,
@@ -221,6 +250,7 @@ uhk = exports = module.exports = moduleExports = {
reenumerate,
sendKbootCommandToModule,
jumpToModuleBootloader,
waitForKbootIdle,
usbCommands: {
getDeviceProperty : 0x00,
reenumerate : 0x01,

32
packages/usb/wait-for-kboot-idle.js
View File

@@ -1,37 +1,7 @@
#!/usr/bin/env node
const uhk = require('./uhk');
let intervalMs = 100;
let pingMessageInterval = 500;
async function waitForKbootIdle(device) {
let timeoutMs = 10000;
return new Promise((resolve, reject) => {
const intervalId = setInterval(async function() {
const response = await uhk.writeDevice(device, [uhk.usbCommands.getDeviceProperty, uhk.devicePropertyIds.currentKbootCommand]);
const currentKbootCommand = response[1];
if (currentKbootCommand == 0) {
console.log('Bootloader pinged.');
resolve();
clearInterval(intervalId);
return;
} else if (timeoutMs % pingMessageInterval === 0) {
console.log("Cannot ping the bootloader. Please reconnect the left keyboard half. It probably needs several tries, so keep reconnecting until you see this message.");
};
timeoutMs -= intervalMs;
if (timeoutMs < 0) {
reject();
clearInterval(intervalId);
return;
}
}, intervalMs);
});
}
const device = uhk.getUhkDevice();
(async function() {
await waitForKbootIdle(device);
await uhk.waitForKbootIdle(device);
})();