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

1 files changed, 75 insertions, 70 deletions

diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index eecb670536..27f1d2ae52 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -5,80 +5,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":0.75},
+                {"x":2.5, "y":0.25},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0.25},
+                {"x":5.5, "y":0.75},
+                {"x":6.5, "y":1},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":0.75},
+                {"x":11.5, "y":0.25},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0.25},
+                {"x":14.5, "y":0.75},
+                {"x":15.5, "y":1, "w":1.5},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"x":0, "y":2, "w":1.5},
+                {"x":1.5, "y":1.75},
+                {"x":2.5, "y":1.25},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1.25},
+                {"x":5.5, "y":1.75},
+                {"x":6.5, "y":2, "h":1.5},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"x":9.5, "y":2, "h":1.5},
+                {"x":10.5, "y":1.75},
+                {"x":11.5, "y":1.25},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1.25},
+                {"x":14.5, "y":1.75},
+                {"x":15.5, "y":2, "w":1.5},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"x":0, "y":3, "w":1.5},
+                {"x":1.5, "y":2.75},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.75},
+
+                {"x":10.5, "y":2.75},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2.25},
+                {"x":14.5, "y":2.75},
+                {"x":15.5, "y":3, "w":1.5},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":3.75},
+                {"x":2.5, "y":3.25},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3.25},
+                {"x":5.5, "y":3.75},
+                {"x":6.5, "y":3.5, "h":1.5},
+
+                {"x":9.5, "y":3.5, "h":1.5},
+                {"x":10.5, "y":3.75},
+                {"x":11.5, "y":3.25},
+                {"x":12.5, "y":3},
+                {"x":13.5, "y":3.25},
+                {"x":14.5, "y":3.75},
+                {"x":15.5, "y":4, "w":1.5},
+
+                {"x":0.25, "y":5},
+                {"x":1.5, "y":4.75},
+                {"x":2.5, "y":4.25},
+                {"x":3.5, "y":4},
+
+                {"x":5, "y":6},
+                {"x":6, "y":5.5, "h":2},
+                {"x":7, "y":5.5, "h":2},
+
+                {"x":9, "y":5.5, "h":2},
+                {"x":10, "y":5.5, "h":2},
+                {"x":11, "y":6},
+
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4.25},
+                {"x":14.5, "y":4.75},
+                {"x":15.75, "y":5}
             ]
         }
     }