Always copy the firmware file to the root qmk_firmware directory (#2314)

[qmk_firmware.git] / tmk_core / avr.mk

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index c083f6b72d6c9a6075649960b3ffc8c18a4b0ae3..24722736ee9f1ed3662cc48f0790d79f0df6eda9 100644 (file)
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -136,7 +136,7 @@ flip: $(BUILD_DIR)/$(TARGET).hex check-size
        
 DFU_PROGRAMMER ?= dfu-programmer
 
-dfu: $(BUILD_DIR)/$(TARGET).hex check-size
+dfu: $(BUILD_DIR)/$(TARGET).hex cpfirmware check-size
        until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\
                echo "Error: Bootloader not found. Trying again in 5s." ;\
                sleep 5 ;\
@@ -173,10 +173,10 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
                echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
        else \
                ls /dev/tty* > /tmp/1; \
-               echo "Detecting USB port, reset your controller now.\c"; \
+               echo -e "Detecting USB port, reset your controller now.\c"; \
                while [ -z $$USB ]; do \
                        sleep 1; \
-                       echo ".\c"; \
+                       echo -e ".\c"; \
                        ls /dev/tty* > /tmp/2; \
                        USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
                done; \