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

add new board: splaytoraid #20052

Merged
merged 16 commits into from
Mar 15, 2023
Merged

add new board: splaytoraid #20052

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c44aff6
add splaytoraid
Conor-Burns Mar 7, 2023
bd40d41
fix readme
Conor-Burns Mar 7, 2023
789894e
fix build issue
Conor-Burns Mar 7, 2023
15773c2
fix various issues
Conor-Burns Mar 7, 2023
243a40d
add encoder map to via
Conor-Burns Mar 7, 2023
92a16e3
move layer define
Conor-Burns Mar 7, 2023
70bd646
remove matrix size
Conor-Burns Mar 7, 2023
4d9155a
more fixes
Conor-Burns Mar 8, 2023
dd098eb
forgot those
Conor-Burns Mar 8, 2023
736aa7a
Update keyboards/0xcb/splaytoraid/info.json
Conor-Burns Mar 9, 2023
9470ae5
Update keyboards/0xcb/splaytoraid/info.json
Conor-Burns Mar 9, 2023
cbf8c76
add kb2040 and fix info.json
Conor-Burns Mar 12, 2023
6d9ec99
Merge branch 'add-splaytoraid' of github.com:0xCB-dev/qmk_firmware in…
Conor-Burns Mar 12, 2023
96be904
rely on converter for rp2040_ce
Conor-Burns Mar 12, 2023
58973ad
Update keyboards/0xcb/splaytoraid/info.json
Conor-Burns Mar 12, 2023
5a91960
Update keyboards/0xcb/splaytoraid/readme.md
Conor-Burns Mar 12, 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
24 changes: 24 additions & 0 deletions keyboards/0xcb/splaytoraid/32u4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"build": {
"lto": true
},
"matrix_pins": {
"cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"],
"rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"]
},
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "B5",
"pin_b": "B6",
"resolution": 4
}
]
},
"rgblight": {
"pin": "D0"
}
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
}
Empty file added keyboards/0xcb/splaytoraid/32u4/rules.mk
View file
Open in desktop
Empty file.
20 changes: 20 additions & 0 deletions keyboards/0xcb/splaytoraid/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Conor Burns (@Conor-Burns)
/* SPDX-License-Identifier: GPL-2.0-or-later */

#pragma once

#define RGB_MATRIX_LED_COUNT 18
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
#define RGB_MATRIX_DEFAULT_HUE 152
#define RGB_MATRIX_DEFAULT_SAT 232
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 50

