rule.mk: Add dfu-programmer version check again

[max/tmk_keyboard.git] / tmk_core / rules.mk

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index ca933826b8c8606fab9fb952572ccc5a54be7f94..978f3c06558a24ba65ade19948f6ebef388ce66f 100644 (file)
--- 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