diff --git a/packages/uhk-usb/src/constants.ts b/packages/uhk-usb/src/constants.ts index ae602e3b..d41cdf28 100644 --- a/packages/uhk-usb/src/constants.ts +++ b/packages/uhk-usb/src/constants.ts @@ -13,10 +13,10 @@ export enum UsbCommand { JumpToModuleBootloader = 0x02, SendKbootCommandToModule = 0x03, ReadConfig = 0x04, - UploadUserConfig = 8, + WriteHardwareConfig = 0x05, + WriteStagingUserConfig = 0x06, ApplyConfig = 9, LaunchEepromTransfer = 12, - WriteHardwareConfig = 14, GetKeyboardState = 16 } diff --git a/packages/uhk-usb/src/uhk-operations.ts b/packages/uhk-usb/src/uhk-operations.ts index dca4ba84..df6662cd 100644 --- a/packages/uhk-usb/src/uhk-operations.ts +++ b/packages/uhk-usb/src/uhk-operations.ts @@ -171,7 +171,7 @@ export class UhkOperations { */ private async sendUserConfigToKeyboard(json: string): Promise { const buffer: Buffer = new Buffer(JSON.parse(json).data); - const fragments = getTransferBuffers(UsbCommand.UploadUserConfig, buffer); + const fragments = getTransferBuffers(UsbCommand.WriteStagingUserConfig, buffer); for (const fragment of fragments) { await this.device.write(fragment); } diff --git a/packages/usb/uhk.js b/packages/usb/uhk.js index 52dc06c5..c5d592f4 100644 --- a/packages/usb/uhk.js +++ b/packages/usb/uhk.js @@ -56,13 +56,13 @@ exports = module.exports = moduleExports = { jumpToModuleBootloader : 0x02, sendKbootCommandToModule: 0x03, readConfig : 0x04, + writeHardwareConfig : 0x05, + writeStagingUserConfig : 0x06, setTestLed: 0x14, - writeUserConfig: 8, applyConfig: 9, setLedPwmBrightness: 10, getAdcValue: 11, launchEepromTransferLegacy: 12, - writeHardwareConfig: 14, getKeyboardState: 16, getDebugInfo: 17, }, diff --git a/packages/usb/write-config.js b/packages/usb/write-config.js index 9a671fb0..5690a933 100755 --- a/packages/usb/write-config.js +++ b/packages/usb/write-config.js @@ -24,7 +24,7 @@ let buffer = Buffer.from(device.readSync()); configSize = buffer[1] + (buffer[2]<<8); console.log(`${configTypeString}configSize:`, configSize); -while (offset < configSize){ +while (offset < configSize) { const usbCommand = isHardwareConfig ? uhk.usbCommands.writeHardwareConfig : uhk.usbCommands.writeUserConfig; chunkSizeToRead = Math.min(chunkSize, configSize - offset); buffer = Buffer.concat([