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

1 files changed, 188 insertions, 6 deletions

diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json
index f599382d3d..a8d846340e 100644
--- a/keyboards/kin80/info.json
+++ b/keyboards/kin80/info.json
@@ -1,6 +1,6 @@
 {
-    "keyboard_name": "Kin80", 
-    "url": "https://github.com/DmNosachev/kinesis80", 
+    "keyboard_name": "Kin80",
+    "url": "https://github.com/DmNosachev/kinesis80",
     "maintainer": "DmNosachev",
     "usb": {
         "vid": "0xFEED",
@@ -10,10 +10,192 @@
     "diode_direction": "COL2ROW",
     "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":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":0, "y":1.25, "w":1.25}, {"x":1.25, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25, "w":1.25}, {"x":0, "y":2.25, "w":1.25}, {"x":1.25, "y":2.25}, {"x":2.25, "y":2.25}, {"x":3.25, "y":2.25}, {"x":4.25, "y":2.25}, {"x":5.25, "y":2.25}, {"x":11.25, "y":2.25}, {"x":12.25, "y":2.25}, {"x":13.25, "y":2.25}, {"x":14.25, "y":2.25}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25, "w":1.25}, {"x":0, "y":3.25, "w":1.25}, {"x":1.25, "y":3.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25}, {"x":13.25, "y":3.25}, {"x":14.25, "y":3.25}, {"x":15.25, "y":3.25}, {"x":16.25, "y":3.25, "w":1.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25, "w":1.25}, {"x":1.25, "y":5.25}, {"x":2.25, "y":5.25}, {"x":3.25, "y":5.25}, {"x":4.25, "y":5.25}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":6.25, "y":6}, {"x":7.25, "y":6}, {"x":9.25, "y":6}, {"x":10.25, "y":6}, {"x":5.25, "y":7, "h":2}, {"x":6.25, "y":7, "h":2}, {"x":7.25, "y":7}, {"x":9.25, "y":7}, {"x":10.25, "y":7, "h":2}, {"x":11.25, "y":7, "h":2}, {"x":7.25, "y":8}, {"x":9.25, "y":8}]
+            "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":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+
+                {"x":0, "y":1.25, "w":1.25},
+                {"x":1.25, "y":1.25},
+                {"x":2.25, "y":1.25},
+                {"x":3.25, "y":1.25},
+                {"x":4.25, "y":1.25},
+                {"x":5.25, "y":1.25},
+                {"x":11.25, "y":1.25},
+                {"x":12.25, "y":1.25},
+                {"x":13.25, "y":1.25},
+                {"x":14.25, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25, "w":1.25},
+
+                {"x":0, "y":2.25, "w":1.25},
+                {"x":1.25, "y":2.25},
+                {"x":2.25, "y":2.25},
+                {"x":3.25, "y":2.25},
+                {"x":4.25, "y":2.25},
+                {"x":5.25, "y":2.25},
+                {"x":11.25, "y":2.25},
+                {"x":12.25, "y":2.25},
+                {"x":13.25, "y":2.25},
+                {"x":14.25, "y":2.25},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25, "w":1.25},
+
+                {"x":0, "y":3.25, "w":1.25},
+                {"x":1.25, "y":3.25},
+                {"x":2.25, "y":3.25},
+                {"x":3.25, "y":3.25},
+                {"x":4.25, "y":3.25},
+                {"x":5.25, "y":3.25},
+                {"x":11.25, "y":3.25},
+                {"x":12.25, "y":3.25},
+                {"x":13.25, "y":3.25},
+                {"x":14.25, "y":3.25},
+                {"x":15.25, "y":3.25},
+                {"x":16.25, "y":3.25, "w":1.25},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25},
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25},
+                {"x":15.25, "y":4.25},
+                {"x":16.25, "y":4.25, "w":1.25},
+
+                {"x":1.25, "y":5.25},
+                {"x":2.25, "y":5.25},
+                {"x":3.25, "y":5.25},
+                {"x":4.25, "y":5.25},
+                {"x":12.25, "y":5.25},
+                {"x":13.25, "y":5.25},
+                {"x":14.25, "y":5.25},
+                {"x":15.25, "y":5.25},
+
+                {"x":6.25, "y":6},
+                {"x":7.25, "y":6},
+                {"x":9.25, "y":6},
+                {"x":10.25, "y":6},
+
+                {"x":7.25, "y":7},
+                {"x":9.25, "y":7},
+
+                {"x":5.25, "y":7, "h":2},
+                {"x":6.25, "y":7, "h":2},
+                {"x":7.25, "y":8},
+                {"x":9.25, "y":8},
+                {"x":10.25, "y":7, "h":2},
+                {"x":11.25, "y":7, "h":2}
+            ]
         },
