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

5 files changed, 161 insertions, 0 deletions

diff --git a/keyboards/beekeeb/piantor/config.h b/keyboards/beekeeb/piantor/config.h
new file mode 100644
index 0000000000..f8d74af211
--- /dev/null
+++ b/keyboards/beekeeb/piantor/config.h
@@ -0,0 +1,34 @@
+// Copyright 2022 beekeeb
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#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
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+#define DIRECT_PINS { \
+    { GP5, GP4, GP11, GP15, GP3, GP2}, \
+    { GP22, GP20, GP10, GP14, GP9, GP8}, \
+    { GP21, GP19, GP6, GP7, GP13, GP12}, \
+    { GP17, GP18, GP16, NO_PIN, NO_PIN, NO_PIN} \
+}
+
+#define DIRECT_PINS_RIGHT { \
+    { GP22, GP21, GP2, GP5, GP8, GP11}, \
+    { GP20, GP19, GP3, GP6, GP9, GP12}, \
+    { GP18, GP17, GP4, GP7, GP10, GP13}, \
+    { GP15, GP14, GP16, NO_PIN, NO_PIN, NO_PIN} \
+}
+
+#define BOOTMAGIC_LITE_ROW    0
+#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
new file mode 100644
index 0000000000..623e60be15
--- /dev/null
+++ b/keyboards/beekeeb/piantor/info.json
@@ -0,0 +1,73 @@
+{
+    "manufacturer": "beekeeb",
+    "keyboard_name": "piantor",
+    "maintainer": "beekeeb",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "debounce": 5,
+    "processor": "RP2040",
+    "url": "https://github.com/beekeeb/piantor",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0xBEEB"
+    },
+    "split": {
+        "enabled": true
+    },
+    "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, 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": [4, 5], "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, 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": [5, 5], "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, 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": [6, 5], "x": 13, "y": 2.25 },
+                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 5.5, "y": 3.75 },
+                { "matrix": [7, 0], "x": 7.5, "y": 3.75 },
+                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/beekeeb/piantor/keymaps/default/keymap.c b/keyboards/beekeeb/piantor/keymaps/default/keymap.c
new file mode 100644
index 0000000000..434e251fb7
--- /dev/null
+++ b/keyboards/beekeeb/piantor/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2022 beekeeb
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
+      * │Tab│ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Ctl│ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *               ┌───┐                   ┌───┐
+      *               │GUI├───┐           ┌───┤Alt│
+      *               └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *                   └───┤   │   │   ├───┘
+      *                       └───┘   └───┘
+      */
+    [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_RSFT,
+                                            KC_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    )
+};
diff --git a/keyboards/beekeeb/piantor/readme.md b/keyboards/beekeeb/piantor/readme.md
new file mode 100644
index 0000000000..5171fd547e
--- /dev/null
+++ b/keyboards/beekeeb/piantor/readme.md
@@ -0,0 +1,26 @@
+# Piantor
+
+![Piantor](https://i.imgur.com/xIF754Qh.jpg)
+
+Piantor is a Cantor fork with Raspberry Pi Pico, hybrid hotswap socket and soldered-in switches support, and a breakable column.
+
+* Keyboard Maintainer: [beekeeb](https://github.com/beekeeb)
+* Hardware Supported: RP2040
+* Hardware Availability: https://shop.beekeeb.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beekeeb/piantor:default
+
+Flashing example for this keyboard:
+
+    make beekeeb/piantor: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:
+
+* **Physical reset button**: Hold the `BOOTSEL` button on the PCB while plugin in the usb cable.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/beekeeb/piantor/rules.mk b/keyboards/beekeeb/piantor/rules.mk
new file mode 100644
index 0000000000..161ec22b16
--- /dev/null
+++ b/keyboards/beekeeb/piantor/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor