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

1 files changed, 66 insertions, 302 deletions

diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json
index 8f114b1778..6b4ca022f7 100644
--- a/keyboards/delikeeb/vaneela/info.json
+++ b/keyboards/delikeeb/vaneela/info.json
@@ -2,315 +2,79 @@
     "keyboard_name": "Vaneela",
     "manufacturer": "noclew",
     "url": "http://www.keyboard-layout-editor.com/#/gists/be89ff3a761a44280296994d459bd0a9",
-    "maintainer": "qmk",
+    "maintainer": "noclew",
     "usb": {
         "vid": "0x9906",
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_5x12": {
             "layout": [
-                {
-                    "label": "`",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": ":)",
-                    "x": 11,
-                    "y": 0,
-                    "w": 1.5
-                },
-                {
-                    "label": "TAB",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "label": "BS",
-                    "x": 11,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "ESC",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 1.25,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.25,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.25,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.25,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.25,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.25,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.25,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.25,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.25,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 10.25,
-                    "y": 2
-                },
-                {
-                    "label": "ENTER",
-                    "x": 11.25,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "SHIFT",
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.5
-                },
-                {
-                    "label": "Z",
-                    "x": 1.5,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 2.5,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 3.5,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 4.5,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 5.5,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 6.5,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 7.5,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 8.5,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 9.5,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 10.5,
-                    "y": 3
-                },
-                {
-                    "label": "SHIFT",
-                    "x": 11.5,
-                    "y": 3
-                },
-                {
-                    "label": "CTRL",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "GUI",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "ALT",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "label": "LOWER",
-                    "x": 4,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "x": 6.25,
-                    "y": 4
-                },
-                {
-                    "label": "RAISE",
-                    "x": 7.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 8.5,
-                    "y": 4
-                },
-                {
-                    "x": 9.5,
-                    "y": 4
-                },
-                {
-                    "x": 10.5,
-                    "y": 4
-                },
-                {
-                    "x": 11.5,
-                    "y": 4
-                }
+                {"label":"`", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":":)", "x":11, "y":0, "w":1.5},
+
+                {"label":"TAB", "x":0, "y":1},
+                {"label":"Q", "x":1, "y":1},
+                {"label":"W", "x":2, "y":1},
+                {"label":"E", "x":3, "y":1},
+                {"label":"R", "x":4, "y":1},
+                {"label":"T", "x":5, "y":1},
+                {"label":"Y", "x":6, "y":1},
+                {"label":"U", "x":7, "y":1},
+                {"label":"I", "x":8, "y":1},
+                {"label":"O", "x":9, "y":1},
+                {"label":"P", "x":10, "y":1},
+                {"label":"BS", "x":11, "y":1, "w":1.5},
+
+                {"label":"ESC", "x":0, "y":2, "w":1.25},
+                {"label":"A", "x":1.25, "y":2},
+                {"label":"S", "x":2.25, "y":2},
+                {"label":"D", "x":3.25, "y":2},
+                {"label":"F", "x":4.25, "y":2},
+                {"label":"G", "x":5.25, "y":2},
+                {"label":"H", "x":6.25, "y":2},
+                {"label":"J", "x":7.25, "y":2},
+                {"label":"K", "x":8.25, "y":2},
+                {"label":"L", "x":9.25, "y":2},
+                {"label":";", "x":10.25, "y":2},
+                {"label":"ENTER", "x":11.25, "y":2, "w":1.25},
+
+                {"label":"SHIFT", "x":0, "y":3, "w":1.5},
+                {"label":"Z", "x":1.5, "y":3},
+                {"label":"X", "x":2.5, "y":3},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"V", "x":4.5, "y":3},
+                {"label":"B", "x":5.5, "y":3},
+                {"label":"N", "x":6.5, "y":3},
+                {"label":"M", "x":7.5, "y":3},
+                {"label":",", "x":8.5, "y":3},
+                {"label":".", "x":9.5, "y":3},
+                {"label":"/", "x":10.5, "y":3},
+                {"label":"SHIFT", "x":11.5, "y":3},
+
+                {"label":"CTRL", "x":0, "y":4},
+                {"label":"CTRL", "x":1, "y":4},
+                {"label":"GUI", "x":2, "y":4},
+                {"label":"ALT", "x":3, "y":4},
+                {"label":"LOWER", "x":4, "y":4, "w":1.25},
+                {"label":"SPACE", "x":5.25, "y":4},
+                {"label":"SPACE", "x":6.25, "y":4},
+                {"label":"RAISE", "x":7.25, "y":4, "w":1.25},
+                {"label":"LEFT", "x":8.5, "y":4},
+                {"label":"DOWN", "x":9.5, "y":4},
+                {"label":"UP", "x":10.5, "y":4},
+                {"label":"RIGHT", "x":11.5, "y":4}
             ]
         }
     }