From: tmk <hasu@tmk-kbd.com>
Date: Thu, 17 May 2018 23:34:39 +0000 (+0900)
Subject: tmk_core: Now expects dfu-programmer 0.7 or later
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=c72981f1e72584af7fc0514feef79b8112622234;p=max%2Ftmk_keyboard.git

tmk_core: Now expects dfu-programmer 0.7 or later
---

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 0d0b6afb..ca933826 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -427,11 +427,7 @@ dfu: $(TARGET).hex
 	done
 	@echo
 
-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
-endif
 	dfu-programmer $(MCU) flash $(TARGET).hex
 	dfu-programmer $(MCU) reset
 	
@@ -447,11 +443,7 @@ flip-ee: $(TARGET).hex $(TARGET).eep
 	$(REMOVE) $(TARGET)eep.hex
 
 dfu-ee: $(TARGET).hex $(TARGET).eep
-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
-endif
 	dfu-programmer $(MCU) reset