diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-28 21:25:41 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-28 21:25:41 +0000 |
| commit | 93a1d4f15611d68225b1eb689b81cbd4564fb18c (patch) | |
| tree | 49dbe504f06e23a53dcd732bfaf6d3d54e7ce9ba /tmk_core | |
| parent | 80e8e20a8965da5934f74141291c6c5d805774c6 (diff) | |
| parent | f8266a228cacbc31b0455161e0a8bd073feaa9db (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rwxr-xr-x | tmk_core/make_dfu_header.sh | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 336a83e9d3..06c308e553 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -284,7 +284,7 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf bootloader: make -C lib/lufa/Bootloaders/DFU/ clean - $(TMK_DIR)/make_dfu_header.sh $(ALL_CONFIGS) + bin/qmk generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/DFU/Keyboard.h $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0)) $(eval PROGRAM_SIZE_KB=$(shell n=`expr $(MAX_SIZE) / 1024` && echo $$(($$n)) || echo 0)) $(eval BOOT_SECTION_SIZE_KB=$(shell n=`expr $(BOOTLOADER_SIZE) / 1024` && echo $$(($$n)) || echo 0)) diff --git a/tmk_core/make_dfu_header.sh b/tmk_core/make_dfu_header.sh deleted file mode 100755 index 7e2283dd70..0000000000 --- a/tmk_core/make_dfu_header.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -ALL_CONFIGS=$* -GREP="grep" - -cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h -#pragma once - -$($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1) -$($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader -$($GREP "QMK_ESC_OUTPUT[ \t]" $ALL_CONFIGS -h | tail -1) -$($GREP "QMK_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1) -$($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1) -$($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1) -EOF |