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

1 files changed, 65 insertions, 243 deletions

diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/info.json
index 4abdf30da3..1bac3e466c 100644
--- a/keyboards/keycapsss/kimiko/info.json
+++ b/keyboards/keycapsss/kimiko/info.json
@@ -3,252 +3,74 @@
     "url": "https://keycapsss.com",
     "maintainer": "@ben_roe Keycapsss",
     "width": 15,
-    "height": 34.45,
+    "height": 5.75,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 3,
-                    "y": 0.2
-                },
-                {
-                    "x": 11,
-                    "y": 0.2
-                },
-                {
-                    "x": 10,
-                    "y": 0.25
-                },
-                {
-                    "x": 2,
-                    "y": 0.35
-                },
-                {
-                    "x": 4,
-                    "y": 0.35
-                },
-                {
-                    "x": 12,
-                    "y": 0.35
-                },
-                {
-                    "x": 5,
-                    "y": 0.5
-                },
-                {
-                    "x": 9,
-                    "y": 0.5
-                },
-                {
-                    "x": 0,
-                    "y": 1.0
-                },
-                {
-                    "x": 1,
-                    "y": 1.0
-                },
-                {
-                    "x": 13,
-                    "y": 1.0
-                },
-                {
-                    "x": 14,
-                    "y": 1.0
-                },
-                {
-                    "x": 3,
-                    "y": 1.2
-                },
-                {
-                    "x": 11,
-                    "y": 1.2
-                },
-                {
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "x": 2,
-                    "y": 1.35
-                },
-                {
-                    "x": 4,
-                    "y": 1.35
-                },
-                {
-                    "x": 12,
-                    "y": 1.35
-                },
-                {
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "x": 0,
-                    "y": 2.0
-                },
-                {
-                    "x": 1,
-                    "y": 2.0
-                },
-                {
-                    "x": 13,
-                    "y": 2.0
-                },
-                {
-                    "x": 14,
-                    "y": 2.0
-                },
-                {
-                    "x": 3,
-                    "y": 2.2
-                },
-                {
-                    "x": 11,
-                    "y": 2.2
-                },
-                {
-                    "x": 2,
-                    "y": 2.35
-                },
-                {
-                    "x": 4,
-                    "y": 2.35
-                },
-                {
-                    "x": 10,
-                    "y": 2.35
-                },
-                {
-                    "x": 12,
-                    "y": 2.35
-                },
-                {
-                    "x": 5,
-                    "y": 2.5
-                },
-                {
-                    "x": 9,
-                    "y": 2.5
-                },
-                {
-                    "x": 0,
-                    "y": 3.0
-                },
-                {
-                    "x": 1,
-                    "y": 3.0
-                },
-                {
-                    "x": 13,
-                    "y": 3.0
-                },
-                {
-                    "x": 14,
-                    "y": 3.0
-                },
-                {
-                    "x": 3,
-                    "y": 3.2
-                },
-                {
-                    "x": 11,
-                    "y": 3.2
-                },
-                {
-                    "x": 2,
-                    "y": 3.35
-                },
-                {
-                    "x": 4,
-                    "y": 3.35
-                },
-                {
-                    "x": 10,
-                    "y": 3.35
-                },
-                {
-                    "x": 12,
-                    "y": 3.35
-                },
-                {
-                    "x": 5,
-                    "y": 3.5
-                },
-                {
-                    "x": 9,
-                    "y": 3.5
-                },
-                {
-                    "x": 6.25,
-                    "y": 3.5
-                },
-                {
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "x": 0,
-                    "y": 4.0
-                },
-                {
-                    "x": 1,
-                    "y": 4.0
-                },
-                {
-                    "x": 13,
-                    "y": 4.0
-                },
-                {
-                    "x": 14,
-                    "y": 4.0
-                },
-                {
-                    "x": 3,
-                    "y": 4.2
-                },
-                {
-                    "x": 2,
-                    "y": 4.35
-                },
-                {
-                    "x": 4,
-                    "y": 4.35
-                },
-                {
-                    "x": 10,
-                    "y": 4.35
-                },
-                {
-                    "x": 10.75,
-                    "y": 9.55
-                },
-                {
-                    "x": 11.5,
-                    "y": 14.9
-                },
-                {
-                    "x": 8,
-                    "y": 16.55,
-                    "h": 1.5
-                },
-                {
-                    "x": 7,
-                    "y": 17.05
-                },
-                {
-                    "x": 5,
-                    "y": 24.55
-                },
-                {
-                    "x": 3.57,
-                    "y": 33.45,
-                    "h": 1.5
-                }
+                {"x":0, "y":0.8},
+                {"x":1, "y":0.8},
+                {"x":2, "y":0.15},
+                {"x":3, "y":0},
+                {"x":4, "y":0.15},
+                {"x":5, "y":0.3},
+                {"x":9, "y":0.3},
+                {"x":10, "y":0.15},
+                {"x":11, "y":0},
+                {"x":12, "y":0.15},
+                {"x":13, "y":0.8},
+                {"x":14, "y":0.8},
+
+                {"x":0, "y":1.8},
+                {"x":1, "y":1.8},
+                {"x":2, "y":1.15},
+                {"x":3, "y":1},
+                {"x":4, "y":1.15},
+                {"x":5, "y":1.3},
+                {"x":9, "y":1.3},
+                {"x":10, "y":1.15},
+                {"x":11, "y":1},
+                {"x":12, "y":1.15},
+                {"x":13, "y":1.8},
+                {"x":14, "y":1.8},
+
+                {"x":0, "y":2.8},
+                {"x":1, "y":2.8},
+                {"x":2, "y":2.15},
+                {"x":3, "y":2},
+                {"x":4, "y":2.15},
+                {"x":5, "y":2.3},
+                {"x":9, "y":2.3},
+                {"x":10, "y":2.15},
+                {"x":11, "y":2},
+                {"x":12, "y":2.15},
+                {"x":13, "y":2.8},
+                {"x":14, "y":2.8},
+
+                {"x":0, "y":3.8},
+                {"x":1, "y":3.8},
+                {"x":2, "y":3.15},
+                {"x":3, "y":3},
+                {"x":4, "y":3.15},
+                {"x":5, "y":3.3},
+                {"x":6.25, "y":3.3},
+                {"x":7.75, "y":3.3},
+                {"x":9, "y":3.3},
+                {"x":10, "y":3.15},
+                {"x":11, "y":3},
+                {"x":12, "y":3.15},
+                {"x":13, "y":3.8},
+                {"x":14, "y":3.8},
+
+                {"x":2, "y":4.15},
+                {"x":3, "y":4},
+                {"x":4, "y":4.15},
+                {"x":5.25, "y":4.3},
+                {"x":6.25, "y":4.25, "h":1.5},
+                {"x":7.75, "y":4.25, "h":1.5},
+                {"x":8.75, "y":4.3},
+                {"x":10, "y":4.15},
+                {"x":11, "y":4},
+                {"x":12, "y":4.15}
             ]
         }
     }