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

11 files changed, 311 insertions, 0 deletions

diff --git a/keyboards/budgy/config.h b/keyboards/budgy/config.h
new file mode 100644
index 0000000000..4543a048be
--- /dev/null
+++ b/keyboards/budgy/config.h
@@ -0,0 +1,14 @@
+// Copyright 2022 KeyboardDweebs (@doesntfazer)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP1
+#define SERIAL_USART_RX_PIN GP0
+
+// #define SERIAL_USART_PIN_SWAP
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
new file mode 100644
index 0000000000..631d2be9d1
--- /dev/null
+++ b/keyboards/budgy/info.json
@@ -0,0 +1,81 @@
+{
+    "manufacturer": "KeyboardDweebs",
+    "keyboard_name": "budgy",
+    "maintainer": "doesntfazer",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0117",
+        "vid": "0xFABE"
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP5", "GP4", "GP3", "GP2"],
+            ["GP11", "GP10", "GP9", "GP8", "GP7"],
+            ["GP15", "GP14", "GP13", "GP12", "GP16"],
+            ["GP17", "GP18", null, null, null]
+        ]
+    },
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP2", "GP3", "GP4", "GP5", "GP6"],
+                    ["GP7", "GP8", "GP9", "GP10", "GP11"],
+                    ["GP16", "GP12", "GP13", "GP14", "GP15"],
+                    ["GP18", "GP17", null, null, null]
+                ]
+            }
+        }
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.25 },
+                { "matrix": [0, 2], "x": 2, "y": 0.125 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0.125 },
+                { "matrix": [4, 0], "x": 8, "y": 0.25 },
+                { "matrix": [4, 1], "x": 9, "y": 0.125 },
+                { "matrix": [4, 2], "x": 10, "y": 0 },
+                { "matrix": [4, 3], "x": 11, "y": 0.125 },
+                { "matrix": [4, 4], "x": 12, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.125 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1.125 },
+                { "matrix": [5, 0], "x": 8, "y": 1.25 },
+                { "matrix": [5, 1], "x": 9, "y": 1.125 },
+                { "matrix": [5, 2], "x": 10, "y": 1 },
+                { "matrix": [5, 3], "x": 11, "y": 1.125 },
+                { "matrix": [5, 4], "x": 12, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.125 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2.125 },
+                { "matrix": [6, 0], "x": 8, "y": 2.25 },
+                { "matrix": [6, 1], "x": 9, "y": 2.125 },
+                { "matrix": [6, 2], "x": 10, "y": 2 },
+                { "matrix": [6, 3], "x": 11, "y": 2.125 },
+                { "matrix": [6, 4], "x": 12, "y": 2.25 },
+                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
+                { "matrix": [7, 0], "x": 7.5, "y": 3.75 },
+                { "matrix": [7, 1], "x": 8.5, "y": 3.5 }
+           ]
+        }
+    }
+}
diff --git a/keyboards/budgy/keymaps/default/keymap.c b/keyboards/budgy/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3bdf373598
--- /dev/null
+++ b/keyboards/budgy/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2021 Keyboard Dweebs (@doesntfazer)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+      * │ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │
+      * └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+      *               ┌───┐           ┌───┐
+      *               │Bsp├───┐   ┌───┤Ent│
+      *               └───┤Tab│   │Spc├───┘
+      *                   └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x5_2(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                                            KC_BSPC, KC_TAB,           KC_SPC,  KC_ENT
+    )
+};
diff --git a/keyboards/budgy/readme.md b/keyboards/budgy/readme.md
new file mode 100644
index 0000000000..a164a87acf
--- /dev/null
+++ b/keyboards/budgy/readme.md
@@ -0,0 +1,27 @@
+# budgy
+
+![budgy](https://i.imgur.com/6kjxmSMh.jpeg)
+
+34 key, diodeless, RP2040 based, budget keyboard.
+
+* Keyboard Maintainer: [KeyboardDweebs](https://github.com/doesntfazer)
+* Hardware Supported: Raspberry Pi Pico
+* Hardware Availability: [Github Page](https://github.com/doesntfazer/Budgy) Buy Directly from [Keyboard Dweebs](https://keyboarddweebs.net/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make budgy:default
+
+Flashing example for this keyboard:
+
+    make budgy: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
diff --git a/keyboards/budgy/rules.mk b/keyboards/budgy/rules.mk
new file mode 100644
index 0000000000..95546c6ef5
--- /dev/null
+++ b/keyboards/budgy/rules.mk
@@ -0,0 +1,2 @@
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = vendor
diff --git a/keyboards/crowboard/info.json b/keyboards/crowboard/info.json
new file mode 100644
index 0000000000..7744907fa7
--- /dev/null
+++ b/keyboards/crowboard/info.json
@@ -0,0 +1,66 @@
+{
+    "manufacturer": "KeyboardDweebs",
+    "keyboard_name": "crowboard",
+    "maintainer": "doesntfazer",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP18", "GP19", "GP20", "GP21", "GP22"],
+        "rows": ["GP14", "GP15", "GP16", "GP17"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "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": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 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": [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": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "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 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/crowboard/keymaps/default/config.h b/keyboards/crowboard/keymaps/default/config.h
new file mode 100644
index 0000000000..a50d8483dc
--- /dev/null
+++ b/keyboards/crowboard/keymaps/default/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 doesntfazer (@doesntfazer)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
diff --git a/keyboards/crowboard/keymaps/default/keymap.c b/keyboards/crowboard/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f6d51dc37c
--- /dev/null
+++ b/keyboards/crowboard/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+// Copyright 2021 Keyboard Dweebs (@doesntfazer)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define CTLA LCTL(KC_A)
+#define CAE LCTL(LALT(KC_END))
+#define CAD LCTL(LALT(KC_DEL))
+
+enum crow_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_QWERTY] = LAYOUT (
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        LCTL_T(KC_A),    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,
+        LSFT_T(KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT, RSFT_T(KC_SLSH),
+                          KC_LCTL,    TL_LOWR,    KC_SPACE,    KC_BSPC,    TL_UPPR,    KC_RALT
+    ),
+
+    [_LOWER] = LAYOUT (
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_TAB,    KC_LEFT,    KC_DOWN,    KC_UP,    KC_RIGHT,    KC_TRNS,    KC_MINUS,    KC_EQUAL,    KC_LBRC,    KC_RBRC,
+        KC_LCTL,    KC_GRAVE,    KC_LGUI,    KC_LALT,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_BSLS,    KC_SCLN,
+                          KC_TRNS,    TL_LOWR,    KC_TRNS,    KC_ENTER,    TL_UPPR,    KC_TRNS
+    ),
+    [_RAISE] = LAYOUT (
+        KC_EXLM,    KC_AT,    KC_HASH,    KC_DLR,    KC_PERC,    KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_LPRN,    KC_RPRN,
+        KC_ESC,    KC_DEL,    CTLA,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_UNDS,    KC_PLUS,    KC_LCBR,    KC_RCBR,
+        KC_CAPS,    KC_TILDE,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PIPE,    KC_COLN,
+                          KC_TRNS,    TL_LOWR,    KC_TRNS,    KC_TRNS,    TL_UPPR,    KC_TRNS
+    ),
+    [_ADJUST] = 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,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    CAD,    CAE,    CAD,    CAD,
+        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+                          KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS
+    ),
+};
+
+
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LCTL_T(KC_A):
+            // Do not force the mod-tap key press to be handled as a modifier
+            // if any other key was pressed while the mod-tap key is held down.
+            return false;
+        default:
+            // Force the mod-tap key press to be handled as a modifier if any
+            // other key was pressed while the mod-tap key is held down.
+            return true;
+    }
+}
+
+
+
diff --git a/keyboards/crowboard/keymaps/default/rules.mk b/keyboards/crowboard/keymaps/default/rules.mk
new file mode 100644
index 0000000000..7c9bf212a6
--- /dev/null
+++ b/keyboards/crowboard/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/crowboard/readme.md b/keyboards/crowboard/readme.md
new file mode 100644
index 0000000000..4603562626
--- /dev/null
+++ b/keyboards/crowboard/readme.md
@@ -0,0 +1,28 @@
+# crowboard
+
+![crowboard](https://i.imgur.com/Rg7IYPwh.jpg)
+
+RP2040 based 36 key keyboard
+
+* Keyboard Maintainer: [doesntfazer](https://github.com/doesntfazer)
+* Hardware Supported: Raspberry Pi Pico
+* Hardware Availability: keyboarddweebs.net
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Hold the button down on the raspberry pi pico while plugging it in. There is no reset button on the pcb.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make crowboard:default
+
+Flashing example for this keyboard:
+
+    make crowboard: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).
+
+
diff --git a/keyboards/crowboard/rules.mk b/keyboards/crowboard/rules.mk
new file mode 100644
index 0000000000..37ad1d4c60
--- /dev/null
+++ b/keyboards/crowboard/rules.mk
@@ -0,0 +1 @@
+PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS!