X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Frules.mk;h=0d0b6afbb125fc72067da8758956cb9b770cc6bc;hb=8a92f254e1d87007db2cc0d746a3c2436c91cbe3;hp=a0a7c3e5ce01aacb59cae8b2919e15a7f9cf060e;hpb=e5acff0312ec74ce6ced2a3f357a25ec8ff5d4db;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a0a7c3e5..0d0b6afb 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -420,11 +420,14 @@ flip: $(TARGET).hex
 	batchisp -hardware usb -device $(MCU) -operation start reset 0
 
 dfu: $(TARGET).hex
-	@until dfu-programmer atmega32u4 get bootloader-version > /dev/null 2>&1; do \
+	@echo -n dfu-programmer: waiting
+	@until dfu-programmer $(MCU) get bootloader-version > /dev/null 2>&1; do \
 		echo  -n "."; \
 		sleep 1; \
 	done
-ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
+	@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
@@ -444,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