X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Frules.mk;h=978f3c06558a24ba65ade19948f6ebef388ce66f;hb=e3d7b50f63dfc71b5488928093f2d641589518b0;hp=987b580c170165bbf31186171478b43422ae9bb0;hpb=e6d1975ea95d262b9ce96634789ee2f71ba52af4;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 987b580c..978f3c06 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -421,19 +421,20 @@ flip: $(TARGET).hex
 
 dfu: $(TARGET).hex
 	@echo -n dfu-programmer: waiting
-	@until dfu-programmer atmega32u4 get bootloader-version > /dev/null 2>&1; do \
+	@until dfu-programmer $(MCU) get bootloader-version > /dev/null 2>&1; do \
 		echo  -n "."; \
 		sleep 1; \
 	done
 	@echo
 
-ifneq (, $(findstring 0.7, $(shell 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 --version 2>&1)))
 	dfu-programmer $(MCU) flash --eeprom $(TARGET).eep
-else
-	dfu-programmer $(MCU) flash-eeprom $(TARGET).eep
-endif
 	dfu-programmer $(MCU) reset