From 2eb31603f166ebf215bdd232016baf03a1d1c3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Tue, 12 Dec 2017 18:49:40 +0100 Subject: [PATCH] Change the value of UsbCommandId_{GetDeviceState,SetTestLed,GetDebugBuffer,GetAdcValue,SetLedPwmBrightness}. --- packages/uhk-usb/src/constants.ts | 6 +++++- packages/uhk-usb/src/uhk-hid-device.ts | 2 +- packages/usb/eeprom.js | 2 +- .../usb/{get-keyboard-state.js => get-device-state.js} | 2 +- packages/usb/uhk.js | 10 +++++----- 5 files changed, 13 insertions(+), 9 deletions(-) rename packages/usb/{get-keyboard-state.js => get-device-state.js} (91%) diff --git a/packages/uhk-usb/src/constants.ts b/packages/uhk-usb/src/constants.ts index 70096a7d..9b9889c9 100644 --- a/packages/uhk-usb/src/constants.ts +++ b/packages/uhk-usb/src/constants.ts @@ -17,7 +17,11 @@ export enum UsbCommand { WriteStagingUserConfig = 0x06, ApplyConfig = 0x07, LaunchEepromTransfer = 0x08, - GetKeyboardState = 16 + GetDeviceState = 0x09, + SetTestLed = 0x0a, + GetDebugBuffer = 0x0b, + GetAdcValue = 0x0c, + SetLedPwmBrightness = 0x0d } export enum EepromOperation { diff --git a/packages/uhk-usb/src/uhk-hid-device.ts b/packages/uhk-usb/src/uhk-hid-device.ts index 828e065f..be22c7a5 100644 --- a/packages/uhk-usb/src/uhk-hid-device.ts +++ b/packages/uhk-usb/src/uhk-hid-device.ts @@ -106,7 +106,7 @@ export class UhkHidDevice { public async waitUntilKeyboardBusy(): Promise { while (true) { - const buffer = await this.write(new Buffer([UsbCommand.GetKeyboardState])); + const buffer = await this.write(new Buffer([UsbCommand.GetDeviceState])); if (buffer[1] === 0) { break; } diff --git a/packages/usb/eeprom.js b/packages/usb/eeprom.js index f0f245f0..3b903231 100755 --- a/packages/usb/eeprom.js +++ b/packages/usb/eeprom.js @@ -20,7 +20,7 @@ if (responseCode !== 0) { function waitUntilKeyboardBusy() { - device.write(uhk.getTransferData(new Buffer([uhk.usbCommands.getKeyboardState]))); + device.write(uhk.getTransferData(new Buffer([uhk.usbCommands.getDeviceState]))); const keyboardStateBuffer = Buffer.from(device.readSync()); if (keyboardStateBuffer[1] === 1) { diff --git a/packages/usb/get-keyboard-state.js b/packages/usb/get-device-state.js similarity index 91% rename from packages/usb/get-keyboard-state.js rename to packages/usb/get-device-state.js index 8372f0e7..2115c62e 100755 --- a/packages/usb/get-keyboard-state.js +++ b/packages/usb/get-device-state.js @@ -3,7 +3,7 @@ const uhk = require('./uhk'); const device = uhk.getUhkDevice(); function readKeyboardState() { - const payload = new Buffer([uhk.usbCommands.getKeyboardState]); + const payload = new Buffer([uhk.usbCommands.getDeviceState]); console.log('Sending ', uhk.bufferToString(payload)); device.write(uhk.getTransferData(payload)); const receivedBuffer = device.readSync(); diff --git a/packages/usb/uhk.js b/packages/usb/uhk.js index 6dc71696..c5c85329 100644 --- a/packages/usb/uhk.js +++ b/packages/usb/uhk.js @@ -71,11 +71,11 @@ exports = module.exports = moduleExports = { writeStagingUserConfig : 0x06, applyConfig : 0x07, launchEepromTransfer : 0x08, - setTestLed: 0x14, - setLedPwmBrightness: 10, - getAdcValue: 11, - getKeyboardState: 16, - getDebugInfo: 17, + getDeviceState : 0x09, + setTestLed : 0x0a, + getDebugBuffer : 0x0b, + getAdcValue : 0x0c, + setLedPwmBrightness : 0x0d, }, enumerationModes: { bootloader: 0,