X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Frules.mk;h=3c386b1f7f340a164ff91a7418b96011b04a03f0;hb=12e5a3a13eb86852ad58c131e28ba29c5f09bb2d;hp=860fc1a9310da970ebecba597c150802f522f37e;hpb=1c73e574f109a17566db99e399bdf86007488d2a;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 860fc1a9..3c386b1f 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -411,6 +411,9 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep
 	$(PROGRAM_CMD)
 
+dude: $(TARGET).hex
+	avrdude -p$(MCU) -cavr109 -b57600 -Uflash:w:$(TARGET).hex -P$(DEV)
+
 teensy: $(TARGET).hex
 	teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
@@ -420,14 +423,21 @@ flip: $(TARGET).hex
 	batchisp -hardware usb -device $(MCU) -operation start reset 0
 
 dfu: $(TARGET).hex
-ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
+	@echo -n dfu-programmer: waiting
+	@until dfu-programmer $(MCU) get bootloader-version > /dev/null 2>&1; do \
+		echo  -n "."; \
+		sleep 1; \
+	done
+	@echo
+
+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) erase
+
 	dfu-programmer $(MCU) flash $(TARGET).hex
-	dfu-programmer $(MCU) reset
+	dfu-programmer $(MCU) reset || true # ignore exit code
 	
 dfu-start:
 	dfu-programmer $(MCU) reset
@@ -441,11 +451,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