lift find_bootloader_path' out of the config file into the program.

as it isn't something that's platform specific
'
pull/932/head
Jesse Vincent 4 years ago
parent 52a5265b9b
commit 19f728ca56
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -302,6 +302,13 @@ flash_with_programmer() {
"-Uflash:w:${HEX_FILE_PATH}:i" "-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 () { hex_with_bootloader () {
if [ ! -e "${HEX_FILE_PATH}" ]; then if [ ! -e "${HEX_FILE_PATH}" ]; then
compile compile

@ -112,11 +112,6 @@ find_bootloader_ports() {
fi 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" MD5="md5sum"

Loading…
Cancel
Save