diff options
| author | Zach White <skullydazed@gmail.com> | 2021-02-27 15:25:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 23:25:41 +0000 |
| commit | 0828d0f5c7e1f764688d85f07a70e023ebc66c7b (patch) | |
| tree | 4e42561d83a98c8a2b961623d87e37b0d8863061 | |
| parent | deaabff752dd75e75fc865091a5925bf7a5f3b19 (diff) | |
Fix compile errors (#12048)
* fix compile errors
* fix broken json files
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 2 | ||||
| -rw-r--r-- | keyboards/knobgoblin/info.json | 44 | ||||
| -rw-r--r-- | keyboards/naked64/info.json | 2 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 5 |
4 files changed, 26 insertions, 27 deletions
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index f5fb611bd2..749e8f1002 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -88,7 +88,7 @@ "oneOf": [ { "type": "string", - "enum": ["LAYOUT"] + "enum": ["LAYOUT", "LAYOUT_planck_1x2uC"] }, { "type": "string", diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json index f63e00b44a..3e350de90d 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/info.json @@ -8,32 +8,32 @@ "LAYOUT_ortho": { "layout": [ - {"Label": "F17", "x": 1, "y": 0}, - {"Label": "F18", "x": 2, "y": 0}, - {"Label": "F19", "x": 3, "y": 0}, - {"Label": "F20", "x": 4, "y": 0}, + {"label": "F17", "x": 1, "y": 0}, + {"label": "F18", "x": 2, "y": 0}, + {"label": "F19", "x": 3, "y": 0}, + {"label": "F20", "x": 4, "y": 0}, - {"Label": "F13", "x": 1, "y": 1}, - {"Label": "F14", "x": 2, "y": 1}, - {"Label": "F15", "x": 3, "y": 1}, - {"Label": "F16", "x": 4, "y": 1}, + {"label": "F13", "x": 1, "y": 1}, + {"label": "F14", "x": 2, "y": 1}, + {"label": "F15", "x": 3, "y": 1}, + {"label": "F16", "x": 4, "y": 1}, - {"Label": "F9", "x": 1, "y": 2}, - {"Label": "F10", "x": 2, "y": 2}, - {"Label": "F11", "x": 3, "y": 2}, - {"Label": "F12", "x": 4, "y": 2}, + {"label": "F9", "x": 1, "y": 2}, + {"label": "F10", "x": 2, "y": 2}, + {"label": "F11", "x": 3, "y": 2}, + {"label": "F12", "x": 4, "y": 2}, - {"Label": "K2", "x": 0, "y": 3}, - {"Label": "F5", "x": 1, "y": 3}, - {"Label": "F6", "x": 2, "y": 3}, - {"Label": "F7", "x": 3, "y": 3}, - {"Label": "F8", "x": 4, "y": 3}, + {"label": "K2", "x": 0, "y": 3}, + {"label": "F5", "x": 1, "y": 3}, + {"label": "F6", "x": 2, "y": 3}, + {"label": "F7", "x": 3, "y": 3}, + {"label": "F8", "x": 4, "y": 3}, - {"Label": "K1", "x": 0, "y": 4}, - {"Label": "F1", "x": 1, "y": 4}, - {"Label": "F2", "x": 2, "y": 4}, - {"Label": "F3", "x": 3, "y": 4}, - {"Label": "F4", "x": 4, "y": 4} + {"label": "K1", "x": 0, "y": 4}, + {"label": "F1", "x": 1, "y": 4}, + {"label": "F2", "x": 2, "y": 4}, + {"label": "F3", "x": 3, "y": 4}, + {"label": "F4", "x": 4, "y": 4} ] } diff --git a/keyboards/naked64/info.json b/keyboards/naked64/info.json index 17619187d8..a704be315d 100644 --- a/keyboards/naked64/info.json +++ b/keyboards/naked64/info.json @@ -74,8 +74,6 @@ ] }, "LAYOUT_with_setta21": { - "width": 21.5, - "height": 6.25, "layout": [ {"label":"pgup", "x":0.25, "y":0}, {"label":"ESC", "x":1.75, "y":0}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index cf5dc6640b..051459698f 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -454,8 +454,9 @@ def _find_all_layouts(info_data, keyboard): if these_layouts: layouts.update(these_layouts) - if these_aliases: - aliases.update(these_aliases) + for alias, alias_text in these_aliases.items(): + if alias_text in layouts: + aliases[alias] = alias_text return layouts, aliases |