mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-22 11:30:30 +08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
386d19b55f
|
@ -33,7 +33,33 @@
|
||||||
"oneOf": [
|
"oneOf": [
|
||||||
{
|
{
|
||||||
"type": "string",
|
"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",
|
"type": "string",
|
||||||
|
|
|
@ -109,6 +109,7 @@
|
||||||
},
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
"propertyNames": {"$ref": "qmk.definitions.v1#/layout_macro"},
|
||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|
Loading…
Reference in a new issue