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

1 files changed, 103 insertions, 3 deletions

diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json
index 88d8a968ac..c0c61fe969 100644
--- a/keyboards/kikoslab/kl90/info.json
+++ b/keyboards/kikoslab/kl90/info.json
@@ -5,8 +5,108 @@
     "width": 18, 
     "height": 6.75, 
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.5, "y":0}, {"label":"0,2", "x":2.75, "y":0}, {"label":"0,3", "x":3.75, "y":0}, {"label":"0,4", "x":4.75, "y":0}, {"label":"0,5", "x":5.75, "y":0}, {"label":"0,6", "x":7, "y":0}, {"label":"0,7", "x":8, "y":0}, {"label":"0,8", "x":9, "y":0}, {"label":"0,9", "x":10, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.5, "y":0}, {"label":"0,15", "x":17, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1.5, "y":1.5}, {"label":"1,2", "x":2.5, "y":1.5}, {"label":"1,3", "x":3.5, "y":1.5}, {"label":"1,4", "x":4.5, "y":1.5}, {"label":"1,5", "x":5.5, "y":1.5}, {"label":"1,6", "x":6.5, "y":1.5}, {"label":"1,7", "x":7.5, "y":1.5}, {"label":"1,8", "x":8.5, "y":1.5}, {"label":"1,9", "x":9.5, "y":1.5}, {"label":"1,10", "x":10.5, "y":1.5}, {"label":"1,11", "x":11.5, "y":1.5}, {"label":"1,12", "x":12.5, "y":1.5}, {"label":"1,13", "x":13.5, "y":1.5}, {"label":"1,14", "x":14.5, "y":1.5, "w":2}, {"label":"1,15", "x":17, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1.5, "y":2.5, "w":1.5}, {"label":"2,2", "x":3, "y":2.5}, {"label":"2,3", "x":4, "y":2.5}, {"label":"2,4", "x":5, "y":2.5}, {"label":"2,5", "x":6, "y":2.5}, {"label":"2,6", "x":7, "y":2.5}, {"label":"2,7", "x":8, "y":2.5}, {"label":"2,8", "x":9, "y":2.5}, {"label":"2,9", "x":10, "y":2.5}, {"label":"2,10", "x":11, "y":2.5}, {"label":"2,11", "x":12, "y":2.5}, {"label":"2,12", "x":13, "y":2.5}, {"label":"2,13", "x":14, "y":2.5}, {"label":"2,14", "x":15, "y":2.5, "w":1.5}, {"label":"2,15", "x":17, "y":2.5}, {"label":"3,0", "x":0, "y":3.5}, {"label":"3,1", "x":1.5, "y":3.5, "w":1.75}, {"label":"3,2", "x":3.25, "y":3.5}, {"label":"3,3", "x":4.25, "y":3.5}, {"label":"3,4", "x":5.25, "y":3.5}, {"label":"3,5", "x":6.25, "y":3.5}, {"label":"3,6", "x":7.25, "y":3.5}, {"label":"3,7", "x":8.25, "y":3.5}, {"label":"3,8", "x":9.25, "y":3.5}, {"label":"3,9", "x":10.25, "y":3.5}, {"label":"3,10", "x":11.25, "y":3.5}, {"label":"3,11", "x":12.25, "y":3.5}, {"label":"3,12", "x":13.25, "y":3.5}, {"label":"3,13", "x":14.25, "y":3.5}, {"label":"3,14", "x":15.25, "y":3.5, "w":1.25}, {"label":"3,15", "x":17, "y":3.5}, {"label":"4,0", "x":0, "y":4.5}, {"label":"4,1", "x":1.5, "y":4.5, "w":1.25}, {"label":"4,12", "x":2.75, "y":4.5}, {"label":"4,2", "x":3.75, "y":4.5}, {"label":"4,3", "x":4.75, "y":4.5}, {"label":"4,4", "x":5.75, "y":4.5}, {"label":"4,5", "x":6.75, "y":4.5}, {"label":"4,6", "x":7.75, "y":4.5}, {"label":"4,7", "x":8.75, "y":4.5}, {"label":"4,8", "x":9.75, "y":4.5}, {"label":"4,9", "x":10.75, "y":4.5}, {"label":"4,10", "x":11.75, "y":4.5}, {"label":"4,11", "x":12.75, "y":4.5}, {"label":"4,13", "x":13.75, "y":4.5, "w":1.75}, {"label":"4,15", "x":17, "y":4.5}, {"label":"4,14", "x":15.75, "y":4.75}, {"label":"5,0", "x":0, "y":5.5}, {"label":"5,1", "x":1.5, "y":5.5, "w":1.25}, {"label":"5,2", "x":2.75, "y":5.5, "w":1.25}, {"label":"5,3", "x":4, "y":5.5, "w":1.25}, {"label":"5,4", "x":5.25, "y":5.5, "w":2.25}, {"label":"5,6", "x":7.5, "y":5.5}, {"label":"5,6", "x":8.5, "y":5.5}, {"label":"5,8", "x":9.5, "y":5.5, "w":2}, {"label":"5,10", "x":11.5, "y":5.5}, {"label":"5,11", "x":12.5, "y":5.5}, {"label":"5,12", "x":13.5, "y":5.5}, {"label":"5,13", "x":14.75, "y":5.75}, {"label":"5,14", "x":15.75, "y":5.75}, {"label":"5,15", "x":16.75, "y":5.75}]
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.5, "y":0},
+                {"label":"0,2", "x":2.75, "y":0},
+                {"label":"0,3", "x":3.75, "y":0},
+                {"label":"0,4", "x":4.75, "y":0},
+                {"label":"0,5", "x":5.75, "y":0},
+                {"label":"0,6", "x":7, "y":0},
+                {"label":"0,7", "x":8, "y":0},
+                {"label":"0,8", "x":9, "y":0},
+                {"label":"0,9", "x":10, "y":0},
+                {"label":"0,10", "x":11.25, "y":0},
+                {"label":"0,11", "x":12.25, "y":0},
+                {"label":"0,12", "x":13.25, "y":0},
+                {"label":"0,13", "x":14.25, "y":0},
+                {"label":"0,14", "x":15.5, "y":0},
+                {"label":"0,15", "x":17, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.5},
+                {"label":"1,1", "x":1.5, "y":1.5},
+                {"label":"1,2", "x":2.5, "y":1.5},
+                {"label":"1,3", "x":3.5, "y":1.5},
+                {"label":"1,4", "x":4.5, "y":1.5},
+                {"label":"1,5", "x":5.5, "y":1.5},
+                {"label":"1,6", "x":6.5, "y":1.5},
+                {"label":"1,7", "x":7.5, "y":1.5},
+                {"label":"1,8", "x":8.5, "y":1.5},
+                {"label":"1,9", "x":9.5, "y":1.5},
+                {"label":"1,10", "x":10.5, "y":1.5},
+                {"label":"1,11", "x":11.5, "y":1.5},
+                {"label":"1,12", "x":12.5, "y":1.5},
+                {"label":"1,13", "x":13.5, "y":1.5},
+                {"label":"1,14", "x":14.5, "y":1.5, "w":2},
+                {"label":"1,15", "x":17, "y":1.5},
+
+                {"label":"2,0", "x":0, "y":2.5},
+                {"label":"2,1", "x":1.5, "y":2.5, "w":1.5},
+                {"label":"2,2", "x":3, "y":2.5},
+                {"label":"2,3", "x":4, "y":2.5},
+                {"label":"2,4", "x":5, "y":2.5},
+                {"label":"2,5", "x":6, "y":2.5},
+                {"label":"2,6", "x":7, "y":2.5},
+                {"label":"2,7", "x":8, "y":2.5},
+                {"label":"2,8", "x":9, "y":2.5},
+                {"label":"2,9", "x":10, "y":2.5},
+                {"label":"2,10", "x":11, "y":2.5},
+                {"label":"2,11", "x":12, "y":2.5},
+                {"label":"2,12", "x":13, "y":2.5},
+                {"label":"2,13", "x":14, "y":2.5},
+                {"label":"2,14", "x":15, "y":2.5, "w":1.5},
+                {"label":"2,15", "x":17, "y":2.5},
+
+                {"label":"3,0", "x":0, "y":3.5},
+                {"label":"3,1", "x":1.5, "y":3.5, "w":1.75},
+                {"label":"3,2", "x":3.25, "y":3.5},
+                {"label":"3,3", "x":4.25, "y":3.5},
+                {"label":"3,4", "x":5.25, "y":3.5},
+                {"label":"3,5", "x":6.25, "y":3.5},
+                {"label":"3,6", "x":7.25, "y":3.5},
+                {"label":"3,7", "x":8.25, "y":3.5},
+                {"label":"3,8", "x":9.25, "y":3.5},
+                {"label":"3,9", "x":10.25, "y":3.5},
+                {"label":"3,10", "x":11.25, "y":3.5},
+                {"label":"3,11", "x":12.25, "y":3.5},
+                {"label":"3,12", "x":13.25, "y":3.5},
+                {"label":"3,13", "x":14.25, "y":3.5},
+                {"label":"3,14", "x":15.25, "y":3.5, "w":1.25},
+                {"label":"3,15", "x":17, "y":3.5},
+
+                {"label":"4,0", "x":0, "y":4.5},
+                {"label":"4,1", "x":1.5, "y":4.5, "w":1.25},
+                {"label":"4,12", "x":2.75, "y":4.5},
+                {"label":"4,2", "x":3.75, "y":4.5},
+                {"label":"4,3", "x":4.75, "y":4.5},
+                {"label":"4,4", "x":5.75, "y":4.5},
+                {"label":"4,5", "x":6.75, "y":4.5},
+                {"label":"4,6", "x":7.75, "y":4.5},
+                {"label":"4,7", "x":8.75, "y":4.5},
+                {"label":"4,8", "x":9.75, "y":4.5},
+                {"label":"4,9", "x":10.75, "y":4.5},
+                {"label":"4,10", "x":11.75, "y":4.5},
+                {"label":"4,11", "x":12.75, "y":4.5},
+                {"label":"4,13", "x":13.75, "y":4.5, "w":1.75},
+                {"label":"4,14", "x":15.75, "y":4.75},
+                {"label":"4,15", "x":17, "y":4.5},
+
+                {"label":"5,0", "x":0, "y":5.5},
+                {"label":"5,1", "x":1.5, "y":5.5, "w":1.25},
+                {"label":"5,2", "x":2.75, "y":5.5, "w":1.25},
+                {"label":"5,3", "x":4, "y":5.5, "w":1.25},
+                {"label":"5,4", "x":5.25, "y":5.5, "w":2.25},
+                {"label":"5,6", "x":7.5, "y":5.5},
+                {"label":"5,6", "x":8.5, "y":5.5},
+                {"label":"5,8", "x":9.5, "y":5.5, "w":2},
+                {"label":"5,10", "x":11.5, "y":5.5},
+                {"label":"5,11", "x":12.5, "y":5.5},
+                {"label":"5,12", "x":13.5, "y":5.5},
+                {"label":"5,13", "x":14.75, "y":5.75},
+                {"label":"5,14", "x":15.75, "y":5.75},
+                {"label":"5,15", "x":16.75, "y":5.75}
+            ]
         }
     }
-}
\ No newline at end of file
+}