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

6 files changed, 244 insertions, 64 deletions

diff --git a/keyboards/beekeeb/piantor_pro/config.h b/keyboards/beekeeb/piantor_pro/config.h
new file mode 100644
index 0000000000..4f0be6dbbe
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/config.h
@@ -0,0 +1,17 @@
+// Copyright 2023 QMK
+// 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 GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+
+#define USB_VBUS_PIN GP19
+
+#define SPLIT_HAND_PIN GP17
+#define SPLIT_HAND_PIN_LOW_IS_LEFT
diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/info.json
new file mode 100644
index 0000000000..c85247550e
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/info.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "beekeeb",
+    "keyboard_name": "piantor_pro",
+    "maintainer": "beekeeb",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP7", "GP8", "GP9", "GP10"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0xBEEB"
+    },
+    "split": {
+        "enabled": true
+    },
+    "community_layouts": [ "split_3x6_3" ],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "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": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 5], "x": 8, "y": 0.25},
+                {"matrix": [4, 4], "x": 9, "y": 0.125},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.125},
+                {"matrix": [4, 1], "x": 12, "y": 0.25},
+                {"matrix": [4, 0], "x": 13, "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": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 5], "x": 8, "y": 1.25},
+                {"matrix": [5, 4], "x": 9, "y": 1.125},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.125},
+                {"matrix": [5, 1], "x": 12, "y": 1.25},
+                {"matrix": [5, 0], "x": 13, "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": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 5], "x": 8, "y": 2.25},
+                {"matrix": [6, 4], "x": 9, "y": 2.125},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.125},
+                {"matrix": [6, 1], "x": 12, "y": 2.25},
+                {"matrix": [6, 0], "x": 13, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 5], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 4], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ed09dd7d06
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// 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_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+    [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+    [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+    [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/beekeeb/piantor_pro/readme.md b/keyboards/beekeeb/piantor_pro/readme.md
new file mode 100644
index 0000000000..08012e43df
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/readme.md
@@ -0,0 +1,20 @@
+# Piantor Pro
+
+![Piantor Pro](https://i.imgur.com/UPRI64ch.jpg)
+
+A 42 key hotswappable keyboard with RP2040.
+
+* Keyboard Maintainer: [beekeeb](https://github.com/beekeeb)
+* Hardware Availability: [beekeeb.shop](https://beekeeb.shop)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beekeeb/piantor_pro:default
+
+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).
+
+## Flashing
+
+To enter the bootloader mode, disconnect the keyboard from the computer. While holding the BOOT button, connect the keyboard to the computer.
+
+Run `make beekeeb/piantor_pro:default:flash` or copy the compiled uf2 firmware to the USB mass storage device.
diff --git a/keyboards/beekeeb/piantor_pro/rules.mk b/keyboards/beekeeb/piantor_pro/rules.mk
new file mode 100644
index 0000000000..161ec22b16
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/info.json
index 6804ce003b..841c524e62 100644
--- a/keyboards/gregandcin/teaqueen/info.json
+++ b/keyboards/gregandcin/teaqueen/info.json
@@ -36,70 +36,79 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 2, "y": 1},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [0, 2], "x": 4, "y": 0.9},
-                {"matrix": [0, 3], "x": 5, "y": 0, "r": 12},
-                {"matrix": [0, 4], "x": 6, "y": 0, "r": 12},
-                {"matrix": [0, 5], "x": 7, "y": 0, "r": 12},
-                {"matrix": [0, 6], "x": 8, "y": 0, "r": 12},
-                {"matrix": [5, 0], "x": 11.5, "y": 0.75, "r": -12},
-                {"matrix": [5, 1], "x": 12.5, "y": 0.75, "r": -12},
-                {"matrix": [5, 2], "x": 13.5, "y": 0.75, "r": -12},
-                {"matrix": [5, 3], "x": 14.5, "y": 0.75, "r": -12},
-                {"matrix": [5, 4], "x": 13.4, "y": 0.9},
-                {"matrix": [5, 5], "x": 14.4, "y": 1},
-                {"matrix": [5, 6], "x": 15.4, "y": 1, "w": 2},
-                {"matrix": [1, 0], "x": 1.75, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 2},
-                {"matrix": [1, 3], "x": 4.5, "y": 1, "r": 12},
-                {"matrix": [1, 4], "x": 5.5, "y": 1, "r": 12},
-                {"matrix": [1, 5], "x": 6.5, "y": 1, "r": 12},
-                {"matrix": [1, 6], "x": 7.5, "y": 1, "r": 12},
-                {"matrix": [6, 0], "x": 11, "y": 1.75, "r": -12},
-                {"matrix": [6, 1], "x": 12, "y": 1.75, "r": -12},
-                {"matrix": [6, 2], "x": 13, "y": 1.75, "r": -12},
-                {"matrix": [6, 3], "x": 14, "y": 1.75, "r": -12},
-                {"matrix": [6, 4], "x": 13.13, "y": 1.95},
-                {"matrix": [6, 5], "x": 14.15, "y": 2},
-                {"matrix": [6, 6], "x": 15.15, "y": 2},
-                {"matrix": [6, 7], "x": 16.15, "y": 2, "w": 1.5},
-                {"matrix": [2, 0], "x": 1.6, "y": 3, "w": 1.76},
-                {"matrix": [2, 2], "x": 3.35, "y": 3},
-                {"matrix": [2, 3], "x": 4.75, "y": 2, "r": 12},
-                {"matrix": [2, 4], "x": 5.75, "y": 2, "r": 12},
-                {"matrix": [2, 5], "x": 6.75, "y": 2, "r": 12},
-                {"matrix": [2, 6], "x": 7.75, "y": 2, "r": 12},
-                {"matrix": [7, 0], "x": 11.25, "y": 2.75, "r": -12},
-                {"matrix": [7, 1], "x": 12.25, "y": 2.75, "r": -12},
-                {"matrix": [7, 2], "x": 13.25, "y": 2.75, "r": -12},
-                {"matrix": [7, 3], "x": 14.25, "y": 2.75, "r": -12},
-                {"matrix": [7, 4], "x": 13.6, "y": 3},
-                {"matrix": [7, 5], "x": 14.6, "y": 3},
-                {"matrix": [7, 7], "x": 15.6, "y": 3, "w": 2.25},
-                {"matrix": [3, 0], "x": 1.4, "y": 4, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.65, "y": 4},
-                {"matrix": [3, 3], "x": 5.25, "y": 3, "r": 12},
-                {"matrix": [3, 4], "x": 6.25, "y": 3, "r": 12},
-                {"matrix": [3, 5], "x": 7.25, "y": 3, "r": 12},
-                {"matrix": [3, 6], "x": 8.25, "y": 3, "r": 12},
-                {"matrix": [8, 0], "x": 10.75, "y": 3.75, "r": -12},
-                {"matrix": [8, 1], "x": 11.75, "y": 3.75, "r": -12},
-                {"matrix": [8, 2], "x": 12.75, "y": 3.75, "r": -12},
-                {"matrix": [8, 3], "x": 13.75, "y": 3.75, "r": -12},
-                {"matrix": [8, 4], "x": 13.3, "y": 4},
-                {"matrix": [8, 5], "x": 14.3, "y": 4},
-                {"matrix": [8, 6], "x": 15.3, "y": 4, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.05, "y": 4},
-                {"matrix": [4, 0], "x": 1.6, "y": 5, "w": 1.5},
-                {"matrix": [4, 1], "x": 3.1, "y": 5},
-                {"matrix": [4, 3], "x": 5.4, "y": 4.3, "w": 1.5, "r": 12},
-                {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 2, "r": 12},
-                {"matrix": [4, 6], "x": 8.75, "y": 4, "r": 12},
-                {"matrix": [9, 1], "x": 10.75, "y": 4.75, "w": 2.75, "r": -12},
-                {"matrix": [9, 3], "x": 13.6, "y": 4.8, "w": 1.5, "r": -12},
-                {"matrix": [9, 6], "x": 15.35, "y": 5},
-                {"matrix": [9, 7], "x": 16.35, "y": 5, "w": 1.5}
+                {"matrix": [0, 0], "x": 0.6, "y": 0},
+                {"matrix": [0, 1], "x": 1.6, "y": 0},
+                {"matrix": [0, 2], "x": 2.6, "y": 0},
+                {"matrix": [0, 3], "x": 3.6, "y": 0},
+                {"matrix": [0, 4], "x": 4.6, "y": 0},
+                {"matrix": [0, 5], "x": 5.6, "y": 0},
+                {"matrix": [0, 6], "x": 6.6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8.5, "y": 0},
+                {"matrix": [5, 1], "x": 9.5, "y": 0},
+                {"matrix": [5, 2], "x": 10.5, "y": 0},
+                {"matrix": [5, 3], "x": 11.5, "y": 0},
+                {"matrix": [5, 4], "x": 12.5, "y": 0},
+                {"matrix": [5, 5], "x": 13.5, "y": 0},
+                {"matrix": [5, 6], "x": 14.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.35, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.85, "y": 1},
+                {"matrix": [1, 3], "x": 2.85, "y": 1},
+                {"matrix": [1, 4], "x": 3.85, "y": 1},
+                {"matrix": [1, 5], "x": 4.85, "y": 1},
+                {"matrix": [1, 6], "x": 5.85, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.25, "y": 1},
+                {"matrix": [6, 1], "x": 9.25, "y": 1},
+                {"matrix": [6, 2], "x": 10.25, "y": 1},
+                {"matrix": [6, 3], "x": 11.25, "y": 1},
+                {"matrix": [6, 4], "x": 12.25, "y": 1},
+                {"matrix": [6, 5], "x": 13.25, "y": 1},
+                {"matrix": [6, 6], "x": 14.25, "y": 1},
+                {"matrix": [6, 7], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.95, "y": 2},
+                {"matrix": [2, 3], "x": 2.95, "y": 2},
+                {"matrix": [2, 4], "x": 3.95, "y": 2},
+                {"matrix": [2, 5], "x": 4.95, "y": 2},
+                {"matrix": [2, 6], "x": 5.95, "y": 2},
+
+                {"matrix": [7, 0], "x": 8.75, "y": 2},
+                {"matrix": [7, 1], "x": 9.75, "y": 2},
+                {"matrix": [7, 2], "x": 10.75, "y": 2},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 4], "x": 12.75, "y": 2},
+                {"matrix": [7, 5], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.45, "y": 3},
+                {"matrix": [8, 1], "x": 9.45, "y": 3},
+                {"matrix": [8, 2], "x": 10.45, "y": 3},
+                {"matrix": [8, 3], "x": 11.45, "y": 3},
+                {"matrix": [8, 4], "x": 12.45, "y": 3},
+                {"matrix": [8, 5], "x": 13.45, "y": 3},
+                {"matrix": [8, 6], "x": 14.45, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.2, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.7, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+
+                {"matrix": [9, 1], "x": 8.45, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 11.20, "y": 4, "w": 1.5},
+                {"matrix": [9, 6], "x": 14.5, "y": 4},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.5}
             ]
         }
     }