Adds .qmk file type as a target for QMK Toolbox (#1084)

* adds .qmk file type as a target

* adds info.json with vendor and product

* add files for qmk info script

* add layout file for planck

* ignore .qmk files

* more settings

* update rules for avr and chibios

* update .qmk generation for info.json and inheritence

diff --git a/.gitignore b/.gitignore
index f513ed3af3a5dd6329198e6c0666e045968892fa..6511d7fc72a560b7c81054daa3d05eb255eca3f6 100644 (file)
--- 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 0e014a412aa7957be40f33e03b9f27e654266485..80e8b2be646f75dc6fdfc23997cb2bb4c6efa64c 100644 (file)
--- 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 c804d237e2822a2ebd59c6fba83bbc358ad2494f..4fa9fac2effe027e722a6e0d0230477f839b0a0e 100644 (file)
--- 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