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

Don't display the buffer related USB transfers of writeConfig() because they generate too much noise.

Browse Source
This commit is contained in:
László Monda
2018-04-02 23:32:13 +02:00
parent 8b5ae106bd
commit fc2d025cc4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/usb/uhk.js
View File

@@ -37,7 +37,9 @@ function uint32ToArray(value) {
function writeDevice(device, data, options={}) { function writeDevice(device, data, options={}) {
const dataBuffer = new Buffer(data); const dataBuffer = new Buffer(data);
writeLog('W: ', dataBuffer); if (!options.noDebug) {
writeLog('W: ', dataBuffer);
}
device.write(getTransferData(dataBuffer)); device.write(getTransferData(dataBuffer));
if (options.noRead) { if (options.noRead) {
return Promise.resolve(); return Promise.resolve();
@@ -48,7 +50,9 @@ function writeDevice(device, data, options={}) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
writeLog('R: ', data); if (!options.noDebug) {
writeLog('R: ', data);
}
resolve(data); resolve(data);
} }
}); });
@@ -311,6 +315,7 @@ async function writeConfig(device, configBuffer, isHardwareConfig) {
const configMaxSize = isHardwareConfig ? hardwareConfigMaxSize : userConfigMaxSize; const configMaxSize = isHardwareConfig ? hardwareConfigMaxSize : userConfigMaxSize;
const configSize = Math.min(configMaxSize, configBuffer.length); const configSize = Math.min(configMaxSize, configBuffer.length);
writeLog('WR: ...');
while (offset < configSize) { while (offset < configSize) {
const usbCommand = isHardwareConfig ? uhk.usbCommands.writeHardwareConfig : uhk.usbCommands.writeStagingUserConfig; const usbCommand = isHardwareConfig ? uhk.usbCommands.writeHardwareConfig : uhk.usbCommands.writeStagingUserConfig;
chunkSizeToRead = Math.min(chunkSize, configSize - offset); chunkSizeToRead = Math.min(chunkSize, configSize - offset);
@@ -323,7 +328,7 @@ async function writeConfig(device, configBuffer, isHardwareConfig) {
usbCommand, chunkSizeToRead, offset & 0xff, offset >> 8, usbCommand, chunkSizeToRead, offset & 0xff, offset >> 8,
...configBuffer.slice(offset, offset+chunkSizeToRead) ...configBuffer.slice(offset, offset+chunkSizeToRead)
]; ];
await uhk.writeDevice(device, buffer) await uhk.writeDevice(device, buffer, {noDebug:true})
offset += chunkSizeToRead; offset += chunkSizeToRead;
} }
} }