#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_SOLID_COLOR
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
135 changes: 135 additions & 0 deletions keyboards/0xcb/splaytoraid/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
{
"manufacturer": "Freya",
"keyboard_name": "splaytoraid",
"maintainer": "freya-irl",
"url": "https://github.com/freya-irl/splaytoraid40",
"debounce": 5,
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
"diode_direction": "COL2ROW",
"usb": {
"device_version": "1.0.0",
"pid": "0xCB00",
"vid": "0x2004"
},
"features": {
"extrakey": true,
"rgb_matrix": true,
"bootmagic": true,
"console": true,
"mousekey": true,
"nkro": true
},
"bootmagic": {
"matrix": [7, 0]
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{ "flags": 4, "matrix": [0, 2], "x": 0, "y": 0 },
{ "flags": 4, "matrix": [1, 0], "x": 20, "y": 0 },
{ "flags": 4, "matrix": [7, 0], "x": 61, "y": 0 },
{ "flags": 4, "matrix": [7, 1], "x": 163, "y": 0 },
{ "flags": 4, "matrix": [5, 0], "x": 203, "y": 0 },
{ "flags": 4, "matrix": [4, 2], "x": 224, "y": 0 },
{ "flags": 4, "matrix": [6, 2], "x": 0, "y": 21 },
{ "flags": 4, "matrix": [6, 1], "x": 224, "y": 21 },
{ "flags": 4, "matrix": [3, 3], "x": 20, "y": 43 },
{ "flags": 4, "matrix": [7, 3], "x": 61, "y": 43 },
{ "flags": 4, "matrix": [6, 4], "x": 163, "y": 43 },
{ "flags": 4, "matrix": [6, 3], "x": 203, "y": 43 },
{ "flags": 4, "matrix": [4, 3], "x": 61, "y": 64 },
{ "flags": 4, "matrix": [5, 5], "x": 81, "y": 64 },
{ "flags": 4, "matrix": [7, 4], "x": 101, "y": 64 },
{ "flags": 4, "matrix": [7, 5], "x": 122, "y": 64 },
{ "flags": 4, "matrix": [1, 5], "x": 142, "y": 64 },
{ "flags": 4, "matrix": [0, 3], "x": 163, "y": 64 }
]
},
"layouts": {
"LAYOUT_36": {
"layout": [
{ "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 3, "y": 0 },
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
{ "label": "K52", "matrix": [5, 2], "w": 1, "x": 5, "y": 0 },
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 6, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 7, "y": 0 },
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
{ "label": "K30", "matrix": [3, 0], "w": 1, "x": 10, "y": 0 },
{ "label": "K31", "matrix": [3, 1], "w": 1, "x": 11, "y": 0 },
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 12, "y": 0 },
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 13, "y": 0 },
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 14, "y": 0 },
{ "label": "K53", "matrix": [5, 3], "w": 1, "x": 15, "y": 0 },
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 16, "y": 0 },
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 17, "y": 0 },
{ "label": "K34", "matrix": [3, 4], "w": 1, "x": 18, "y": 0 },
{ "label": "K35", "matrix": [3, 5], "w": 1, "x": 19, "y": 0 },
{ "label": "K50", "matrix": [5, 0], "w": 1, "x": 20, "y": 0 },
{ "label": "K51", "matrix": [5, 1], "w": 1, "x": 21, "y": 0 },
{ "label": "K42", "matrix": [4, 2], "w": 1, "x": 22, "y": 0 },
{ "label": "K41", "matrix": [4, 1], "w": 1, "x": 23, "y": 0 },
{ "label": "K32", "matrix": [3, 2], "w": 1, "x": 24, "y": 0 },
{ "label": "K72", "matrix": [7, 2], "w": 1, "x": 25, "y": 0 },
{ "label": "K44", "matrix": [4, 4], "w": 1, "x": 26, "y": 0 },
{ "label": "K43", "matrix": [4, 3], "w": 1, "x": 27, "y": 0 },
{ "label": "K54", "matrix": [5, 4], "w": 1, "x": 28, "y": 0 },
{ "label": "K55", "matrix": [5, 5], "w": 1, "x": 29, "y": 0 },
{ "label": "K62", "matrix": [6, 2], "w": 1, "x": 30, "y": 0 },
{ "label": "K61", "matrix": [6, 1], "w": 1, "x": 31, "y": 0 },
{ "label": "K33", "matrix": [3, 3], "w": 1, "x": 32, "y": 0 },
{ "label": "K66", "matrix": [6, 6], "w": 1, "x": 33, "y": 0 },
{ "label": "K73", "matrix": [7, 3], "w": 1, "x": 34, "y": 0 },
{ "label": "K64", "matrix": [6, 4], "w": 1, "x": 35, "y": 0 },
{ "label": "K63", "matrix": [6, 3], "w": 1, "x": 36, "y": 0 }
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
]
},
"LAYOUT_40": {
"layout": [
{ "label": "K70", "matrix": [7, 0], "w": 1, "x": 0, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "w": 1, "x": 1, "y": 0 },
{ "label": "K11", "matrix": [1, 1], "w": 1, "x": 2, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "w": 1, "x": 4, "y": 0 },
{ "label": "K12", "matrix": [1, 2], "w": 1, "x": 5, "y": 0 },
{ "label": "K52", "matrix": [5, 2], "w": 1, "x": 6, "y": 0 },
{ "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "w": 1, "x": 8, "y": 0 },
{ "label": "K14", "matrix": [1, 4], "w": 1, "x": 9, "y": 0 },
{ "label": "K15", "matrix": [1, 5], "w": 1, "x": 10, "y": 0 },
{ "label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 0 },
{ "label": "K71", "matrix": [7, 1], "w": 1, "x": 12, "y": 0 },
{ "label": "K30", "matrix": [3, 0], "w": 1, "x": 13, "y": 0 },
{ "label": "K31", "matrix": [3, 1], "w": 1, "x": 14, "y": 0 },
{ "label": "K22", "matrix": [2, 2], "w": 1, "x": 15, "y": 0 },
{ "label": "K21", "matrix": [2, 1], "w": 1, "x": 16, "y": 0 },
{ "label": "K13", "matrix": [1, 3], "w": 1, "x": 17, "y": 0 },
{ "label": "K53", "matrix": [5, 3], "w": 1, "x": 18, "y": 0 },
{ "label": "K24", "matrix": [2, 4], "w": 1, "x": 19, "y": 0 },
{ "label": "K23", "matrix": [2, 3], "w": 1, "x": 20, "y": 0 },
{ "label": "K34", "matrix": [3, 4], "w": 1, "x": 21, "y": 0 },
{ "label": "K35", "matrix": [3, 5], "w": 1, "x": 22, "y": 0 },
{ "label": "K74", "matrix": [7, 4], "w": 1, "x": 23, "y": 0 },
{ "label": "K50", "matrix": [5, 0], "w": 1, "x": 24, "y": 0 },
{ "label": "K51", "matrix": [5, 1], "w": 1, "x": 25, "y": 0 },
{ "label": "K42", "matrix": [4, 2], "w": 1, "x": 26, "y": 0 },
{ "label": "K41", "matrix": [4, 1], "w": 1, "x": 27, "y": 0 },
{ "label": "K32", "matrix": [3, 2], "w": 1, "x": 28, "y": 0 },
{ "label": "K72", "matrix": [7, 2], "w": 1, "x": 29, "y": 0 },
{ "label": "K44", "matrix": [4, 4], "w": 1, "x": 30, "y": 0 },
{ "label": "K43", "matrix": [4, 3], "w": 1, "x": 31, "y": 0 },
{ "label": "K54", "matrix": [5, 4], "w": 1, "x": 32, "y": 0 },
{ "label": "K55", "matrix": [5, 5], "w": 1, "x": 33, "y": 0 },
{ "label": "K62", "matrix": [6, 2], "w": 1, "x": 34, "y": 0 },
{ "label": "K61", "matrix": [6, 1], "w": 1, "x": 35, "y": 0 },
{ "label": "K33", "matrix": [3, 3], "w": 1, "x": 36, "y": 0 },
{ "label": "K66", "matrix": [6, 6], "w": 1, "x": 37, "y": 0 },
{ "label": "K73", "matrix": [7, 3], "w": 1, "x": 38, "y": 0 },
{ "label": "K64", "matrix": [6, 4], "w": 1, "x": 39, "y": 0 },
{ "label": "K63", "matrix": [6, 3], "w": 1, "x": 40, "y": 0 }
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
]
}
}
}
49 changes: 49 additions & 0 deletions keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2023 Conor Burns (@Conor-Burns)
/* SPDX-License-Identifier: GPL-2.0-or-later */

