chore: wait for devices in usb script

UltimateHackingKeyboard · Dec 14, 2024 · 68ce574 · 68ce574
1 parent 0b37c90
commit 68ce574
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/usb/factory-update-uhk80.ts b/packages/usb/factory-update-uhk80.ts
@@ -17,10 +17,10 @@ import {
     getDeviceFirmwarePath,
     getFirmwarePackageJson,
     TmpFirmware,
-    snooze,
     UhkHidDevice,
     UhkOperations,
     UsbVariables,
+    waitForDevices,
     waitForUhkDeviceConnected,
 } from 'uhk-usb';
 
@@ -71,7 +71,10 @@ try {
 
     // just wait until devices be ready. After the reenumeration the halves start to communicate with each other
     // give them some time to finish
-    await snooze(5000);
+    await Promise.all([
+        waitForDevices(UHK_80_DEVICE.keyboard),
+        waitForDevices(UHK_80_DEVICE_LEFT.keyboard),
+    ]);
 
     // Need to reload hid devices because after the reenumeration maybe the HID device path changed
     connectedDevices = await getHidDevices();

diff --git a/packages/usb/factory-update.ts b/packages/usb/factory-update.ts
@@ -16,6 +16,7 @@ import {
     getFirmwarePackageJson,
     getModuleFirmwarePath,
     isUhkDeviceConnected,
+    waitForDevices,
     waitForUhkDeviceConnected,
 } from 'uhk-usb';
 
@@ -80,6 +81,7 @@ const devicesOptions = getDevicesOptions(DEVICES);
 
         const { operations } = Uhk(argv);
         await operations.updateDeviceFirmware(rightFirmwarePath, uhkDeviceProduct);
+        await waitForDevices(uhkDeviceProduct.keyboard);
         if (uhkDeviceProduct.firmwareUpgradeMethod === FIRMWARE_UPGRADE_METHODS.MCUBOOT) {
             if (!(await isUhkDeviceConnected(UHK_80_DEVICE_LEFT))) {
                 console.log(`[DeviceService] Please connect your ${UHK_80_DEVICE_LEFT.logName} keyboard with USB cable.`);

diff --git a/packages/usb/wait-for-device.ts b/packages/usb/wait-for-device.ts
@@ -105,6 +105,7 @@ while (new Date().getTime() - startTime.getTime() < timeout && !found) {
 }
 
 if (found) {
+    await snooze(1000);
     process.exit(0);
 }
 else {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     if (found) {
+        await snooze(1000);
         process.exit(0);
     }
     else {
@@ Expand Down @@