Change the arguments of UsbCommandId_LaunchEepromTransfer and its id to 0x08.

packages/usb/eeprom.js

@@ -2,15 +2,15 @@
 const uhk = require('./uhk');
 
 const eepromTransferType = process.argv[2];
-const eepromTransferId = uhk.eepromTransfer[eepromTransferType];
+const eepromTransfer = uhk.eepromTransfer[eepromTransferType];
 
-if (eepromTransferId === undefined) {
+if (eepromTransfer === undefined) {
     console.error(`Gotta provide one of ${Object.keys(uhk.eepromTransfer).join(', ')}`);
     process.exit(1);
 }
 
 const device = uhk.getUhkDevice();
-device.write(uhk.getTransferData(new Buffer([uhk.usbCommands.launchEepromTransferLegacy, eepromTransferId])));
+device.write(uhk.getTransferData(new Buffer([uhk.usbCommands.launchEepromTransfer, eepromTransfer.operation, eepromTransfer.configBuffer])));
 const buffer = Buffer.from(device.readSync());
 const responseCode = buffer[0];
 if (responseCode !== 0) {

packages/usb/uhk.js

@@ -44,6 +44,17 @@ function getBootloaderDevice() {
     return foundDevice;
 }
 
+let configBufferIds = {
+    hardwareConfig: 0,
+    stagingUserConfig: 1,
+    validatedUserConfig: 2,
+};
+
+let eepromOperations = {
+    read: 0,
+    write: 1,
+};
+
 exports = module.exports = moduleExports = {
     bufferToString,
     getUhkDevice,
@@ -59,10 +70,10 @@ exports = module.exports = moduleExports = {
         writeHardwareConfig     : 0x05,
         writeStagingUserConfig  : 0x06,
         applyConfig             : 0x07,
+        launchEepromTransfer    : 0x08,
         setTestLed: 0x14,
         setLedPwmBrightness: 10,
         getAdcValue: 11,
-        launchEepromTransferLegacy: 12,
         getKeyboardState: 16,
         getDebugInfo: 17,
     },
@@ -93,16 +104,25 @@ exports = module.exports = moduleExports = {
         hardwareConfigSize: 4,
         userConfigSize: 5,
     },
-    configBufferIds: {
-        hardwareConfig: 0,
-        stagingUserConfig: 1,
-        validatedUserConfig: 2,
-    },
+    configBufferIds,
+    eepromOperations,
     eepromTransfer: {
-        readHardwareConfig: 0,
-        writeHardwareConfig: 1,
-        readUserConfig: 2,
-        writeUserConfig: 3,
+        readHardwareConfig: {
+            operation: eepromOperations.read,
+            configBuffer: configBufferIds.hardwareConfig,
+        },
+        writeHardwareConfig: {
+            operation: eepromOperations.write,
+            configBuffer:configBufferIds.hardwareConfig,
+        },
+        readUserConfig: {
+            operation: eepromOperations.read,
+            configBuffer: configBufferIds.validatedUserConfig,
+        },
+        writeUserConfig: {
+            operation: eepromOperations.write,
+            configBuffer: configBufferIds.validatedUserConfig,
+        },
     },
     kbootCommands: {
         idle: 0,

packages/usb/write-config.js

@@ -25,7 +25,7 @@ configSize = buffer[1] + (buffer[2]<<8);
 console.log(`${configTypeString}configSize:`, configSize);
 
 while (offset < configSize) {
-    const usbCommand = isHardwareConfig ? uhk.usbCommands.writeHardwareConfig : uhk.usbCommands.writeUserConfig;
+    const usbCommand = isHardwareConfig ? uhk.usbCommands.writeHardwareConfig : uhk.usbCommands.writeStagingUserConfig;
     chunkSizeToRead = Math.min(chunkSize, configSize - offset);
     buffer = Buffer.concat([
         new Buffer([usbCommand, chunkSizeToRead, offset & 0xff, offset >> 8]),