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

1 files changed, 85 insertions, 364 deletions

diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index 92900051a1..7f13f3eaa8 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -1,365 +1,86 @@
 {
-   "keyboard_name":"Neito",
-   "url":"olli.works",
-   "maintainer":"Oliver Granlund",
-   "width":20.69,
-   "height":14.755,
-   "layouts":{
-      "LAYOUT":{
-         "layout":[
-            {
-               "label":"0,7",
-               "x":19.19,
-               "y":0
-            },
-            {
-               "label":"0,1",
-               "x":2.62,
-               "y":0.19
-            },
-            {
-               "label":"1,5",
-               "x":14.94,
-               "y":0.19
-            },
-            {
-               "label":"0,0",
-               "x":0.62,
-               "y":0.25
-            },
-            {
-               "label":"1,0",
-               "x":1.62,
-               "y":0.25
-            },
-            {
-               "label":"0,6",
-               "x":15.94,
-               "y":0.25
-            },
-            {
-               "label":"1,6",
-               "x":16.94,
-               "y":0.25,
-               "w":2
-            },
-            {
-               "label":"1,1",
-               "x":4,
-               "y":0.44
-            },
-            {
-               "label":"0,2",
-               "x":5,
-               "y":0.44
-            },
-            {
-               "label":"1,2",
-               "x":6,
-               "y":0.44
-            },
-            {
-               "label":"0,3",
-               "x":7,
-               "y":0.44
-            },
-            {
-               "label":"1,3",
-               "x":10.25,
-               "y":0.44
-            },
-            {
-               "label":"0,4",
-               "x":11.25,
-               "y":0.44
-            },
-            {
-               "label":"1,4",
-               "x":12.25,
-               "y":0.44
-            },
-            {
-               "label":"0,5",
-               "x":13.25,
-               "y":0.44
-            },
-            {
-               "label":"2,7",
-               "x":19.44,
-               "y":1
-            },
-            {
-               "label":"2,0",
-               "x":0.43,
-               "y":1.25,
-               "w":1.5
-            },
-            {
-               "label":"3,0",
-               "x":1.93,
-               "y":1.25
-            },
-            {
-               "label":"3,5",
-               "x":15.69,
-               "y":1.25
-            },
-            {
-               "label":"2,6",
-               "x":16.69,
-               "y":1.25
-            },
-            {
-               "label":"3,6",
-               "x":17.94,
-               "y":1.25,
-               "w":1.25,
-               "h":2
-            },
-            {
-               "label":"2,1",
-               "x":3.5,
-               "y":1.44
-            },
-            {
-               "label":"3,1",
-               "x":4.5,
-               "y":1.44
-            },
-            {
-               "label":"2,2",
-               "x":5.5,
-               "y":1.44
-            },
-            {
-               "label":"3,2",
-               "x":6.5,
-               "y":1.44
-            },
-            {
-               "label":"2,3",
-               "x":9.75,
-               "y":1.44
-            },
-            {
-               "label":"3,3",
-               "x":10.75,
-               "y":1.44
-            },
-            {
-               "label":"2,4",
-               "x":11.75,
-               "y":1.44
-            },
-            {
-               "label":"3,4",
-               "x":12.75,
-               "y":1.44
-            },
-            {
-               "label":"2,5",
-               "x":13.75,
-               "y":1.44
-            },
-            {
-               "label":"4,7",
-               "x":19.69,
-               "y":2.0
-            },
-            {
-               "label":"4,0",
-               "x":0.18,
-               "y":2.25,
-               "w":1.75
-            },
-            {
-               "label":"5,0",
-               "x":1.93,
-               "y":2.25
-            },
-            {
-               "label":"4,5",
-               "x":14.94,
-               "y":2.25
-            },
-            {
-               "label":"5,5",
-               "x":15.94,
-               "y":2.25
-            },
-            {
-               "label":"4,6",
-               "x":16.94,
-               "y":2.25
-            },
-            {
-               "label":"4,1",
-               "x":3.75,
-               "y":2.44
-            },
-            {
-               "label":"5,1",
-               "x":4.75,
-               "y":2.44
-            },
-            {
-               "label":"4,2",
-               "x":5.75,
-               "y":2.44
-            },
-            {
-               "label":"5,2",
-               "x":6.75,
-               "y":2.44
-            },
-            {
-               "label":"4,3",
-               "x":10,
-               "y":2.44
-            },
-            {
-               "label":"5,3",
-               "x":11,
-               "y":2.44
-            },
-            {
-               "label":"4,4",
-               "x":12,
-               "y":2.44
-            },
-            {
-               "label":"5,4",
-               "x":13,
-               "y":2.44
-            },
-            {
-               "label":"6,0",
-               "x":0,
-               "y":3.25,
-               "w":1.25
-            },
-            {
-               "label":"8,0",
-               "x":1.25,
-               "y":3.25
-            },
-            {
-               "label":"7,0",
-               "x":2.25,
-               "y":3.25
-            },
-            {
-               "label":"6,5",
-               "x":15.44,
-               "y":3.25
-            },
-            {
-               "label":"6,6",
-               "x":16.44,
-               "y":3.25,
-               "w":1.75
-            },
-            {
-               "label":"6,1",
-               "x":4.25,
-               "y":3.44
-            },
-            {
-               "label":"7,1",
-               "x":5.25,
-               "y":3.44
-            },
-            {
-               "label":"6,2",
-               "x":6.25,
-               "y":3.44
-            },
-            {
-               "label":"7,2",
-               "x":7.25,
-               "y":3.44
-            },
-            {
-               "label":"8,3",
-               "x":9.25,
-               "y":3.44
-            },
-            {
-               "label":"6,3",
-               "x":10.25,
-               "y":3.44
-            },
-            {
-               "label":"7,3",
-               "x":11.25,
-               "y":3.44
-            },
-            {
-               "label":"6,4",
-               "x":12.25,
-               "y":3.44
-            },
-            {
-               "label":"7,4",
-               "x":13.25,
-               "y":3.44
-            },
-            {
-               "label":"7,6",
-               "x":18.44,
-               "y":3.5
-            },
-            {
-               "label":"9,0",
-               "x":0,
-               "y":4.25,
-               "w":1.5
-            },
-            {
-               "label":"8,1",
-               "x":4.25,
-               "y":4.44,
-               "w":1.5
-            },
-            {
-               "label":"8,2",
-               "x":5.75,
-               "y":4.44,
-               "w":2
-            },
-            {
-               "label":"9,2",
-               "x":7.75,
-               "y":4.44
-            },
-            {
-               "label":"9,3",
-               "x":9.75,
-               "y":4.44,
-               "w":2.75
-            },
-            {
-               "label":"8,4",
-               "x":12.5,
-               "y":4.44,
-               "w":1.5
-            },
-            {
-               "label":"8,6",
-               "x":17.44,
-               "y":4.5
-            },
-            {
-               "label":"9,6",
-               "x":18.44,
-               "y":4.5
-            },
-            {
-               "label":"8,7",
-               "x":19.44,
-               "y":4.5
-            }
-         ]
-      }
-   }
-}
\ No newline at end of file
+    "keyboard_name": "Neito",
+    "url": "olli.works",
+    "maintainer": "Oliver Granlund",
+    "width": 20.69,
+    "height": 14.755,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0.62, "y":0.25},
+                {"label":"1,0", "x":1.62, "y":0.25},
+                {"label":"0,1", "x":2.62, "y":0.19},
+                {"label":"1,1", "x":4, "y":0.44},
+                {"label":"0,2", "x":5, "y":0.44},
+                {"label":"1,2", "x":6, "y":0.44},
+                {"label":"0,3", "x":7, "y":0.44},
+                {"label":"1,3", "x":10.25, "y":0.44},
+                {"label":"0,4", "x":11.25, "y":0.44},
+                {"label":"1,4", "x":12.25, "y":0.44},
+                {"label":"0,5", "x":13.25, "y":0.44},
+                {"label":"1,5", "x":14.94, "y":0.19},
+                {"label":"0,6", "x":15.94, "y":0.25},
+                {"label":"1,6", "x":16.94, "y":0.25, "w":2},
+                {"label":"0,7", "x":19.19, "y":0},
+
+
+                {"label":"2,0", "x":0.43, "y":1.25, "w":1.5},
+                {"label":"3,0", "x":1.93, "y":1.25},
+                {"label":"2,1", "x":3.5, "y":1.44},
+                {"label":"3,1", "x":4.5, "y":1.44},
+                {"label":"2,2", "x":5.5, "y":1.44},
+                {"label":"3,2", "x":6.5, "y":1.44},
+                {"label":"2,3", "x":9.75, "y":1.44},
+                {"label":"3,3", "x":10.75, "y":1.44},
+                {"label":"2,4", "x":11.75, "y":1.44},
+                {"label":"3,4", "x":12.75, "y":1.44},
+                {"label":"2,5", "x":13.75, "y":1.44},
+                {"label":"3,5", "x":15.69, "y":1.25},
+                {"label":"2,6", "x":16.69, "y":1.25},
+                {"label":"3,6", "x":17.94, "y":1.25, "w":1.25, "h":2},
+                {"label":"2,7", "x":19.44, "y":1},
+
+                {"label":"4,0", "x":0.18, "y":2.25, "w":1.75},
+                {"label":"5,0", "x":1.93, "y":2.25},
+                {"label":"4,1", "x":3.75, "y":2.44},
+                {"label":"5,1", "x":4.75, "y":2.44},
+                {"label":"4,2", "x":5.75, "y":2.44},
+                {"label":"5,2", "x":6.75, "y":2.44},
+                {"label":"4,3", "x":10, "y":2.44},
+                {"label":"5,3", "x":11, "y":2.44},
+                {"label":"4,4", "x":12, "y":2.44},
+                {"label":"5,4", "x":13, "y":2.44},
+                {"label":"4,5", "x":14.94, "y":2.25},
+                {"label":"5,5", "x":15.94, "y":2.25},
+                {"label":"4,6", "x":16.94, "y":2.25},
+                {"label":"4,7", "x":19.69, "y":2.0},
+
+                {"label":"6,0", "x":0, "y":3.25, "w":1.25},
+                {"label":"8,0", "x":1.25, "y":3.25},
+                {"label":"7,0", "x":2.25, "y":3.25},
+                {"label":"6,1", "x":4.25, "y":3.44},
+                {"label":"7,1", "x":5.25, "y":3.44},
+                {"label":"6,2", "x":6.25, "y":3.44},
+                {"label":"7,2", "x":7.25, "y":3.44},
+                {"label":"8,3", "x":9.25, "y":3.44},
+                {"label":"6,3", "x":10.25, "y":3.44},
+                {"label":"7,3", "x":11.25, "y":3.44},
+                {"label":"6,4", "x":12.25, "y":3.44},
+                {"label":"7,4", "x":13.25, "y":3.44},
+                {"label":"6,5", "x":15.44, "y":3.25},
+                {"label":"6,6", "x":16.44, "y":3.25, "w":1.75},
+                {"label":"7,6", "x":18.44, "y":3.5},
+
+                {"label":"9,0", "x":0, "y":4.25, "w":1.5},
+                {"label":"8,1", "x":4.25, "y":4.44, "w":1.5},
+                {"label":"8,2", "x":5.75, "y":4.44, "w":2},
+                {"label":"9,2", "x":7.75, "y":4.44},
+                {"label":"9,3", "x":9.75, "y":4.44, "w":2.75},
+                {"label":"8,4", "x":12.5, "y":4.44, "w":1.5},
+                {"label":"8,6", "x":17.44, "y":4.5},
+                {"label":"9,6", "x":18.44, "y":4.5},
+                {"label":"8,7", "x":19.44, "y":4.5}
+            ]
+        }
+    }
+}