diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index 696be6c8..a7d8f747 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -1,3 +1,5 @@ +# -*- shell-script -*- + ## NEEDS: LIBRARY, SKETCH, ROOT, SOURCEDIR ## Should be included when the current directory is the dir of the Sketch. @@ -11,9 +13,9 @@ LIBRARY="${LIBRARY:-${SKETCH}}" BOARD="${BOARD:-model01}" MCU="${MCU:-atmega32u4}" if [ "${BOARD}" = "virtual" ]; then - FQBN="${FQBN:-keyboardio:x86:${BOARD}}" + FQBN="${FQBN:-keyboardio:x86:${BOARD}}" else - FQBN="${FQBN:-keyboardio:avr:${BOARD}}" + FQBN="${FQBN:-keyboardio:avr:${BOARD}}" fi ######## @@ -25,62 +27,62 @@ fi uname_S=$(uname -s 2>/dev/null || echo not) find_device_vid_pid() { - VPIDS=$(${ARDUINO_BUILDER} \ - -hardware "${ARDUINO_PATH}/hardware" \ - -hardware "${BOARD_HARDWARE_PATH}" \ - ${ARDUINO_TOOLS_PARAM} \ - -tools "${ARDUINO_PATH}/tools-builder" \ - -fqbn "${FQBN}" \ - -dump-prefs | grep "\.[vp]id=") - 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)} + VPIDS=$(${ARDUINO_BUILDER} \ + -hardware "${ARDUINO_PATH}/hardware" \ + -hardware "${BOARD_HARDWARE_PATH}" \ + ${ARDUINO_TOOLS_PARAM} \ + -tools "${ARDUINO_PATH}/tools-builder" \ + -fqbn "${FQBN}" \ + -dump-prefs | grep "\.[vp]id=") + 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)} } find_device_port() { - find_device_vid_pid - DIR=$(dirname "$(readlink -f "$0")") - DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" - DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" + find_device_vid_pid + DIR=$(dirname "$(readlink -f "$0")") + DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" + DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" } reset_device_cmd() { - stty -F ${DEVICE_PORT} 1200 hupcl + stty -F ${DEVICE_PORT} 1200 hupcl } find_bootloader_ports() { - find_device_vid_pid - DIR=$(dirname "$(readlink -f "$0")") - DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" - DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${VID} ${BOOTLOADER_PID})" + find_device_vid_pid + DIR=$(dirname "$(readlink -f "$0")") + DEVICE_PORT_PROBER="${DIR}/find-device-port-linux-udev" + DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${VID} ${BOOTLOADER_PID})" } MD5="md5sum" if [ "${uname_S}" = "Darwin" ]; then - find_device_port() { - DEVICE_PORT="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" - DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCkbio* 2> /dev/null || echo '')}" - DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemHID* 2> /dev/null || echo '')}" - DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCHID* 2> /dev/null || echo '')}" - DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" - } + find_device_port() { + DEVICE_PORT="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" + DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCkbio* 2> /dev/null || echo '')}" + DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemHID* 2> /dev/null || echo '')}" + DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodemCHID* 2> /dev/null || echo '')}" + DEVICE_PORT="${DEVICE_PORT:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" + } - reset_device_cmd() { - /bin/stty -f ${DEVICE_PORT} 1200 - } + reset_device_cmd() { + /bin/stty -f ${DEVICE_PORT} 1200 + } - ARDUINO_PATH="${ARDUINO_PATH:-/Applications/Arduino.app/Contents/Java/}" - ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/Library/Arduino15/packages}" - ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Documents/Arduino}" + ARDUINO_PATH="${ARDUINO_PATH:-/Applications/Arduino.app/Contents/Java/}" + ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/Library/Arduino15/packages}" + ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Documents/Arduino}" - MD5="md5" + MD5="md5" - find_bootloader_ports() { - DEVICE_PORT_BOOTLOADER="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" - DEVICE_PORT_BOOTLOADER="${DEVICE_PORT_BOOTLOADER:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" - } + find_bootloader_ports() { + DEVICE_PORT_BOOTLOADER="$(ls /dev/cu.usbmodemkbio* 2> /dev/null || echo '')" + DEVICE_PORT_BOOTLOADER="${DEVICE_PORT_BOOTLOADER:-$(ls /dev/cu.usbmodem14* 2> /dev/null || echo '')}" + } fi