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

2 files changed, 94 insertions, 1 deletions

diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json
index 5825c27da2..b35f559e48 100644
--- a/keyboards/idobao/id80/v2/iso/info.json
+++ b/keyboards/idobao/id80/v2/iso/info.json
@@ -2,5 +2,97 @@
     "keyboard_name": "ID80 ISO",
     "usb": {
         "pid": "0x0081"
+    },
+    "layouts": {
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "matrix":[0, 5], "x":0, "y":0},
+                {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0},
+                {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0},
+                {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0},
+                {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0},
+                {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0},
+                {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0},
+                {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0},
+                {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0},
+                {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0},
+                {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0},
+                {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0},
+                {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0},
+                {"label":"Fn", "matrix":[6, 10], "x":14, "y":0},
+                {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0},
+
+                {"label":"`", "matrix":[0, 4], "x":0, "y":1.25},
+                {"label":"1", "matrix":[1, 4], "x":1, "y":1.25},
+                {"label":"2", "matrix":[2, 4], "x":2, "y":1.25},
+                {"label":"3", "matrix":[3, 4], "x":3, "y":1.25},
+                {"label":"4", "matrix":[4, 4], "x":4, "y":1.25},
+                {"label":"5", "matrix":[5, 4], "x":5, "y":1.25},
+                {"label":"6", "matrix":[6, 4], "x":6, "y":1.25},
+                {"label":"7", "matrix":[7, 4], "x":7, "y":1.25},
+                {"label":"8", "matrix":[8, 4], "x":8, "y":1.25},
+                {"label":"9", "matrix":[8, 9], "x":9, "y":1.25},
+                {"label":"0", "matrix":[7, 9], "x":10, "y":1.25},
+                {"label":"-", "matrix":[5, 9], "x":11, "y":1.25},
+                {"label":"=", "matrix":[4, 9], "x":12, "y":1.25},
+                {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2},
+                {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25},
+
+                {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25},
+                {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25},
+                {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25},
+                {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25},
+                {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25},
+                {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25},
+                {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25},
+                {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25},
+                {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25},
+                {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25},
+                {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25},
+                {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25},
+                {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25},
+
+                {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25},
+                {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25},
+                {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25},
+                {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25},
+                {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25},
+                {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25},
+                {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25},
+                {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25},
+                {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25},
+                {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25},
+                {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25},
+                {"label":"ISO #", "matrix":[4, 7], "x":12.75, "y":3.25},
+                {"label":"Enter", "matrix":[3, 8], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO \\", "matrix":[1, 1], "x":1.25, "y":4.25},
+                {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25},
+                {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25},
+                {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25},
+                {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25},
+                {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25},
+                {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25},
+                {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25},
+                {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25},
+                {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25},
+                {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25},
+                {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Up", "matrix":[3, 6], "x":14.25, "y":4.5},
+
+                {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5},
+                {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5},
+                {"label":"Left", "matrix":[5, 0], "x":13.25, "y":5.5},
+                {"label":"Down", "matrix":[4, 0], "x":14.25, "y":5.5},
+                {"label":"Right", "matrix":[3, 0], "x":15.25, "y":5.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/idobao/id80/v2/iso/rules.mk b/keyboards/idobao/id80/v2/iso/rules.mk
index 323c12fc6e..5fa6d2f3d0 100644
--- a/keyboards/idobao/id80/v2/iso/rules.mk
+++ b/keyboards/idobao/id80/v2/iso/rules.mk
@@ -1 +1,2 @@
-# see common rules.mk
+# This file intentionally left blank
+# see common info.json