~ruther/qmk_firmware

0828d0f5c7e1f764688d85f07a70e023ebc66c7b — Zach White 4 years ago deaabff 
Fix compile errors (#12048)

* fix compile errors

* fix broken json files
patch browse .tar.gz 
4 files changed, 26 insertions(+), 27 deletions(-)

M data/schemas/keyboard.jsonschema
M keyboards/knobgoblin/info.json
M keyboards/naked64/info.json
M lib/python/qmk/info.py

M data/schemas/keyboard.jsonschema => data/schemas/keyboard.jsonschema +1 -1
@@ 88,7 88,7 @@
                "oneOf": [
                    {
                        "type": "string",
                        "enum": ["LAYOUT"]
                        "enum": ["LAYOUT", "LAYOUT_planck_1x2uC"]
                    },
                    {
                        "type": "string",


M keyboards/knobgoblin/info.json => keyboards/knobgoblin/info.json +22 -22
@@ 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}                

            ]
        }


M keyboards/naked64/info.json => keyboards/naked64/info.json +0 -2
@@ 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},


M lib/python/qmk/info.py => lib/python/qmk/info.py +3 -2
@@ 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