X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Frules.mk;h=978f3c06558a24ba65ade19948f6ebef388ce66f;hb=ffb52ab0c98540f6305a7c1d82b50c8d6611a727;hp=0d0b6afbb125fc72067da8758956cb9b770cc6bc;hpb=9d66875636614172f7323c5986bfc3cf93b15c13;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 0d0b6afb..978f3c06 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -427,13 +427,14 @@ dfu: $(TARGET).hex
 	done
 	@echo
 
-ifneq (, $(findstring 0.7, $(shell dfu-programmer 2>/dev/null && dfu-programmer --version 2>&1)))
+ifeq ($(shell dfu-programmer --version 2>&1 | grep -q 0.7; echo $$?),0)
 	dfu-programmer $(MCU) erase --force
 else
 	dfu-programmer $(MCU) erase
 endif
+
 	dfu-programmer $(MCU) flash $(TARGET).hex
-	dfu-programmer $(MCU) reset
+	dfu-programmer $(MCU) reset || true # ignore exit code
 	
 dfu-start:
 	dfu-programmer $(MCU) reset
@@ -447,11 +448,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