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

Make getDeviceState await. Dump transfer descriptions before the actual transfers when the debug mode is on.

Browse Source
This commit is contained in:
László Monda
2018-04-02 21:35:47 +02:00
parent b26fecfc7a
commit 9fcce9234a
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/usb/uhk.js
View File

@@ -213,20 +213,24 @@ function reenumerate(enumerationMode) {
}; };
async function sendKbootCommandToModule(device, kbootCommandId, i2cAddress) { async function sendKbootCommandToModule(device, kbootCommandId, i2cAddress) {
writeLog(`T: sendKbootCommandToModule kbootCommandId:${kbootCommandId} i2cAddress:${i2cAddress}`);
return await uhk.writeDevice(device, [uhk.usbCommands.sendKbootCommandToModule, kbootCommandId, parseInt(i2cAddress)]) return await uhk.writeDevice(device, [uhk.usbCommands.sendKbootCommandToModule, kbootCommandId, parseInt(i2cAddress)])
}; };
async function jumpToModuleBootloader(device, moduleSlotId) { async function jumpToModuleBootloader(device, moduleSlotId) {
writeLog(`T: jumpToModuleBootloader moduleSlotId:${moduleSlotId}`);
await uhk.writeDevice(device, [uhk.usbCommands.jumpToModuleBootloader, moduleSlotId]); await uhk.writeDevice(device, [uhk.usbCommands.jumpToModuleBootloader, moduleSlotId]);
}; };
async function switchKeymap(device, keymapAbbreviation) { async function switchKeymap(device, keymapAbbreviation) {
writeLog(`T: switchKeymap keymapAbbreviation:${keymapAbbreviation}`);
const keymapAbbreviationAscii = keymapAbbreviation.split('').map(char => char.charCodeAt(0)); const keymapAbbreviationAscii = keymapAbbreviation.split('').map(char => char.charCodeAt(0));
const payload = [uhk.usbCommands.switchKeymap, keymapAbbreviation.length, ...keymapAbbreviationAscii]; const payload = [uhk.usbCommands.switchKeymap, keymapAbbreviation.length, ...keymapAbbreviationAscii];
return await uhk.writeDevice(device, payload); return await uhk.writeDevice(device, payload);
} }
async function waitForKbootIdle(device) { async function waitForKbootIdle(device) {
writeLog(`T: waitForKbootIdle`);
const intervalMs = 100; const intervalMs = 100;
const pingMessageInterval = 500; const pingMessageInterval = 500;
let timeoutMs = 10000; let timeoutMs = 10000;
@@ -291,6 +295,7 @@ async function updateFirmwares(firmwarePath) {
} }
async function writeConfig(device, configBuffer, isHardwareConfig) { async function writeConfig(device, configBuffer, isHardwareConfig) {
writeLog(`T: writeConfig isHardwareConfig:${isHardwareConfig}`);
const chunkSize = 60; const chunkSize = 60;
let offset = 0; let offset = 0;
let chunkSizeToRead; let chunkSizeToRead;
@@ -318,24 +323,24 @@ async function writeConfig(device, configBuffer, isHardwareConfig) {
} }
async function applyConfig(device) { async function applyConfig(device) {
writeLog(`T: applyConfig`);
await uhk.writeDevice(device, [uhk.usbCommands.applyConfig]); await uhk.writeDevice(device, [uhk.usbCommands.applyConfig]);
} }
async function launchEepromTransfer(device, operation, configBuffer) { async function launchEepromTransfer(device, operation, configBuffer) {
writeLog(`T: launchEepromTransfer operation:${operation}`);
const buffer = await uhk.writeDevice(device, [uhk.usbCommands.launchEepromTransfer, operation, configBuffer]); const buffer = await uhk.writeDevice(device, [uhk.usbCommands.launchEepromTransfer, operation, configBuffer]);
isBusy = true; isBusy = true;
writeLog(`T: getDeviceState`);
do { do {
const buffer = uhk.writeDevice(device, [uhk.usbCommands.getDeviceState]); const buffer = await uhk.writeDevice(device, [uhk.usbCommands.getDeviceState]);
isBusy = buffer[1] === 1; isBusy = buffer[1] === 1;
} while (isBusy); } while (isBusy);
}; };
async function writeUca(device, configBuffer) { async function writeUca(device, configBuffer) {
console.log('write config');
await uhk.writeConfig(device, configBuffer, false); await uhk.writeConfig(device, configBuffer, false);
console.log('apply config');
await uhk.applyConfig(device); await uhk.applyConfig(device);
console.log('lanuch eeprom transfer');
await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.eepromTransfer.writeUserConfig); await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.eepromTransfer.writeUserConfig);
} }
@@ -357,9 +362,7 @@ async function writeHca(device, isIso) {
hardwareConfig.toBinary(hardwareBuffer); hardwareConfig.toBinary(hardwareBuffer);
const buffer = hardwareBuffer.getBufferContent(); const buffer = hardwareBuffer.getBufferContent();
console.log('write hardware config')
await uhk.writeConfig(device, buffer, true); await uhk.writeConfig(device, buffer, true);
console.log('lanuch eeprom transfer');
await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.eepromTransfer.writeHardwareConfig); await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.eepromTransfer.writeHardwareConfig);
} }
@@ -504,7 +507,11 @@ function writeLog(prefix, buffer) {
if (!debug) { if (!debug) {
return; return;
} }
console.log(prefix + bufferToString(buffer)) if (buffer) {
console.log(prefix + bufferToString(buffer))
} else {
console.log(prefix);
}
} }
function checkModuleSlot(moduleSlot, mapping) { function checkModuleSlot(moduleSlot, mapping) {