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

6 files changed, 186 insertions, 0 deletions

diff --git a/keyboards/wolf/ziggurat/info.json b/keyboards/wolf/ziggurat/info.json
new file mode 100644
index 0000000000..2e8d39dacb
--- /dev/null
+++ b/keyboards/wolf/ziggurat/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "Laminar",
+    "keyboard_name": "Ziggurat",
+    "maintainer": "ToastyStoemp",
+    "bootloader": "custom",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP29", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"],
+        "rows": ["GP11", "GP10", "GP7", "GP6", "GP23", "GP24", "GP25", "GP26", "GP19", "GP18"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0084",
+        "vid": "0x5453"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [1, 0], "x": 1, "y": 0 },
+                { "matrix": [0, 1], "x": 2.25, "y": 0 },
+                { "matrix": [1, 1], "x": 3.25, "y": 0 },
+                { "matrix": [0, 2], "x": 4.25, "y": 0 },
+                { "matrix": [1, 2], "x": 5.25, "y": 0 },
+                { "matrix": [0, 3], "x": 6.25, "y": 0 },
+                { "matrix": [1, 3], "x": 7.25, "y": 0 },
+                { "matrix": [0, 4], "x": 8.25, "y": 0 },
+                { "matrix": [1, 4], "x": 9.25, "y": 0 },
+                { "matrix": [0, 5], "x": 10.25, "y": 0 },
+                { "matrix": [1, 5], "x": 11.25, "y": 0 },
+                { "matrix": [0, 6], "x": 12.25, "y": 0 },
+                { "matrix": [1, 6], "x": 13.25, "y": 0 },
+                { "matrix": [7, 6], "x": 14.25, "y": 0 },
+                { "matrix": [0, 7], "x": 15.25, "y": 0 },
+                { "matrix": [1, 7], "x": 16.25, "y": 0 },
+                { "matrix": [0, 8], "x": 17.25, "y": 0 },
+                { "matrix": [2, 0], "x": 0, "y": 1 },
+                { "matrix": [3, 0], "x": 1, "y": 1 },
+                { "matrix": [2, 1], "w": 1.5, "x": 2.25, "y": 1 },
+                { "matrix": [3, 1], "x": 3.75, "y": 1 },
+                { "matrix": [2, 2], "x": 4.75, "y": 1 },
+                { "matrix": [3, 2], "x": 5.75, "y": 1 },
+                { "matrix": [2, 3], "x": 6.75, "y": 1 },
+                { "matrix": [3, 3], "x": 7.75, "y": 1 },
+                { "matrix": [2, 4], "x": 8.75, "y": 1 },
+                { "matrix": [3, 4], "x": 9.75, "y": 1 },
+                { "matrix": [2, 5], "x": 10.75, "y": 1 },
+                { "matrix": [3, 5], "x": 11.75, "y": 1 },
+                { "matrix": [2, 6], "x": 12.75, "y": 1 },
+                { "matrix": [3, 6], "x": 13.75, "y": 1 },
+                { "matrix": [2, 7], "x": 14.75, "y": 1 },
+                { "matrix": [3, 7], "w": 1.5, "x": 15.75, "y": 1 },
+                { "matrix": [2, 8], "x": 17.25, "y": 1 },
+                { "matrix": [4, 0], "x": 0, "y": 2 },
+                { "matrix": [5, 0], "x": 1, "y": 2 },
+                { "matrix": [4, 1], "w": 1.75, "x": 2.25, "y": 2 },
+                { "matrix": [5, 1], "x": 4, "y": 2 },
+                { "matrix": [4, 2], "x": 5, "y": 2 },
+                { "matrix": [5, 2], "x": 6, "y": 2 },
+                { "matrix": [4, 3], "x": 7, "y": 2 },
+                { "matrix": [5, 3], "x": 8, "y": 2 },
+                { "matrix": [4, 4], "x": 9, "y": 2 },
+                { "matrix": [5, 4], "x": 10, "y": 2 },
+                { "matrix": [4, 5], "x": 11, "y": 2 },
+                { "matrix": [5, 5], "x": 12, "y": 2 },
+                { "matrix": [4, 6], "x": 13, "y": 2 },
+                { "matrix": [5, 6], "x": 14, "y": 2 },
+                { "matrix": [4, 7], "x": 19, "y": 2 },
+                { "matrix": [5, 7], "w": 2.25, "x": 15, "y": 2 },
+                { "matrix": [4, 8], "x": 17.25, "y": 2 },
+                { "matrix": [6, 0], "x": 0, "y": 3 },
+                { "matrix": [7, 0], "x": 1, "y": 3 },
+                { "matrix": [6, 1], "w": 1.25, "x": 2.25, "y": 3 },
+                { "matrix": [7, 1], "x": 3.5, "y": 3 },
+                { "matrix": [9, 2], "x": 4.5, "y": 3 },
+                { "matrix": [6, 2], "x": 5.5, "y": 3 },
+                { "matrix": [7, 2], "x": 6.5, "y": 3 },
+                { "matrix": [6, 3], "x": 7.5, "y": 3 },
+                { "matrix": [7, 3], "x": 8.5, "y": 3 },
+                { "matrix": [6, 4], "x": 9.5, "y": 3 },
+                { "matrix": [7, 4], "x": 10.5, "y": 3 },
+                { "matrix": [6, 5], "x": 11.5, "y": 3 },
+                { "matrix": [7, 5], "x": 12.5, "y": 3 },
+                { "matrix": [6, 6], "x": 13.5, "y": 3 },
+                { "matrix": [6, 7], "w": 1.75, "x": 14.5, "y": 3 },
+                { "matrix": [7, 7], "x": 16.25, "y": 3 },
+                { "matrix": [6, 8], "x": 17.25, "y": 3 },
+                { "matrix": [8, 0], "x": 0, "y": 4 },
+                { "matrix": [9, 0], "x": 1, "y": 4 },
+                { "matrix": [8, 1], "w": 1.5, "x": 2.25, "y": 4 },
+                { "matrix": [9, 1], "x": 3.75, "y": 4 },
+                { "matrix": [8, 2], "w": 1.5, "x": 4.75, "y": 4 },
+                { "matrix": [8, 4], "w": 7, "x": 6.25, "y": 4 },
+                { "matrix": [8, 6], "w": 1.5, "x": 13.25, "y": 4 },
+                { "matrix": [8, 7], "x": 15.25, "y": 4 },
+                { "matrix": [9, 7], "x": 16.25, "y": 4 },
+                { "matrix": [8, 8], "x": 17.25, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/wolf/ziggurat/keymaps/default/keymap.c b/keyboards/wolf/ziggurat/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e26689efa7
--- /dev/null
+++ b/keyboards/wolf/ziggurat/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_F1, KC_F6,       KC_ESC,  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_BSPC, KC_HOME,
+        KC_F2, KC_F7,       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_PGUP,
+        KC_F3, KC_F8,       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_NUHS, KC_ENT,  KC_PGDN,
+        KC_F4, KC_F9,       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_UP,   KC_END,
+        KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_F1, KC_F6,       KC_GRV,  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_DEL,  KC_DEL,  _______,
+        KC_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
+        KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_F4, KC_F9,       _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+        KC_F5, KC_F10,      _______, _______, _______,                            _______,                                     _______, _______, _______, _______
+    )
+
+};
diff --git a/keyboards/wolf/ziggurat/keymaps/via/keymap.c b/keyboards/wolf/ziggurat/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e26689efa7
--- /dev/null
+++ b/keyboards/wolf/ziggurat/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_F1, KC_F6,       KC_ESC,  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_BSPC, KC_HOME,
+        KC_F2, KC_F7,       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_PGUP,
+        KC_F3, KC_F8,       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_NUHS, KC_ENT,  KC_PGDN,
+        KC_F4, KC_F9,       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_UP,   KC_END,
+        KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_F1, KC_F6,       KC_GRV,  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_DEL,  KC_DEL,  _______,
+        KC_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
+        KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_F4, KC_F9,       _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+        KC_F5, KC_F10,      _______, _______, _______,                            _______,                                     _______, _______, _______, _______
+    )
+
+};
diff --git a/keyboards/wolf/ziggurat/keymaps/via/rules.mk b/keyboards/wolf/ziggurat/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/wolf/ziggurat/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/wolf/ziggurat/readme.md b/keyboards/wolf/ziggurat/readme.md
new file mode 100644
index 0000000000..d7aa00c077
--- /dev/null
+++ b/keyboards/wolf/ziggurat/readme.md
@@ -0,0 +1,23 @@
+# Ziggurat
+
+![Ziggurat](https://i.imgur.com/Vifx6vH.png)
+
+The following is the QMK Firmware for the Ziggurat PCB.
+
+* Keyboard Maintainer: [Wolf](https://github.com/ToastyStoemp)
+* Hardware Supported: Ziggurat PCB
+* Hardware Availability: https://www.eloquentclicks.com/product/ziggurat-plateless-leaf-spring-pcb-mount-65-xt/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wolf/ziggurat:default
+
+Flashing example for this keyboard:
+
+    make wolf/ziggurat: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 2 ways: 
+* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/wolf/ziggurat/rules.mk b/keyboards/wolf/ziggurat/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/wolf/ziggurat/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank