tschwery/tmk_keyboard
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Fix dfu-programmer version check

Browse source
This commit is contained in:
tmk 2017-09-07 09:00:57 +09:00
parent 17d083a54b
commit 9d66875636
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/rules.mk
View file

@ -427,7 +427,7 @@ dfu: $(TARGET).hex
done
@echo
ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
ifneq (, $(findstring 0.7, $(shell dfu-programmer 2>/dev/null && dfu-programmer --version 2>&1)))
dfu-programmer $(MCU) erase --force
else
dfu-programmer $(MCU) erase
@ -447,7 +447,7 @@ flip-ee: $(TARGET).hex $(TARGET).eep
$(REMOVE) $(TARGET)eep.hex
dfu-ee: $(TARGET).hex $(TARGET).eep
ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
ifneq (, $(findstring 0.7, $(shell dfu-programmer 2>/dev/null && dfu-programmer --version 2>&1)))
dfu-programmer $(MCU) flash --eeprom $(TARGET).eep
else
dfu-programmer $(MCU) flash-eeprom $(TARGET).eep