summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-03-04 17:06:15 +0000
committerGitHub <noreply@github.com>2022-03-04 18:06:15 +0100
commitc0185116d780cee4bf61c70be0221be2e8ce5962 (patch)
tree04483f6a27de52e584ebfbb14437d81bf9b2f401 /data
parent34ba7f1c18a6924f47947e76b32d7620411d1e7a (diff)
More validation of declared LAYOUT macro names (#16520)
Diffstat (limited to 'data')
-rw-r--r--data/schemas/definitions.jsonschema28
-rw-r--r--data/schemas/keyboard.jsonschema1
2 files changed, 28 insertions, 1 deletions
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 9fd503a108..46aba52cbd 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -33,7 +33,33 @@
"oneOf": [
{
"type": "string",
- "enum": ["LAYOUT", "LAYOUT_planck_1x2uC"]
+ "enum": [
+ "LAYOUT",
+ "LAYOUT_1x2uC",
+ "LAYOUT_1x2uL",
+ "LAYOUT_1x2uR",
+ "LAYOUT_2x2uC",
+ "LAYOUT_2x3uC",
+ "LAYOUT_625uC",
+ "LAYOUT_ANSI_DEFAULT",
+ "LAYOUT_JP",
+ "LAYOUT_ortho_3x12_1x2uC",
+ "LAYOUT_ortho_4x12_1x2uC",
+ "LAYOUT_ortho_4x12_1x2uL",
+ "LAYOUT_ortho_4x12_1x2uR",
+ "LAYOUT_ortho_5x12_1x2uC",
+ "LAYOUT_ortho_5x12_2x2uC",
+ "LAYOUT_ortho_5x14_1x2uC",
+ "LAYOUT_ortho_5x14_1x2uL",
+ "LAYOUT_ortho_5x14_1x2uR",
+ "LAYOUT_planck_1x2uC",
+ "LAYOUT_planck_1x2uL",
+ "LAYOUT_planck_1x2uR",
+ "LAYOUT_preonic_1x2uC",
+ "LAYOUT_preonic_1x2uL",
+ "LAYOUT_preonic_1x2uR",
+ "LAYOUT_reviung34_2uL"
+ ]
},
{
"type": "string",
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index fc0844a086..a8b3d06933 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -109,6 +109,7 @@
},
"layouts": {
"type": "object",
+ "propertyNames": {"$ref": "qmk.definitions.v1#/layout_macro"},
"additionalProperties": {
"type": "object",
"additionalProperties": false,