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

1 files changed, 82 insertions, 0 deletions

diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json
new file mode 100644
index 0000000000..2ad9480ff5
--- /dev/null
+++ b/keyboards/peej/tripel/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Tripel",
+    "url": "https://github.com/peej/tripel-keyboard",
+    "maintainer": "Peej",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_ortho_7u": {
+            "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":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":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":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":0, "y":4 },
+                { "x":1, "y":4 },
+                { "x":2, "y":4 },
+                { "x":3, "y":4 },
+                { "x":7, "y":4, "w":7 },
+                { "x":11, "y":4 },
+                { "x":12, "y":4 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 }
+            ]
+        }
+    }
+}