Move checkFirmwareImage() from shared.js to uhk.js

packages/usb/shared.js

@@ -1,22 +1,5 @@
 require('shelljs/global');
 
-function checkFirmwareImage(imagePath, extension) {
-    if (!imagePath) {
-        echo('No firmware image specified.');
-        exit(1);
-    }
-
-    if (!imagePath.endsWith(extension)) {
-        echo(`Firmware image extension is not ${extension}`);
-        exit(1);
-    }
-
-    if (!test('-f', imagePath)) {
-        echo('Firmware image does not exist.');
-        exit(1);
-    }
-}
-
 function getBlhostCmd(pid) {
     let blhostPath;
     switch (process.platform) {
@@ -55,7 +38,6 @@ function execRetry(command) {
 }
 
 const exp = {
-    checkFirmwareImage,
     getBlhostCmd,
     execRetry,
 }

packages/usb/uhk.js

@@ -62,6 +62,23 @@ function getBootloaderDevice() {
     return foundDevice;
 }
 
+function checkFirmwareImage(imagePath, extension) {
+    if (!imagePath) {
+        echo('No firmware image specified.');
+        exit(1);
+    }
+
+    if (!imagePath.endsWith(extension)) {
+        echo(`Firmware image extension is not ${extension}`);
+        exit(1);
+    }
+
+    if (!test('-f', imagePath)) {
+        echo('Firmware image does not exist.');
+        exit(1);
+    }
+}
+
 let configBufferIds = {
     hardwareConfig: 0,
     stagingUserConfig: 1,
@@ -135,6 +152,7 @@ exports = module.exports = moduleExports = {
     getBootloaderDevice,
     getTransferData,
     checkModuleSlot,
+    checkFirmwareImage,
     reenumerate,
     usbCommands: {
         getDeviceProperty       : 0x00,

packages/usb/update-device-firmware.js

@@ -15,7 +15,7 @@ const firmwareImage = program.args[0];
 const usbDir = `${__dirname}`;
 const blhost = getBlhostCmd(uhk.enumerationNameToProductId.bootloader);
 
-checkFirmwareImage(firmwareImage, extension);
+uhk.checkFirmwareImage(firmwareImage, extension);
 
 (async function() {
     config.verbose = true;

packages/usb/update-module-firmware.js

@@ -15,7 +15,7 @@ let moduleSlot = program.args[0];
 const i2cAddress = uhk.checkModuleSlot(moduleSlot, uhk.moduleSlotToI2cAddress);
 
 const firmwareImage = program.args[1];
-checkFirmwareImage(firmwareImage, extension);
+uhk.checkFirmwareImage(firmwareImage, extension);
 
 const usbDir = `${__dirname}`;
 const blhostUsb = getBlhostCmd(uhk.enumerationNameToProductId.buspal);