diff --git a/bin/find-device-port-linux-udev b/bin/find-device-port-linux-udev index f2deea32..3be11b4d 100644 --- a/bin/find-device-port-linux-udev +++ b/bin/find-device-port-linux-udev @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl use warnings; use strict; @@ -17,17 +17,14 @@ for my $path (@paths) { my ($key,$val) = split(/=/,$line,2); $devices{$path}{$key} = $val; } - if (($devices{$path}{'ID_VENDOR_ID'} == $vid) && + if (($devices{$path}{'ID_VENDOR_ID'} == $vid) && ($devices{$path}{'ID_MODEL_ID'} == $pid) ) { if ($devices{$path}{'ID_MM_CANDIDATE'}) { - warn "Yikes. ModemManager wants to pwn your keyboard"; - } + warn "Yikes. ModemManager wants to pwn your keyboard"; + } - print $devices{$path}{DEVNAME}; - exit(0); + print $devices{$path}{DEVNAME}; + exit(0); } - - } - diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 8742be93..8dc4a86e 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -2,7 +2,6 @@ set -e - ###### ###### Build and output configuration ###### @@ -10,7 +9,7 @@ set -e build_version () { GIT_VERSION="$(cd $(find_sketch); git describe --abbrev=4 --dirty --always)" LIB_VERSION="$(cd $(find_sketch); (grep version= ../../library.properties 2>/dev/null || echo version=0.0.0) | cut -d= -f2)-g${GIT_VERSION}" - + BUILD_PATH="${BUILD_PATH:-$(mktemp -d 2>/dev/null || mktemp -d -t 'build')}" OUTPUT_DIR="${OUTPUT_DIR:-output/${LIBRARY}}" OUTPUT_PATH="${OUTPUT_PATH:-${SOURCEDIR}/${OUTPUT_DIR}}" @@ -23,17 +22,13 @@ build_filenames () { ELF_FILE_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf" } - - - - firmware_size () { if [ "${BOARD}" = "virtual" ]; then echo "[Size not computed for virtual build]" return fi - ## This is a terrible hack, please don't hurt me. - algernon + ## This is a terrible hack, please don't hurt me. - algernon MAX_PROG_SIZE=28672 @@ -81,13 +76,11 @@ flash () { sleep 3s find_bootloader_ports flash_over_usb || flash_over_usb - } flash_over_usb () { sleep 1s ${AVRDUDE} -q -q -C ${AVRDUDE_CONF} -p${MCU} -cavr109 -D -P ${DEVICE_PORT_BOOTLOADER} -b57600 "-Uflash:w:${HEX_FILE_PATH}:i" - } flash_from_bootloader() { @@ -96,14 +89,12 @@ flash_from_bootloader() { flash_over_usb || flash_over_usb } - program() { prepare_to_flash flash_with_programmer } flash_with_programmer() { - ${AVRDUDE} -v \ -C ${AVRDUDE_CONF} \ -p${MCU} \ @@ -152,7 +143,7 @@ compile () { ARDUINO_PACKAGES="" if [ -d ${ARDUINO_PACKAGE_PATH} ]; then - ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\"" + ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\"" fi ${ARDUINO_BUILDER} \ @@ -238,9 +229,9 @@ clean () { } reset_device() { - find_device_port - check_device_port - reset_device_cmd + find_device_port + check_device_port + reset_device_cmd } check_device_port () { @@ -254,7 +245,6 @@ check_device_port () { fi } - usage () { cat </dev/null || echo not) @@ -48,55 +44,46 @@ find_device_port() { DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" } - reset_device_cmd() { stty -F ${DEVICE_PORT} 1200 hupcl - } - -MD5="md5sum" - 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})" - } - +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 - - ###### ###### Arduino tools configuration ###### @@ -119,17 +106,13 @@ AVR_OBJDUMP="${AVR_OBJDUMP:-${ARDUINO_TOOLS_PATH}/avr/bin/avr-objdump}" AVRDUDE="${AVRDUDE:-${ARDUINO_TOOLS_PATH}/avr/bin/avrdude}" AVRDUDE_CONF="${AVRDUDE_CONF:-${ARDUINO_TOOLS_PATH}/avr/etc/avrdude.conf}" - ###### ###### Source files and dependencies ###### - BOARD_HARDWARE_PATH="${BOARD_HARDWARE_PATH:-${ARDUINO_LOCAL_LIB_PATH}/hardware}" BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex}" - - if [ ! -z "${ARDUINO_TOOLS_PATH}" ]; then ARDUINO_TOOLS_PARAM="-tools ${ARDUINO_TOOLS_PATH}" fi @@ -137,4 +120,3 @@ fi if [ ! -z "${AVR_GCC_PREFIX}" ]; then ARDUINO_AVR_GCC_PREFIX_PARAM="-prefs \"runtime.tools.avr-gcc.path=${AVR_GCC_PREFIX}\"" fi -