X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=tmk_core%2Frules.mk;h=0d0b6afbb125fc72067da8758956cb9b770cc6bc;hb=42199c90f8475ca8474a298b349057994a1beb49;hp=987b580c170165bbf31186171478b43422ae9bb0;hpb=4703afac2fdfc50bd81afcd2ccadce71569fcf98;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 987b580c..0d0b6afb 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -421,13 +421,13 @@ 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)))
+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