Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Support for Keyboard: TeaQueen #22352

Merged
merged 11 commits into from
Nov 1, 2023
Merged

Add Support for Keyboard: TeaQueen #22352

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a03979b
WIP: Initial draft of TeaQueen firmware and layout
gregandcin Oct 28, 2023
bc94fed
Merge branch 'qmk:master' into teaqueen-v1
gregandcin Oct 28, 2023
07de176
Fix issues with matrix layout
gregandcin Oct 28, 2023
d61fe4a
Add vendor ID, VIA layout
gregandcin Oct 28, 2023
e91bc94
Run qmk format-json on info.json
gregandcin Oct 28, 2023
6155585
Fix issues with readme, related info files
gregandcin Oct 28, 2023
cd89df5
Merge branch 'qmk:master' into teaqueen-v1
gregandcin Oct 28, 2023
5349d75
Make sure keymap files conform with C standards
gregandcin Oct 28, 2023
a5aaa90
Remove dead code
gregandcin Oct 28, 2023
990b3b7
Remove transport object
gregandcin Oct 29, 2023
5c17648
Merge branch 'qmk:master' into teaqueen-v1
gregandcin Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions keyboards/gregandcin/teaqueen/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"manufacturer": "gregandcin",
"keyboard_name": "gregandcin/teaqueen",
"maintainer": "gregandcin",
"bootloader": "rp2040",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "NO_PIN"],
"rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
},
"processor": "RP2040",
"split": {
"enabled": true,
"matrix_pins": {
"right": {
"cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
"rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
}
},
"soft_serial_pin": "GP3",
"transport": {
"protocol": "serial"
}
gregandcin marked this conversation as resolved.
Show resolved Hide resolved
},
"url": "https://github.com/gregandcin/teaqueen",
"usb": {
"device_version": "1.0.0",
"pid": "0x0000",
"vid": "0x4743"
},
"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}
]
}
}
}
9 changes: 9 additions & 0 deletions keyboards/gregandcin/teaqueen/keymaps/default/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2023 gregandcin (@gregandcin)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

/* Select hand configuration */
// #define MASTER_LEFT
// #define MASTER_RIGHT
#define EE_HANDS
40 changes: 40 additions & 0 deletions keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum custom_layer {
_QWERTY,
_SYMB,
_NAV
};


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_QWERTY] = LAYOUT(
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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(1), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),

[_SYMB] = LAYOUT(
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_TRNS,
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, 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,
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT),

[_NAV] = LAYOUT(
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_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, 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, 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),
};

9 changes: 9 additions & 0 deletions keyboards/gregandcin/teaqueen/keymaps/via/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2023 gregandcin (@gregandcin)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

/* Select hand configuration */
// #define MASTER_LEFT
// #define MASTER_RIGHT
#define EE_HANDS
40 changes: 40 additions & 0 deletions keyboards/gregandcin/teaqueen/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum custom_layer {
_QWERTY,
_SYMB,
_NAV
};


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_QWERTY] = LAYOUT(
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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(1), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),

[_SYMB] = LAYOUT(
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_TRNS,
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, 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,
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT),

[_NAV] = LAYOUT(
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_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, 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, 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),
};

1 change: 1 addition & 0 deletions keyboards/gregandcin/teaqueen/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
26 changes: 26 additions & 0 deletions keyboards/gregandcin/teaqueen/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# gregandcin/teaqueen

![gregandcin/teaqueen](https://i.imgur.com/Wf1EIqwh.png)

An Alice inspired, split layout keyboar featuring Kailh hotswap sockets.

* Keyboard Maintainer: [gregandcin](https://github.com/gregandcin)
* Hardware Supported: Elite-Pi, other RP2040 Community Edition Boards

Make example for this keyboard (after setting up your build environment):

make gregandcin/teaqueen:default

Flashing example for this keyboard:

make gregandcin/teaqueen: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
1 change: 1 addition & 0 deletions keyboards/gregandcin/teaqueen/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SERIAL_DRIVER = vendor