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

3 files changed, 50 insertions, 0 deletions

diff --git a/layouts/default/ortho_5x5/info.json b/layouts/default/ortho_5x5/info.json
new file mode 100644
index 0000000000..ecc41d9437
--- /dev/null
+++ b/layouts/default/ortho_5x5/info.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "5x5 ortholinear layout",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 5,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_ortho_5x5": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+                {"x":4, "y":4}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/ortho_5x5/layout.json b/layouts/default/ortho_5x5/layout.json
new file mode 100644
index 0000000000..71f77df6ed
--- /dev/null
+++ b/layouts/default/ortho_5x5/layout.json
@@ -0,0 +1,5 @@
+["","","","",""],
+["","","","",""],
+["","","","",""],
+["","","","",""],
+["","","","",""]
diff --git a/layouts/default/ortho_5x5/readme.md b/layouts/default/ortho_5x5/readme.md
new file mode 100644
index 0000000000..3dd75765d1
--- /dev/null
+++ b/layouts/default/ortho_5x5/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x5
+
+    LAYOUT_ortho_5x5
\ No newline at end of file