ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-08-28 18:24:41 +00:00
commit ac33b7b0b3
3 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/schemas/api_keyboard.jsonschema
View file

@ -9,7 +9,6 @@
"properties": { "properties": {
"url": {"type": "string"} "url": {"type": "string"}
} }
}, },
"parse_errors": {"$ref": "qmk.definitions.v1#/string_array"}, "parse_errors": {"$ref": "qmk.definitions.v1#/string_array"},
"parse_warnings": {"$ref": "qmk.definitions.v1#/string_array"}, "parse_warnings": {"$ref": "qmk.definitions.v1#/string_array"},

46
data/schemas/keyboard.jsonschema
View file

@ -76,7 +76,7 @@
"type": "string", "type": "string",
"enum": ["BluefruitLE", "RN42"] "enum": ["BluefruitLE", "RN42"]
}, },
"lto": {"type": "boolean"}, "lto": {"type": "boolean"}
} }
}, },
"board": { "board": {
@ -86,7 +86,29 @@
}, },
"bootloader": { "bootloader": {
"type": "string", "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": { "bootloader_instructions": {
"type": "string", "type": "string",
@ -104,7 +126,7 @@
"type": "string", "type": "string",
"enum": ["bin", "hex", "uf2"] "enum": ["bin", "hex", "uf2"]
}, },
"lto": {"type": "boolean"}, "lto": {"type": "boolean"}
} }
}, },
"diode_direction": { "diode_direction": {
@ -119,8 +141,8 @@
"enabled": {"type": "boolean"}, "enabled": {"type": "boolean"},
"both_shifts_turns_on": {"type": "boolean"}, "both_shifts_turns_on": {"type": "boolean"},
"double_tap_shift_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": { "combo": {
"type": "object", "type": "object",
@ -228,10 +250,10 @@
"type": "object", "type": "object",
"properties": { "properties": {
"enabled": {"type": "boolean"}, "enabled": {"type": "boolean"},
"delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} "delay": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"} "interval": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"max_speed": {"$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"} "time_to_max": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"wheel_delay": {"$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"}, "retro_per_key": {"type": "boolean"},
"term": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "term": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"term_per_key": {"type": "boolean"}, "term_per_key": {"type": "boolean"},
"toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "toggle": {"$ref": "qmk.definitions.v1#/unsigned_int"}
} }
}, },
"usb": { "usb": {
@ -482,7 +504,7 @@
} }
}, },
"suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"wait_for": {"type": "boolean"}, "wait_for": {"type": "boolean"}
} }
}, },
"qmk": { "qmk": {
@ -491,7 +513,7 @@
"properties": { "properties": {
"keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "keys_per_scan": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"tap_keycode_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "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": { "qmk_lufa_bootloader": {

2
data/schemas/keymap.jsonschema
View file

@ -31,7 +31,7 @@
"properties": { "properties": {
"action": { "action": {
"type": "string", "type": "string",
"enum": ['beep', 'delay', 'down', 'tap', 'up'] "enum": ["beep", "delay", "down", "tap", "up"]
}, },
"keycodes": { "keycodes": {
"type": "array", "type": "array",