#include QMK_KEYBOARD_H

enum layer_names {
_BASE,
_LOWER,
_RAISE,
_ADJUST
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_40(
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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LSFT, KC_ESC, KC_ENT, KC_MPLY, KC_SPC, KC_DEL, KC_RSFT
),

[_LOWER] = LAYOUT_40(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),

[_RAISE] = LAYOUT_40(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),

[_ADJUST] = LAYOUT_40(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved
};


const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_LOWER] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
[_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[_ADJUST] = { ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }
};
1 change: 1 addition & 0 deletions keyboards/0xcb/splaytoraid/keymaps/default/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
21 changes: 21 additions & 0 deletions keyboards/0xcb/splaytoraid/keymaps/pi/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2023 Dreipunkteinsvier (@dreipunkteinsvier)
/* SPDX-License-Identifier: GPL-2.0-or-later */

#pragma once
Conor-Burns marked this conversation as resolved.
Show resolved Hide resolved

#define TAPPING_TERM 180

// Prevent normal rollover on alphas from accidentally triggering mods.
#define IGNORE_MOD_TAP_INTERRUPT

#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE


#ifdef COMBO_ENABLE
#define COMBO_COUNT 9
#define COMBO_TERM 20
#define COMBO_ONLY_FROM_LAYER 0
#endif

#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
Loading