X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Frules.mk;h=978f3c06558a24ba65ade19948f6ebef388ce66f;hb=4e83400fc6f67a0559cf343ba5846b505c35fd30;hp=ca933826b8c8606fab9fb952572ccc5a54be7f94;hpb=c72981f1e72584af7fc0514feef79b8112622234;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index ca933826..978f3c06 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -427,9 +427,14 @@ dfu: $(TARGET).hex
 	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) flash $(TARGET).hex
-	dfu-programmer $(MCU) reset
+	dfu-programmer $(MCU) reset || true # ignore exit code
 	
 dfu-start:
 	dfu-programmer $(MCU) reset