diff --git a/packages/usb/write-config.js b/packages/usb/write-config.js deleted file mode 100755 index 73c782e8..00000000 --- a/packages/usb/write-config.js +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env node -const program = require('commander'); -const fs = require('fs'); -const uhk = require('./uhk'); - -(async function() { - const device = uhk.getUhkDevice(); - require('shelljs/global'); - - program - .usage(`config.bin`) - .option('-h, --hardware-config', 'Write the hardware config instead of the user config') - .parse(process.argv); - - if (program.args.length == 0) { - console.error('No binary config file specified.'); - exit(1); - } - - const configBin = program.args[0]; - const isHardwareConfig = program.hardwareConfig; - const configTypeString = isHardwareConfig ? 'hardware' : 'user'; - const configBuffer = fs.readFileSync(configBin); - - await uhk.writeUserConfig(device, configBuffer, isHardwareConfig); -})(); diff --git a/packages/usb/write-hca.js b/packages/usb/write-hca.js index 39ba6d70..925375d5 100755 --- a/packages/usb/write-hca.js +++ b/packages/usb/write-hca.js @@ -12,7 +12,8 @@ if (layout !== 'iso' && layout !== 'ansi') { process.exit(1); } -uhk.writeHca(layout === 'iso') +const device = uhk.getUhkDevice(); +uhk.writeHca(device, layout === 'iso') .catch((err)=>{ console.error(err); }); diff --git a/packages/usb/write-userconfig.js b/packages/usb/write-userconfig.js index d70ecaba..eef77959 100755 --- a/packages/usb/write-userconfig.js +++ b/packages/usb/write-userconfig.js @@ -17,5 +17,6 @@ const uhk = require('./uhk'); const device = uhk.getUhkDevice(); const configBuffer = fs.readFileSync(configPath); await uhk.writeConfig(device, configBuffer, false); - await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.configBufferIds.stagingUserConfig); + await uhk.applyConfig(device); + await uhk.launchEepromTransfer(device, uhk.eepromOperations.write, uhk.configBufferIds.validatedUserConfig); })();