diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-28 18:24:41 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-28 18:24:41 +0000 |
| commit | ac33b7b0b3ed6a7679bdc9c0edc88f5e0f832332 (patch) | |
| tree | 3ce5089ae799ff9f40864e321ad5cae4524267ca /data | |
| parent | 10a84d6b93ad459560e5f21db315fb49921249bb (diff) | |
| parent | d4a6ee1cad73ab88ac3faecf2d40204c8e706b5a (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'data')
| -rw-r--r-- | data/schemas/api_keyboard.jsonschema | 1 | ||||
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 46 | ||||
| -rw-r--r-- | data/schemas/keymap.jsonschema | 2 |
3 files changed, 35 insertions, 14 deletions
diff --git a/data/schemas/api_keyboard.jsonschema b/data/schemas/api_keyboard.jsonschema index d638658a1d..6a30b5d990 100644 --- a/data/schemas/api_keyboard.jsonschema +++ b/data/schemas/api_keyboard.jsonschema @@ -9,7 +9,6 @@ "properties": { "url": {"type": "string"} } - }, "parse_errors": {"$ref": "qmk.definitions.v1#/string_array"}, "parse_warnings": {"$ref": "qmk.definitions.v1#/string_array"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 77c5a584d4..0308f45116 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -76,7 +76,7 @@ "type": "string", "enum": ["BluefruitLE", "RN42"] }, - "lto": {"type": "boolean"}, + "lto": {"type": "boolean"} } }, "board": { @@ -86,7 +86,29 @@ }, "bootloader": { "type": "string", - "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2", "rp2040"], + "enum": [ + "atmel-dfu", + "bootloadhid", + "bootloadHID", + "caterina", + "custom", + "gd32v-dfu", + "halfkay", + "kiibohd", + "lufa-dfu", + "lufa-ms", + "md-boot", + "qmk-dfu", + "qmk-hid", + "rp2040", + "stm32-dfu", + "stm32duino", + "tinyuf2", + "unknown", + "usbasploader", + "USBasp", + "wb32-dfu" + ] }, "bootloader_instructions": { "type": "string", @@ -104,7 +126,7 @@ "type": "string", "enum": ["bin", "hex", "uf2"] }, - "lto": {"type": "boolean"}, + "lto": {"type": "boolean"} } }, "diode_direction": { @@ -119,8 +141,8 @@ "enabled": {"type": "boolean"}, "both_shifts_turns_on": {"type": "boolean"}, "double_tap_shift_turns_on": {"type": "boolean"}, - "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - }, + "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} + } }, "combo": { "type": "object", @@ -228,10 +250,10 @@ "type": "object", "properties": { "enabled": {"type": "boolean"}, - "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} - "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} - "max_speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} - "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} + "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "max_speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, + "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "wheel_delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} } }, @@ -458,7 +480,7 @@ "retro_per_key": {"type": "boolean"}, "term": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "term_per_key": {"type": "boolean"}, - "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"} } }, "usb": { @@ -482,7 +504,7 @@ } }, "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "wait_for": {"type": "boolean"}, + "wait_for": {"type": "boolean"} } }, "qmk": { @@ -491,7 +513,7 @@ "properties": { "keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, + "tap_capslock_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"} } }, "qmk_lufa_bootloader": { diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 92a1ce533d..0a4fb5d453 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -31,7 +31,7 @@ "properties": { "action": { "type": "string", - "enum": ['beep', 'delay', 'down', 'tap', 'up'] + "enum": ["beep", "delay", "down", "tap", "up"] }, "keycodes": { "type": "array", |