alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
kaleidoscope-builder: Support bootloaders with a different VID
pull/471/head
Jesse Vincent 6 years ago committed by GitHub
parent eedce63e3c f8dc42a939
commit 75dd28aeab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File

4
etc/kaleidoscope-builder.conf
Unescape View File

@ -48,6 +48,7 @@ find_device_vid_pid() {
VID=${VID:-$(echo "${VPIDS}" | grep build.vid= | cut -dx -f2)} VID=${VID:-$(echo "${VPIDS}" | grep build.vid= | cut -dx -f2)}
SKETCH_PID=${SKETCH_PID:-$(echo "${VPIDS}" | grep build.pid= | 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_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() { find_device_port() {
@ -66,8 +67,9 @@ reset_device_cmd() {
find_bootloader_ports() { find_bootloader_ports() {
find_device_vid_pid find_device_vid_pid
DIR=$(dirname "$(readlink -f "$0")") DIR=$(dirname "$(readlink -f "$0")")
BOOTLOADER_VID="${BOOTLOADER_VID:-${VID}}"
DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" 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" MD5="md5sum"

Write Preview
Loading…
Cancel
Save