diff --git a/bin/find-device-port-linux-udev b/bin/find-device-port-linux-udev index f98adb1f..e74c1a8c 100644 --- a/bin/find-device-port-linux-udev +++ b/bin/find-device-port-linux-udev @@ -88,6 +88,6 @@ EOWARN exit(0); } -print_warning(join("\n",@log)); -print_warning("ERROR: I couldn't find a USB device matching the keyboard's USB Vendor and Device IDs\n"); +#debug("ERROR: I couldn't find a USB device matching the keyboard's USB Vendor and Device IDs\n"); +#print_warning(join("\n",@log)); diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 60ac9bb9..c0cd3903 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -163,15 +163,22 @@ prompt_before_flashing () { flash () { maybe_build - prompt_before_flashing - # This is defined in the (optional) user config. - # shellcheck disable=SC2154 - ${preFlash_HOOKS} - - reset_device - sleep 3 + # Check to see if we can see a keyboard bootloader port. + # If we -can-, then we should skip over the "reset to bootloader" thing find_bootloader_ports + if [ -z "${DEVICE_PORT_BOOTLOADER}" ]; then + prompt_before_flashing + + # This is defined in the (optional) user config. + # shellcheck disable=SC2154 + ${preFlash_HOOKS} + + reset_device + sleep 3 + find_bootloader_ports + fi + check_bootloader_port_and_flash # This is defined in the (optional) user config.