From 8e620caac5aedd6666844f627ed8ff9fb791d23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Tue, 30 Jan 2018 20:39:48 +0100
Subject: [PATCH] Use reenumerate() in update-device-firmware.js instead of
 forking reenumerate.js

---
 packages/usb/uhk.js                    |  2 +-
 packages/usb/update-device-firmware.js | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/usb/uhk.js b/packages/usb/uhk.js
index 46c1a5e1..60b727f8 100644
--- a/packages/usb/uhk.js
+++ b/packages/usb/uhk.js
@@ -86,7 +86,7 @@ function reenumerate(enumerationMode) {
         const enumerationModeId = exports.enumerationModes[enumerationMode];
 
         if (enumerationModeId === undefined) {
-            const enumerationModes = Object.keys(uhk.enumerationModes).join(', ');
+            const enumerationModes = Object.keys(exports.enumerationModes).join(', ');
             console.log(`Invalid enumeration mode '${enumerationMode}' is not one of: ${enumerationModes}`);
             reject();
             return;
diff --git a/packages/usb/update-device-firmware.js b/packages/usb/update-device-firmware.js
index 6f5588be..dd22bcd5 100755
--- a/packages/usb/update-device-firmware.js
+++ b/packages/usb/update-device-firmware.js
@@ -17,12 +17,13 @@ const blhost = getBlhostCmd(uhk.enumerationNameToProductId.bootloader);
 
 checkFirmwareImage(firmwareImage, extension);
 
-config.verbose = true;
-exec(`${usbDir}/reenumerate.js bootloader`);
-exec(`${blhost} flash-security-disable 0403020108070605`);
-exec(`${blhost} flash-erase-region 0xc000 475136`);
-exec(`${blhost} flash-image ${firmwareImage}`);
-exec(`${blhost} reset`);
-config.verbose = false;
-
-echo('Firmware updated successfully.');
+(async function() {
+    config.verbose = true;
+    await uhk.reenumerate('bootloader');
+    exec(`${blhost} flash-security-disable 0403020108070605`);
+    exec(`${blhost} flash-erase-region 0xc000 475136`);
+    exec(`${blhost} flash-image ${firmwareImage}`);
+    exec(`${blhost} reset`);
+    config.verbose = false;
+    echo('Firmware updated successfully.');
+})();