diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index ca3d7e32..868f51fb 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -302,6 +302,13 @@ flash_with_programmer() { "-Uflash:w:${HEX_FILE_PATH}:i" } +find_bootloader_path() { + BOOTLOADER_FILE=$( get_arduino_pref 'bootloader.file' ) + BOOTLOADER_FILE="${BOOTLOADER_FILE:-caterina/Caterina.hex}" + BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/${BOOTLOADER_FILE}}" +} + + hex_with_bootloader () { if [ ! -e "${HEX_FILE_PATH}" ]; then compile diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index c03aa7b2..e63278e8 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -112,11 +112,6 @@ find_bootloader_ports() { fi } -find_bootloader_path() { - BOOTLOADER_FILE=$( get_arduino_pref 'bootloader.file' ) - BOOTLOADER_FILE="${BOOTLOADER_FILE:-caterina/Caterina.hex}" - BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/${BOOTLOADER_FILE}}" -} MD5="md5sum"