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

6 files changed, 549 insertions, 0 deletions

diff --git a/keyboards/dztech/og60/info.json b/keyboards/dztech/og60/info.json
new file mode 100644
index 0000000000..6da1094cd1
--- /dev/null
+++ b/keyboards/dztech/og60/info.json
@@ -0,0 +1,426 @@
+{
+    "manufacturer": "KBDFans",
+    "keyboard_name": "Og60",
+    "maintainer": "moyi4681",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP28",
+        "on_state": 1
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP18", "GP19", "GP20", "GP21", "GP22", "GP23"],
+        "rows": ["GP4", "GP3", "GP17", "GP24", "GP25"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6071",
+        "vid": "0x4B42"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [2, 12], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "@", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "~", "matrix": [1, 13], "w": 1, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "AltGr", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [2, 12], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [2, 12], "w": 1, "x": 13, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K47", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/dztech/og60/keymaps/default/keymap.c b/keyboards/dztech/og60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0bf690aab0
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+     [3] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+};
+
+
diff --git a/keyboards/dztech/og60/keymaps/via/keymap.c b/keyboards/dztech/og60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0bf690aab0
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+     [3] = LAYOUT_all(
+        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, KC_F12,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NUHS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
+    ),
+};
+
+
diff --git a/keyboards/dztech/og60/keymaps/via/rules.mk b/keyboards/dztech/og60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dztech/og60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dztech/og60/readme.md b/keyboards/dztech/og60/readme.md
new file mode 100644
index 0000000000..07d6e6a658
--- /dev/null
+++ b/keyboards/dztech/og60/readme.md
@@ -0,0 +1,22 @@
+# OG60
+A customizable 60% HotSwap keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: OG60
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+## Bootloader mode
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the left top key then plug in the USB cable.
+* Physical reset button: Double tap the reset button.
+* Keycode in layout: Press the key mapped to QK_BOOT if it is available.
+
+## Making firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dztech/og60:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/dztech/og60/rules.mk b/keyboards/dztech/og60/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/dztech/og60/rules.mk