Skip to content

Commit 0828d0f

Browse files
authored
Fix compile errors (#12048)
* fix compile errors * fix broken json files
1 parent deaabff commit 0828d0f

File tree

4 files changed

+26
-27
lines changed

4 files changed

+26
-27
lines changed

data/schemas/keyboard.jsonschema

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"oneOf": [
8989
{
9090
"type": "string",
91-
"enum": ["LAYOUT"]
91+
"enum": ["LAYOUT", "LAYOUT_planck_1x2uC"]
9292
},
9393
{
9494
"type": "string",

keyboards/knobgoblin/info.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@
88
"LAYOUT_ortho": {
99
"layout": [
1010

11-
{"Label": "F17", "x": 1, "y": 0},
12-
{"Label": "F18", "x": 2, "y": 0},
13-
{"Label": "F19", "x": 3, "y": 0},
14-
{"Label": "F20", "x": 4, "y": 0},
11+
{"label": "F17", "x": 1, "y": 0},
12+
{"label": "F18", "x": 2, "y": 0},
13+
{"label": "F19", "x": 3, "y": 0},
14+
{"label": "F20", "x": 4, "y": 0},
1515

16-
{"Label": "F13", "x": 1, "y": 1},
17-
{"Label": "F14", "x": 2, "y": 1},
18-
{"Label": "F15", "x": 3, "y": 1},
19-
{"Label": "F16", "x": 4, "y": 1},
16+
{"label": "F13", "x": 1, "y": 1},
17+
{"label": "F14", "x": 2, "y": 1},
18+
{"label": "F15", "x": 3, "y": 1},
19+
{"label": "F16", "x": 4, "y": 1},
2020

21-
{"Label": "F9", "x": 1, "y": 2},
22-
{"Label": "F10", "x": 2, "y": 2},
23-
{"Label": "F11", "x": 3, "y": 2},
24-
{"Label": "F12", "x": 4, "y": 2},
21+
{"label": "F9", "x": 1, "y": 2},
22+
{"label": "F10", "x": 2, "y": 2},
23+
{"label": "F11", "x": 3, "y": 2},
24+
{"label": "F12", "x": 4, "y": 2},
2525

26-
{"Label": "K2", "x": 0, "y": 3},
27-
{"Label": "F5", "x": 1, "y": 3},
28-
{"Label": "F6", "x": 2, "y": 3},
29-
{"Label": "F7", "x": 3, "y": 3},
30-
{"Label": "F8", "x": 4, "y": 3},
26+
{"label": "K2", "x": 0, "y": 3},
27+
{"label": "F5", "x": 1, "y": 3},
28+
{"label": "F6", "x": 2, "y": 3},
29+
{"label": "F7", "x": 3, "y": 3},
30+
{"label": "F8", "x": 4, "y": 3},
3131

32-
{"Label": "K1", "x": 0, "y": 4},
33-
{"Label": "F1", "x": 1, "y": 4},
34-
{"Label": "F2", "x": 2, "y": 4},
35-
{"Label": "F3", "x": 3, "y": 4},
36-
{"Label": "F4", "x": 4, "y": 4}
32+
{"label": "K1", "x": 0, "y": 4},
33+
{"label": "F1", "x": 1, "y": 4},
34+
{"label": "F2", "x": 2, "y": 4},
35+
{"label": "F3", "x": 3, "y": 4},
36+
{"label": "F4", "x": 4, "y": 4}
3737

3838
]
3939
}

keyboards/naked64/info.json

-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@
7474
]
7575
},
7676
"LAYOUT_with_setta21": {
77-
"width": 21.5,
78-
"height": 6.25,
7977
"layout": [
8078
{"label":"pgup", "x":0.25, "y":0},
8179
{"label":"ESC", "x":1.75, "y":0},

lib/python/qmk/info.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,9 @@ def _find_all_layouts(info_data, keyboard):
454454
if these_layouts:
455455
layouts.update(these_layouts)
456456

457-
if these_aliases:
458-
aliases.update(these_aliases)
457+
for alias, alias_text in these_aliases.items():
458+
if alias_text in layouts:
459+
aliases[alias] = alias_text
459460

460461
return layouts, aliases
461462

0 commit comments

Comments
 (0)