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

6 files changed, 91 insertions, 0 deletions

diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/info.json
new file mode 100644
index 0000000000..bb89858da2
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/info.json
@@ -0,0 +1,40 @@
+{
+    "manufacturer": "spacehangover",
+    "keyboard_name": "Mercury",
+    "maintainer": "spacehangover",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3"],
+        "rows": ["GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x5757"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
new file mode 100644
index 0000000000..eb2187e59a
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_F17,   KC_F18,   KC_F19,   KC_F20
+    )
+};
diff --git a/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
new file mode 100644
index 0000000000..eb2187e59a
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_F17,   KC_F18,   KC_F19,   KC_F20
+    )
+};
diff --git a/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk b/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/readme.md b/keyboards/handwired/wwa/mercury/readme.md
new file mode 100644
index 0000000000..32d346dbe9
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/readme.md
@@ -0,0 +1,27 @@
+# mercury
+
+![mercury](https://i.imgur.com/flE9SPwh.jpeg)
+
+8 Key VIA Compatible Macropad
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: RP2040 Handwired
+* Hardware Availability: RP2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/wwa/mercury:default
+
+Flashing example for this keyboard:
+
+    make handwired/wwa/mercury: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
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank