summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-04-01 09:26:34 +0000
committerQMK Bot <hello@qmk.fm>2022-04-01 09:26:34 +0000
commitd0b33593b2c5e5810427fa8ab68291616e1fd1b0 (patch)
treeb3053e6a50638af83644a2b74d1855b866896d84
parentd75ae52fe6b61e66387d7073404ca52c62e9c33e (diff)
parent11db29bedb24acc6d8c8ab30e4fa7d80b208b023 (diff)
downloadqmk_firmware-d0b33593b2c5e5810427fa8ab68291616e1fd1b0.tar.gz
qmk_firmware-d0b33593b2c5e5810427fa8ab68291616e1fd1b0.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--data/schemas/definitions.jsonschema16
-rw-r--r--data/schemas/keyboard.jsonschema1
2 files changed, 17 insertions, 0 deletions
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 46aba52cbd..cca30af827 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -71,6 +71,22 @@
"type": "number",
"min": 0.25
},
+ "keyboard": {
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "converter/numeric_keypad_IIe",
+ "emptystring/NQG",
+ "maple_computing/christmas_tree/V2017"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^[0-9a-z][0-9a-z_/]*$"
+ }
+ ]
+ },
"mcu_pin_array": {
"type": "array",
"items": {"$ref": "#/mcu_pin"}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index a8b3d06933..adb63fd13e 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -5,6 +5,7 @@
"type": "object",
"properties": {
"keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
+ "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"},
"maintainer": {"$ref": "qmk.definitions.v1#/text_identifier"},
"manufacturer": {"$ref": "qmk.definitions.v1#/text_identifier"},
"url": {