diff options
| -rw-r--r-- | tmk_core/avr.mk | 24 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 24 |
2 files changed, 0 insertions, 48 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 19fd05c56f..c2853ac410 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -98,30 +98,6 @@ 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 check-size $(PROGRAM_CMD) diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 04e77a8182..a7954be5bb 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -243,30 +243,6 @@ EXTRALIBDIRS = $(RULESPATH)/ld DFU_UTIL ?= dfu-util ST_LINK_CLI ?= st-link_cli -# 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 - define EXEC_DFU_UTIL until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ |