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

1 files changed, 32 insertions, 0 deletions

diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
new file mode 100644
index 0000000000..d940c7c2ad
--- /dev/null
+++ b/keyboards/deng/djam/info.json
@@ -0,0 +1,32 @@
+{
+    "keyboard_name": "DJam",
+    "url": "",
+    "maintainer": "myst729",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 0, "y": 0.5, "h": 2 },
+                { "x": 1, "y": 1 },
+                { "x": 2, "y": 1 },
+                { "x": 3, "y": 1 },
+                { "x": 7, "y": 1 },
+                { "x": 8, "y": 1 },
+                { "x": 9, "y": 1 },
+                { "x": 10, "y": 0.5, "h": 2 },
+                { "x": 0, "y": 3 },
+                { "x": 1, "y": 3 },
+                { "x": 3, "y": 3, "w": 2 },
+                { "x": 5, "y": 3 },
+                { "x": 6, "y": 3, "w": 2 },
+                { "x": 9, "y": 3 },
+                { "x": 10, "y": 3 }
+            ]
+        }
+    }
+}