aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build_keyboard.mk18
-rw-r--r--data/schemas/keymap.jsonschema2
2 files changed, 10 insertions, 10 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index daef76080..37fa6852f 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -148,24 +148,24 @@ endif
148 148
149# Have we found a keymap.json? 149# Have we found a keymap.json?
150ifneq ("$(wildcard $(KEYMAP_JSON))", "") 150ifneq ("$(wildcard $(KEYMAP_JSON))", "")
151 KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c 151 KEYMAP_C := $(KEYMAP_OUTPUT)/src/keymap.c
152 KEYMAP_H := $(KEYMAP_OUTPUT)/config.h 152 KEYMAP_H := $(KEYMAP_OUTPUT)/src/config.h
153 153
154 # Load the keymap-level rules.mk if exists 154 # Load the keymap-level rules.mk if exists
155 -include $(KEYMAP_PATH)/rules.mk 155 -include $(KEYMAP_PATH)/rules.mk
156 156
157 # Load any rules.mk content from keymap.json 157 # Load any rules.mk content from keymap.json
158 INFO_RULES_MK = $(shell (QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/rules.mk) 158 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/src/rules.mk)
159 include $(INFO_RULES_MK) 159 include $(INFO_RULES_MK)
160 160
161# Add rules to enerate the keymap files - indentation here is important 161# Add rules to generate the keymap files - indentation here is important
162$(KEYMAP_OUTPUT)/keymap.c: $(KEYMAP_JSON) 162$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
163 (QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) 163 $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
164 164
165$(KEYMAP_OUTPUT)/config.h: $(KEYMAP_JSON) 165$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
166 (QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/config.h 166 $(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H)
167 167
168generated-files: $(KEYMAP_OUTPUT)/config.h $(KEYMAP_OUTPUT)/keymap.c 168generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
169 169
170endif 170endif
171 171
diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index 35c5b5c98..a4bdab966 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -4,7 +4,7 @@
4 "title": "Keymap Information", 4 "title": "Keymap Information",
5 "type": "object", 5 "type": "object",
6 "properties": { 6 "properties": {
7 "author": {"$ref": "qmk.definitions.v1#/text_identifier"}, 7 "author": {"type": "string"},
8 "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"}, 8 "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"},
9 "keymap": {"$ref": "qmk.definitions.v1#/text_identifier"}, 9 "keymap": {"$ref": "qmk.definitions.v1#/text_identifier"},
10 "layout": {"$ref": "qmk.definitions.v1#/layout_macro"}, 10 "layout": {"$ref": "qmk.definitions.v1#/layout_macro"},