X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Favr.mk;h=0e014a412aa7957be40f33e03b9f27e654266485;hb=371922ad61a8fe7a3fc591949a1ad81f63be02c8;hp=95aa973aa916845333c1ba34983e9e59085979ad;hpb=81d7e7d4c8b99e032ce9423da56dba46f8bce18f;p=qmk_firmware.git diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 95aa973aa..0e014a412 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -146,10 +146,10 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep avrdude: $(BUILD_DIR)/$(TARGET).hex if grep -q -s Microsoft /proc/version; then \ - echo 'ERROR: Pro Micros can not be flashed within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \ + 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 Pro Micro port, reset your Pro Micro now.\c"; \ + echo "Detecting USB port, reset your controller now.\c"; \ while [ -z $$USB ]; do \ sleep 1; \ echo ".\c"; \ @@ -157,15 +157,18 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ done; \ echo ""; \ - echo "Detected Pro Micro port at $$USB"; \ + echo "Detected controller on USB port at $$USB"; \ sleep 1; \ avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ fi # Convert hex to bin. -flashbin: $(BUILD_DIR)/$(TARGET).hex +bin: $(BUILD_DIR)/$(TARGET).hex $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; + +# copy bin to FLASH.bin +flashbin: bin $(COPY) $(BUILD_DIR)/$(TARGET).bin FLASH.bin; # Generate avr-gdb config/init file which does the following: