From 54a812a725879539fa8c9c2383eb80c9ec6b1683 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 28 Feb 2017 18:15:58 +0800 Subject: remove the builder, since we can now use the systemwide one in the hardware dir --- tools/kaleidoscope-builder | 313 --------------------------------------------- tools/settings.sh | 85 ------------ 2 files changed, 398 deletions(-) delete mode 100755 tools/kaleidoscope-builder delete mode 100644 tools/settings.sh (limited to 'tools') diff --git a/tools/kaleidoscope-builder b/tools/kaleidoscope-builder deleted file mode 100755 index 6c984e5..0000000 --- a/tools/kaleidoscope-builder +++ /dev/null @@ -1,313 +0,0 @@ -#! /bin/sh - -set -e - -firmware_size () { - ## This is a terrible hack, please don't hurt me. - algernon - - MAX_PROG_SIZE=28672 - - output="$($@ | grep "\\(Program\\|Data\\):" | sed -e 's,^, - ,' && echo)" - - PROGSIZE="$(echo "${output}" | grep Program: | cut -d: -f2 | awk '{print $1}')" - - PERCENT="$(echo ${PROGSIZE} ${MAX_PROG_SIZE} | awk "{ printf \"%02.01f\", \$1 / \$2 * 100 }")" - - echo "${output}" | sed -e "s,\(Program:.*\)(\([0-9\.]*%\) Full),\1(${PERCENT}% Full)," -} - -find_sketch () { - if [ -e "${SOURCEDIR}/.kaleidoscope-builder.conf" ]; then - . "${SOURCEDIR}/.kaleidoscope-builder.conf" - fi - - SKETCH="${SKETCH:-${DEFAULT_SKETCH}}" - LIBRARY="${LIBRARY:-${SKETCH}}" - - for path in "hardware/keyboardio/avr/libraries/Kaleidoscope-${LIBRARY}/examples/${SKETCH}" \ - "examples/${LIBRARY}" \ - "src" \ - "." ; do - if [ -f "${path}/${SKETCH}.ino" ]; then - echo "${path}" - return - fi - done - exit 1 -} - -prepare_to_flash () { - if [ ! -e "${HEX_FILE_PATH}" ]; then - compile - fi - - echo "Press ENTER when ready..." - read a -} - -flash () { - prepare_to_flash - reset_device - sleep 3s - flash_over_usb - -} - -flash_over_usb () { - avrdude -q -q -p${MCU} -cavr109 -D -P ${DEVICE_PORT_BOOTLOADER} -b57600 "-Uflash:w:${HEX_FILE_PATH}:i" - -} - -program() { - prepare_to_flash - flash_with_programmer -} - -flash_with_programmer() { - - avrdude -v \ - -p${MCU} \ - -cusbtiny \ - -D \ - -B 1 \ - "-Uflash:w:${HEX_FILE_PATH}:i" -} - -hex_with_bootloader () { - if [ ! -e "${HEX_FILE_PATH}" ]; then - compile - fi - - cat ${HEX_FILE_PATH} | awk '/^:00000001FF/ == 0' > ${HEX_FILE_WITH_BOOTLOADER_PATH} - echo "Using ${BOOTLOADER_PATH}" - ${MD5} ${BOOTLOADER_PATH} - cat ${BOOTLOADER_PATH} >> ${HEX_FILE_WITH_BOOTLOADER_PATH} - cat <&2 - exit 1 - ;; -esac - -SKETCH="${SKETCH:-${DEFAULT_SKETCH}}" -LIBRARY="${LIBRARY:-${SKETCH}}" - -if [ -z "${SKETCH}" ] || [ -z "${LIBRARY}" ] || [ -z "${ROOT}" ] || [ -z "${SOURCEDIR}" ]; then - echo "SKETCH, LIBRARY, SOURCEDIR, and ROOT need to be set before including this file!" >&2 - exit 1 -fi - -BOARD="${BOARD:-model01}" -MCU="${MCU:-atmega32u4}" -FQBN="${FQBN:-keyboardio:avr:${BOARD}}" - -DEVICE_PORT="$(ls /dev/ttyACM* 2>/dev/null || echo '')" -DEVICE_PORT_BOOTLOADER="$(ls /dev/ttyACM* 2>/dev/null || echo '')" - -RESET_DEVICE="stty -F ${DEVICE_PORT} 1200 hupcl" - -ARDUINO_PATH="${ARDUINO_PATH:-/usr/local/arduino}" -ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Arduino}" -ARDUINO_TOOLS_PATH="${ARDUINO_TOOLS_PATH:-${ARDUINO_PATH}/hardware/tools}" -ARDUINO_BUILDER="${ARDUINO_BUILDER:-${ARDUINO_PATH}/arduino-builder}" -ARDUINO_IDE_VERSION="100607" - -BOARD_HARDWARE_PATH="${BOARD_HARDWARE_PATH:-${ARDUINO_LOCAL_LIB_PATH}/hardware}" -BOOTLOADER_PATH="${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex" - -AVR_SIZE="${AVR_SIZE:-${ARDUINO_TOOLS_PATH}/avr/bin/avr-size}" -AVR_NM="${AVR_NM:-${ARDUINO_TOOLS_PATH}/avr/bin/avr-nm}" -AVR_OBJDUMP="${AVR_OBJDUMP:-${ARDUINO_TOOLS_PATH}/avr/bin/avr-objdump}" - -MD5="md5sum" - -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}}" - -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}" - -OUTPUT_FILE_PREFIX="${SKETCH}-${LIB_VERSION}" - -HEX_FILE_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.hex" -HEX_FILE_WITH_BOOTLOADER_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}-with-bootloader.hex" -ELF_FILE_PATH="${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf" - -ARDUINO_TOOLS_PARAM="-tools ${ARDUINO_TOOLS_PATH}" -if [ -z "${ARDUINO_TOOLS_PATH}" ]; then - ARDUINO_TOOLS_PARAM="" -fi - -if [ ! -z "${AVR_GCC_PREFIX}" ]; then - ARDUINO_AVR_GCC_PREFIX_PARAM="-prefs \"runtime.tools.avr-gcc.path=${AVR_GCC_PREFIX}\"" -fi - -if [ ! -z "${VERBOSE}" ] && [ "${VERBOSE}" -gt 0 ]; then - ARDUINO_VERBOSE="-verbose" -else - ARDUINO_VERBOSE="-quiet" -fi - -## Platform-specific overrides -# Shamelessly stolen from git's Makefile -uname_S=$(uname -s 2>/dev/null || echo not) - -if [ "${uname_S}" = "Darwin" ]; then - DEVICE_PORT="$(ls /dev/cu.usbmodemHID?? /dev/cu.usbmodem14*)" - DEVICE_PORT_BOOTLOADER="$(ls /dev/cu.usbmodem14*)" - - ARDUINO_PATH="/Applications/Arduino.app/Contents/Java/" - ARDUINO_LOCAL_LIB_PATH="${HOME}/Documents/Arduino" - - MD5="md5" - - RESET_DEVICE="stty -f ${DEVICE_PORT} 1200" -fi -- cgit v1.2.3