-      "LAYOUT_all": {
-            "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":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":0, "y":1.25, "w":1.25}, {"x":1.25, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":13.75, "y":1.25}, {"x":14.75, "y":1.25}, {"x":15.75, "y":1.25}, {"x":16.75, "y":1.25, "w":1.25}, {"x":0, "y":2.25, "w":1.25}, {"x":1.25, "y":2.25}, {"x":2.25, "y":2.25}, {"x":3.25, "y":2.25}, {"x":4.25, "y":2.25}, {"x":5.25, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25, "w":1.25}, {"x":0, "y":3.25, "w":1.25}, {"x":1.25, "y":3.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":13.75, "y":3.25}, {"x":14.75, "y":3.25}, {"x":15.75, "y":3.25}, {"x":16.75, "y":3.25, "w":1.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":11.75, "y":4.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.25}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25, "w":1.25}, {"x":0.25, "y":5.25}, {"x":1.25, "y":5.25}, {"x":2.25, "y":5.25}, {"x":3.25, "y":5.25}, {"x":4.25, "y":5.25}, {"x":5.25, "y":5.25}, {"x":11.75, "y":5.25}, {"x":12.75, "y":5.25}, {"x":13.75, "y":5.25}, {"x":14.75, "y":5.25}, {"x":15.75, "y":5.25}, {"x":16.75, "y":5.25}, {"x":6.5, "y":6}, {"x":7.5, "y":6}, {"x":9.5, "y":6}, {"x":10.5, "y":6}, {"x":5.25, "y":7, "h":2}, {"x":6.25, "y":7, "h":2}, {"x":7.25, "y":7}, {"x":9.5, "y":7}, {"x":10.5, "y":7, "h":2}, {"x":11.5, "y":7, "h":2}, {"x":7.25, "y":8}, {"x":9.5, "y":8}]
+        "LAYOUT_all": {
+            "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":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+
+                {"x":0, "y":1.25, "w":1.25},
+                {"x":1.25, "y":1.25},
+                {"x":2.25, "y":1.25},
+                {"x":3.25, "y":1.25},
+                {"x":4.25, "y":1.25},
+                {"x":5.25, "y":1.25},
+                {"x":11.25, "y":1.25},
+                {"x":12.25, "y":1.25},
+                {"x":13.25, "y":1.25},
+                {"x":14.25, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25, "w":1.25},
+
+                {"x":0, "y":2.25, "w":1.25},
+                {"x":1.25, "y":2.25},
+                {"x":2.25, "y":2.25},
+                {"x":3.25, "y":2.25},
+                {"x":4.25, "y":2.25},
+                {"x":5.25, "y":2.25},
+                {"x":11.25, "y":2.25},
+                {"x":12.25, "y":2.25},
+                {"x":13.25, "y":2.25},
+                {"x":14.25, "y":2.25},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25, "w":1.25},
+
+                {"x":0, "y":3.25, "w":1.25},
+                {"x":1.25, "y":3.25},
+                {"x":2.25, "y":3.25},
+                {"x":3.25, "y":3.25},
+                {"x":4.25, "y":3.25},
+                {"x":5.25, "y":3.25},
+                {"x":11.25, "y":3.25},
+                {"x":12.25, "y":3.25},
+                {"x":13.25, "y":3.25},
+                {"x":14.25, "y":3.25},
+                {"x":15.25, "y":3.25},
+                {"x":16.25, "y":3.25, "w":1.25},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25},
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25},
+                {"x":15.25, "y":4.25},
+                {"x":16.25, "y":4.25, "w":1.25},
+
+                {"x":0.25, "y":5.25},
+                {"x":1.25, "y":5.25},
+                {"x":2.25, "y":5.25},
+                {"x":3.25, "y":5.25},
+                {"x":4.25, "y":5.25},
+                {"x":5.25, "y":5.25},
+                {"x":11.25, "y":5.25},
+                {"x":12.25, "y":5.25},
+                {"x":13.25, "y":5.25},
+                {"x":14.25, "y":5.25},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+
+                {"x":6.25, "y":6},
+                {"x":7.25, "y":6},
+                {"x":9.25, "y":6},
+                {"x":10.25, "y":6},
+
+                {"x":7.25, "y":7},
+                {"x":9.25, "y":7},
+
+                {"x":5.25, "y":7, "h":2},
+                {"x":6.25, "y":7, "h":2},
+                {"x":7.25, "y":8},
+                {"x":9.25, "y":8},
+                {"x":10.25, "y":7, "h":2},
+                {"x":11.25, "y":7, "h":2}
+            ]
         }
     }
-}
\ No newline at end of file
+}