summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--tmk_core/avr.mk24
-rw-r--r--tmk_core/chibios.mk24
3 files changed, 49 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f513ed3af3..6511d7fc72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
*.eep
*.elf
*.hex
+*.qmk
!util/bootloader.hex
!quantum/tools/eeprom_reset.hex
*.log
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 0e014a412a..80e8b2be64 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -96,6 +96,30 @@ 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_CMD)
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index c804d237e2..4fa9fac2ef 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -180,6 +180,30 @@ EXTRALIBDIRS = $(RULESPATH)/ld
DFU_UTIL ?= dfu-util
+# Generate a .qmk for the QMK-FF
+qmk: $(BUILD_DIR)/$(TARGET).bin
+ zip $(TARGET).qmk -FSrj $(KEYMAP_PATH)/*
+ zip $(TARGET).qmk -u $<
+ printf "@ $<\n@=firmware.bin\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
+
dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter
$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin