]> git.donarmstrong.com Git - qmk_firmware.git/blobdiff - tmk_core/avr.mk
Usbasploader bootloader option addition (#6304)
[qmk_firmware.git] / tmk_core / avr.mk
index 0d0eec3bf34e85d557ee2a90931ce8af2568ea80..670e141bfdacefb53a05f90cfa5ad1e9ea03419e 100644 (file)
@@ -6,10 +6,10 @@ CC = avr-gcc
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 SIZE = avr-size
-AR = avr-ar rcs
+AR = avr-ar
 NM = avr-nm
 HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
-EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) 
+EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 BIN =
 
 COMMON_VPATH += $(DRIVER_PATH)/avr
@@ -96,28 +96,53 @@ ifndef TEENSY_LOADER_CLI
     endif
 endif
 
+# Generate a .qmk for the QMK-FF
+qmk: $(BUILD_DIR)/$(TARGET).hex
+       zip $(TARGET).qmk -FSrj $(KEYMAP_PATH)/*
+       zip $(TARGET).qmk -u $<
+       printf "@ $<\n@=firmware.hex\n" | zipnote -w $(TARGET).qmk
+       printf "{\n  \"generated\": \"%s\"\n}" "$$(date)" > $(BUILD_DIR)/$(TARGET).json
+       if [ -f $(KEYBOARD_PATH_5)/info.json ]; then \
+               jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_5)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \
+       fi
+       if [ -f $(KEYBOARD_PATH_4)/info.json ]; then \
+               jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_4)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \
+       fi
+       if [ -f $(KEYBOARD_PATH_3)/info.json ]; then \
+               jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_3)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \
+       fi
+       if [ -f $(KEYBOARD_PATH_2)/info.json ]; then \
+               jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_2)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \
+       fi
+       if [ -f $(KEYBOARD_PATH_1)/info.json ]; then \
+               jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_1)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \
+       fi
+       zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json
+       printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
+
 # Program the device.
-program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
+program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep check-size
        $(PROGRAM_CMD)
 
-teensy: $(BUILD_DIR)/$(TARGET).hex
+teensy: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
        $(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
-       
-BATCHISP ?= batchisp 
 
-flip: $(BUILD_DIR)/$(TARGET).hex
+BATCHISP ?= batchisp
+
+flip: $(BUILD_DIR)/$(TARGET).hex check-size
        $(BATCHISP) -hardware usb -device $(MCU) -operation erase f
        $(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
        $(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
-       
+
 DFU_PROGRAMMER ?= dfu-programmer
+GREP ?= grep
 
-dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter
+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 ;\
        done
-       if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\
+       if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
                $(DFU_PROGRAMMER) $(MCU) erase --force;\
        else\
                $(DFU_PROGRAMMER) $(MCU) erase;\
@@ -137,32 +162,101 @@ flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
        $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
 
 dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
-       if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\
+       if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
                $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
        else\
                $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\
        fi
        $(DFU_PROGRAMMER) $(MCU) reset
 
-avrdude: $(BUILD_DIR)/$(TARGET).hex
-       ls /dev/tty* > /tmp/1; \
-       echo "Detecting Pro Micro port, reset your Pro Micro now.\c"; \
-       while [ -z $$USB ]; do \
-         sleep 1; \
-         echo ".\c"; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       echo ""; \
-       echo "Detected Pro Micro port at $$USB"; \
-       sleep 1; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
+dfu-split-left: $(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 ;\
+       done
+       if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
+               $(DFU_PROGRAMMER) $(MCU) erase --force;\
+               $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(QUANTUM_PATH)/split_common/eeprom-lefthand.eep;\
+       else\
+               $(DFU_PROGRAMMER) $(MCU) erase;\
+               $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/eeprom-lefthand.eep;\
+       fi
+       $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
+       $(DFU_PROGRAMMER) $(MCU) reset
+
+dfu-split-right: $(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 ;\
+       done
+       if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
+               $(DFU_PROGRAMMER) $(MCU) erase --force;\
+               $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(QUANTUM_PATH)/split_common/eeprom-righthand.eep;\
+       else\
+               $(DFU_PROGRAMMER) $(MCU) erase;\
+               $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/eeprom-righthand.eep;\
+       fi
+       $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
+       $(DFU_PROGRAMMER) $(MCU) reset
+
+define EXEC_AVRDUDE
+       USB= ;\
+       if $(GREP) -q -s Microsoft /proc/version; then \
+               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 \
+               printf "Detecting USB port, reset your controller now."; \
+               ls /dev/tty* > /tmp/1; \
+               while [ -z $$USB ]; do \
+                       sleep 0.5; \
+                       printf "."; \
+                       ls /dev/tty* > /tmp/2; \
+                       USB=`comm -13 /tmp/1 /tmp/2 | $(GREP) -o '/dev/tty.*'`; \
+                       mv /tmp/2 /tmp/1; \
+               done; \
+               echo ""; \
+               echo "Device $$USB has appeared; assuming it is the controller."; \
+               if $(GREP) -q -s 'MINGW\|MSYS' /proc/version; then \
+                       USB=`echo "$$USB" | perl -pne 's/\/dev\/ttyS(\d+)/COM.($$1+1)/e'`; \
+                       echo "Remapped MSYS2 USB port to $$USB"; \
+                       sleep 1; \
+               else \
+                       printf "Waiting for $$USB to become writable."; \
+                       while [ ! -w "$$USB" ]; do sleep 0.5; printf "."; done; echo ""; \
+               fi; \
+               if [ -z "$(1)" ]; then \
+                       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \
+               else \
+                       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex -U eeprom:w:$(QUANTUM_PATH)/split_common/$(1); \
+               fi \
+       fi
+endef
+
+avrdude: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+       $(call EXEC_AVRDUDE)
+
+avrdude-loop: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+       while true; do \
+               $(call EXEC_AVRDUDE) ; \
+       done
+
+avrdude-split-left: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+       $(call EXEC_AVRDUDE,eeprom-lefthand.eep)
+
+avrdude-split-right: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+       $(call EXEC_AVRDUDE,eeprom-righthand.eep)
+
+usbasp: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+       avrdude -p $(MCU) -c usbasp -U flash:w:$(BUILD_DIR)/$(TARGET).hex
+
 
 # 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) $(BUILD_DIR)/$(TARGET).bin FLASH.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:
 #     define the reset signal, load the target file, connect to target, and set
@@ -213,3 +307,15 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf
        @$(SECHO) $(MSG_EXTENDED_COFF) $(BUILD_DIR)/$(TARGET).cof
        $(COFFCONVERT) -O coff-ext-avr $< $(BUILD_DIR)/$(TARGET).cof
 
+bootloader:
+       make -C lib/lufa/Bootloaders/DFU/ clean
+       $(TMK_DIR)/make_dfu_header.sh $(ALL_CONFIGS)
+       make -C lib/lufa/Bootloaders/DFU/
+       printf "BootloaderDFU.hex copied to $(TARGET)_bootloader.hex\n"
+       cp lib/lufa/Bootloaders/DFU/BootloaderDFU.hex $(TARGET)_bootloader.hex
+
+production: $(BUILD_DIR)/$(TARGET).hex bootloader cpfirmware
+       @cat $(BUILD_DIR)/$(TARGET).hex | awk '/^:00000001FF/ == 0' > $(TARGET)_production.hex
+       @cat $(TARGET)_bootloader.hex >> $(TARGET)_production.hex
+       echo "File sizes:"
+       $(SIZE) $(TARGET).hex $(TARGET)_bootloader.hex $(TARGET)_production.hex