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

6 files changed, 138 insertions, 0 deletions

diff --git a/keyboards/sapuseven/macropad12/info.json b/keyboards/sapuseven/macropad12/info.json
new file mode 100644
index 0000000000..72559982a2
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/info.json
@@ -0,0 +1,43 @@
+{
+    "manufacturer": "SapuSeven",
+    "keyboard_name": "MacroPad12",
+    "maintainer": "SapuSeven",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4"],
+        "rows": ["D6", "D5", "D4"]
+    },
+    "processor": "atmega32u2",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x1209",
+        "pid": "0x7337"
+    },
+    "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 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/sapuseven/macropad12/keymaps/default/keymap.c b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1cfa260103
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+/* Copyright 2023 SapuSeven
+ *
+ * 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(
+        KC_1, KC_2, KC_3, KC_PLUS,
+        KC_4, KC_5, KC_6, KC_MINUS,
+        KC_7, KC_8, KC_9, KC_0
+    )
+};
diff --git a/keyboards/sapuseven/macropad12/keymaps/via/keymap.c b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c
new file mode 100644
index 0000000000..771c3efc9a
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2023 SapuSeven
+ *
+ * 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(
+        KC_1, KC_2, KC_3, KC_PLUS,
+        KC_4, KC_5, KC_6, KC_MINUS,
+        KC_7, KC_8, KC_9, KC_0
+    ),
+    [1] = LAYOUT(
+        KC_F1, KC_F2, KC_F3, KC_F4,
+        KC_F5, KC_F6, KC_F7, KC_F8,
+        KC_F9, KC_F10, KC_F11, KC_F12
+    ),
+    [2] = LAYOUT(
+        KC_F13, KC_F14, KC_F15, KC_F16,
+        KC_F17, KC_F18, KC_F19, KC_F20,
+        KC_F21, KC_F22, KC_F23, KC_F24
+    ),
+    [3] = LAYOUT(
+        KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO
+    )
+};
diff --git a/keyboards/sapuseven/macropad12/keymaps/via/rules.mk b/keyboards/sapuseven/macropad12/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/sapuseven/macropad12/readme.md b/keyboards/sapuseven/macropad12/readme.md
new file mode 100644
index 0000000000..e7d4195454
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/readme.md
@@ -0,0 +1,28 @@
+# macropad
+
+![macropad12](https://i.imgur.com/StqDhH8h.png)
+
+A simple, configurable 12-key MacroPad.
+
+* Keyboard Maintainer: [SapuSeven](https://github.com/SapuSeven)
+* Hardware Supported: MacroPad12 PCB v2.0
+* Hardware Availability: *coming soon*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sapuseven/macropad12:default
+
+Flashing example for this keyboard:
+
+    make sapuseven/macropad12: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 top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB using a thin long object while the keyboard is connected
+* **Keycode in layout**: Press the key mapped to `BOOTLOADER` if it is available
diff --git a/keyboards/sapuseven/macropad12/rules.mk b/keyboards/sapuseven/macropad12/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/sapuseven/macropad12/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank