Merge pull request #469 from keyboardio/builder/bootloader-vid

kaleidoscope-builder: Support bootloaders with a different VID
keyboardio · Nov 18, 2018 · 75dd28a · 75dd28a
2 parents eedce63 + f8dc42a
commit 75dd28a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
@@ -48,6 +48,7 @@ find_device_vid_pid() {
     VID=${VID:-$(echo "${VPIDS}" | grep build.vid= | cut -dx -f2)}
     SKETCH_PID=${SKETCH_PID:-$(echo "${VPIDS}" | grep build.pid= | cut -dx -f2)}
     BOOTLOADER_PID=${BOOTLOADER_PID:-$(echo "${VPIDS}" | grep bootloader.pid= | cut -dx -f2)}
+    BOOTLOADER_VID=${BOOTLOADER_VID:-$(echo "${VPIDS}" | grep bootloader.vid= | cut -dx -f2)}
 }
 
 find_device_port() {
@@ -66,8 +67,9 @@ reset_device_cmd() {
 find_bootloader_ports() {
     find_device_vid_pid
     DIR=$(dirname "$(readlink -f "$0")")
+    BOOTLOADER_VID="${BOOTLOADER_VID:-${VID}}"
     DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev"
-    DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${VID} ${BOOTLOADER_PID})"
+    DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})"
 }
 
 MD5="md5sum"