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

5 files changed, 212 insertions, 1 deletions

diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 5d0c6557e7..e763f04484 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -3,5 +3,59 @@
     "usb": {
         "pid": "0x5369",
         "device_version": "0.0.2"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "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": 7, "y": 1 },
+                { "x": 8, "y": 1 },
+                { "x": 9, "y": 1 },
+                { "x": 10, "y": 1 },
+                { "x": 11, "y": 1 },
+                { "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": 7, "y": 2 },
+                { "x": 8, "y": 2 },
+                { "x": 9, "y": 2 },
+                { "x": 10, "y": 2 },
+                { "x": 11, "y": 2 },
+                { "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": 7, "y": 3 },
+                { "x": 8, "y": 3 },
+                { "x": 9, "y": 3 },
+                { "x": 10, "y": 3 },
+                { "x": 11, "y": 3 }
+            ]
+        }
     }
 }
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index f0ff1b915f..e8daa42a1c 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -5,5 +5,75 @@
         "vid": "0xF7E0",
         "pid": "0x2401",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x16": {
+            "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": 7, "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": 15, "y": 0 },
+                { "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": 7, "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": 15, "y": 1 },
+                { "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": 7, "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": 15, "y": 2 },
+                { "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": 7, "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": 15, "y": 3 }
+            ]
+        }
     }
 }
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index 25e9b06d49..5d09a0f296 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -5,5 +5,75 @@
         "vid": "0xF7E0",
         "pid": "0x2408",
         "device_version": "0.0.7"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x16": {
+            "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": 7, "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": 15, "y": 0 },
+                { "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": 7, "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": 15, "y": 1 },
+                { "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": 7, "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": 15, "y": 2 },
+                { "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": 7, "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": 15, "y": 3 }
+            ]
+        }
     }
 }
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 2ba7d34d52..11442461d4 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -8,5 +8,12 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                { "w": 1, "x": 0, "y": 0 }
+            ]
+        }
+    }
 }
diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json
index f017d743dd..8a9d4c6991 100644
--- a/keyboards/thevankeyboards/jetvan/info.json
+++ b/keyboards/thevankeyboards/jetvan/info.json
@@ -7,5 +7,15 @@
         "vid": "0xFEAE",
         "pid": "0x8858",
         "device_version": "0.0.1"
+    },
+    "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+                    {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+                    {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2},
+                    {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+            ]
+        }
     }
 }