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

8 files changed, 214 insertions, 0 deletions

diff --git a/keyboards/moondrop/dash75/info.json b/keyboards/moondrop/dash75/info.json
new file mode 100644
index 0000000000..13e28fb325
--- /dev/null
+++ b/keyboards/moondrop/dash75/info.json
@@ -0,0 +1,119 @@
+{
+    "manufacturer": "MOONDROP",
+    "keyboard_name": "Dash 75",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4"],
+        "cols": ["C6", "B2", "B3", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "D5", "D3", "D2", "D0", "D1"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://moondroplab.com/en/products/dash75",
+    "usb": {
+        "vid": "0x6DD4",
+        "pid": "0x7501",
+        "device_version": "1.5.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.5, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [0, 12], "x": 12.5, "y": 0 },
+                { "matrix": [0, 13], "x": 13.5, "y": 0 },
+                { "matrix": [0, 14], "x": 15, "y": 0 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 },
+                { "matrix": [1, 14], "x": 15, "y": 1.25 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 },
+                { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "matrix": [2, 14], "x": 15, "y": 2.25 },
+
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+                { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+                { "matrix": [3, 14], "x": 15, "y": 3.25 },
+
+                { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+                { "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+                { "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
+                { "matrix": [4, 14], "x": 15, "y": 4.25 },
+
+                { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "matrix": [5, 12], "x": 13, "y": 5.25 },
+                { "matrix": [5, 13], "x": 14, "y": 5.25 },
+                { "matrix": [5, 14], "x": 15, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/moondrop/dash75/keymaps/default/keymap.json b/keyboards/moondrop/dash75/keymaps/default/keymap.json
new file mode 100644
index 0000000000..67811c18a3
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/default/keymap.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "notes": "This file is a keymap.json file for moondrop/dash75",
+    "keyboard": "moondrop/dash75",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "author": "vinorodrigues",
+    "layers": [
+        [
+            "KC_ESC",  "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_PSCR",
+            "KC_GRV",  "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_BSPC",  "KC_INS",
+            "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_BSLS", "KC_DEL",
+            "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_PGUP",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT", "KC_UP",   "KC_PGDN",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_APP",             "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ]
+}
diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h
new file mode 100644
index 0000000000..3b36fe3a07
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 moondroplab (@moondroplab)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json
new file mode 100644
index 0000000000..6d43ee82c8
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json
@@ -0,0 +1,24 @@
+{
+    "version": 1,
+    "notes": "This file is a keymap.json file for moondrop/dash75",
+    "keyboard": "moondrop/dash75",
+    "keymap": "via",
+    "layout": "LAYOUT",
+    "author": "vinorodrigues",
+    "config": {
+        "features": {
+            "via": true,
+            "lto": true
+        }
+    },
+    "layers": [
+        [
+            "KC_ESC",  "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_PSCR",
+            "KC_GRV",  "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_BSPC",  "KC_INS",
+            "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_BSLS", "KC_DEL",
+            "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_PGUP",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT", "KC_UP",   "KC_PGDN",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_APP",             "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ]
+}
diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h
new file mode 100644
index 0000000000..16b6125a2d
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 moondroplab (@moondroplab)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_NUMBER "Dash 75"
+
+#define USB_SUSPEND_WAKEUP_DELAY 5000  // wait for USB hub to start
+
+#define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/moondrop/dash75/r1/info.json b/keyboards/moondrop/dash75/r1/info.json
new file mode 100644
index 0000000000..b562070dc9
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x7501",
+        "device_version": "1.5.0"
+    }
+}
diff --git a/keyboards/moondrop/dash75/r1/rules.mk b/keyboards/moondrop/dash75/r1/rules.mk
new file mode 100644
index 0000000000..6441046fb6
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/rules.mk
@@ -0,0 +1,2 @@
+# This file intentionally left blank
+# ** Settings are Data Driven and reside in `info.json` **
diff --git a/keyboards/moondrop/dash75/readme.md b/keyboards/moondrop/dash75/readme.md
new file mode 100644
index 0000000000..5b015f6d5b
--- /dev/null
+++ b/keyboards/moondrop/dash75/readme.md
@@ -0,0 +1,29 @@
+# Moondrop Dash75
+
+![Moondrop Dash75](https://i.imgur.com/mxaYcvqh.jpg)
+
+The 75%, Commodore 64 inspired, keyboard with integrated USB Hub and headphone DAC/Amp
+
+* Keyboard Maintainer: [vinorodrigues](https://github.com/vinorodrigues)
+* Hardware Supported:
+    * Moondrop Dash75
+* Hardware Availability: [moondroplab.com](https://moondroplab.com/en/products/dash75)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make moondrop/dash75/r1:default
+
+Flashing example for this keyboard:
+
+    make moondrop/dash75/r1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available