sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'tags/0.21.0'

Browse Source
This commit is contained in:
Marius Alwan Meyer
2023-05-30 00:43:33 +02:00
parent d83a59b5f9 5024370dd0
commit dbed402ce0
13519 changed files with 498707 additions and 489967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/splitkb/aurora/corne/keymaps/x123/config.h
View File

@@ -21,5 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 280
#define IGNORE_MOD_TAP_INTERRUPT
#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX

134
keyboards/splitkb/aurora/corne/rev1/info.json
View File

@@ -19,50 +19,50 @@
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
{"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3},
{"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3},
{"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1},
{"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2},
{"label": "R01", "matrix": [4, 5], "x": 9, "y": 0.2},
{"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3},
{"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3},
{"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1},
{"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2},
{"label": "R01", "matrix": [4, 5], "x": 9, "y": 0.2},
{"label": "R02", "matrix": [4, 4], "x": 10, "y": 0.1},
{"label": "R03", "matrix": [4, 3], "x": 11, "y": 0},
{"label": "R04", "matrix": [4, 2], "x": 12, "y": 0.1},
{"label": "R05", "matrix": [4, 1], "x": 13, "y": 0.3},
{"label": "R06", "matrix": [4, 0], "x": 14, "y": 0.3},
{"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3},
{"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3},
{"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1},
{"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2},
{"label": "R07", "matrix": [5, 5], "x": 9, "y": 1.2},
{"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3},
{"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3},
{"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1},
{"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2},
{"label": "R07", "matrix": [5, 5], "x": 9, "y": 1.2},
{"label": "R08", "matrix": [5, 4], "x": 10, "y": 1.1},
{"label": "R09", "matrix": [5, 3], "x": 11, "y": 1},
{"label": "R10", "matrix": [5, 2], "x": 12, "y": 1.1},
{"label": "R11", "matrix": [5, 1], "x": 13, "y": 1.3},
{"label": "R12", "matrix": [5, 0], "x": 14, "y": 1.3},
{"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3},
{"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3},
{"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1},
{"label": "L15", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1},
{"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2},
{"label": "R13", "matrix": [6, 5], "x": 9, "y": 2.2},
{"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3},
{"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3},
{"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1},
{"label": "L15", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1},
{"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2},
{"label": "R13", "matrix": [6, 5], "x": 9, "y": 2.2},
{"label": "R14", "matrix": [6, 4], "x": 10, "y": 2.1},
{"label": "R15", "matrix": [6, 3], "x": 11, "y": 2},
{"label": "R16", "matrix": [6, 2], "x": 12, "y": 2.1},
{"label": "R17", "matrix": [6, 1], "x": 13, "y": 2.3},
{"label": "R18", "matrix": [6, 0], "x": 14, "y": 2.3},
{"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7},
{"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7},
{"label": "L19", "matrix": [3, 5], "x": 6, "y": 3.2},
{"label": "R19", "matrix": [7, 5], "x": 8, "y": 3.2},
{"label": "R20", "matrix": [7, 4], "x": 9, "y": 3.7},
{"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7},
{"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7},
{"label": "L19", "matrix": [3, 5], "x": 6, "y": 3.2},
{"label": "R19", "matrix": [7, 5], "x": 8, "y": 3.2},
{"label": "R20", "matrix": [7, 4], "x": 9, "y": 3.7},
{"label": "R21", "matrix": [7, 3], "x": 10, "y": 3.7}
]
}
@@ -75,10 +75,7 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "D4",
"pin_b": "C6"
}
{"pin_a": "D4", "pin_b": "C6"}
]
},
"split": {
@@ -96,54 +93,53 @@
"encoder": {
"right": {
"rotary": [
{
"pin_a": "F6",
"pin_b": "F7"
}
{"pin_a": "F6", "pin_b": "F7"}
]
}
}
},
"rgblight": {
"pin": "D3",
"led_count": 54,
"split": true,
"split_count": [27, 27],
"max_brightness": 128
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{"flags": 2, "x": 93, "y": 17}, // L RGB1
{"flags": 2, "x": 59, "y": 3}, // L RGB2
{"flags": 2, "x": 25, "y": 7}, // L RGB3
{"flags": 2, "x": 29, "y": 49}, // L RGB4
{"flags": 2, "x": 70, "y": 51}, // L RGB5
{"flags": 2, "x": 93, "y": 17}, // L RGB1
{"flags": 2, "x": 59, "y": 3}, // L RGB2
{"flags": 2, "x": 25, "y": 7}, // L RGB3
{"flags": 2, "x": 29, "y": 49}, // L RGB4
{"flags": 2, "x": 70, "y": 51}, // L RGB5
{"flags": 2, "x": 104, "y": 55}, // L RGB6
{"flags": 4, "matrix": [3, 2], "x": 95, "y": 63}, // L SW19
{"flags": 4, "matrix": [3, 1], "x": 80, "y": 58}, // L SW20
{"flags": 4, "matrix": [3, 0], "x": 60, "y": 55}, // L SW21
{"flags": 4, "matrix": [2, 5], "x": 85, "y": 39}, // L SW13
{"flags": 4, "matrix": [2, 4], "x": 68, "y": 37}, // L SW14
{"flags": 4, "matrix": [2, 3], "x": 50, "y": 35}, // L SW15
{"flags": 4, "matrix": [2, 2], "x": 33, "y": 37}, // L SW16
{"flags": 4, "matrix": [2, 1], "x": 16, "y": 42}, // L SW17
{"flags": 4, "matrix": [1, 5], "x": 85, "y": 21}, // L SW07
{"flags": 4, "matrix": [1, 4], "x": 68, "y": 19}, // L SW08
{"flags": 4, "matrix": [1, 3], "x": 50, "y": 13}, // L SW09
{"flags": 4, "matrix": [1, 2], "x": 33, "y": 20}, // L SW10
{"flags": 4, "matrix": [1, 1], "x": 16, "y": 24}, // L SW11
{"flags": 4, "matrix": [0, 5], "x": 85, "y": 4}, // L SW01
{"flags": 4, "matrix": [0, 4], "x": 68, "y": 2}, // L SW02
{"flags": 4, "matrix": [0, 3], "x": 50, "y": 0}, // L SW03
{"flags": 4, "matrix": [0, 2], "x": 33, "y": 3}, // L SW04
{"flags": 4, "matrix": [0, 1], "x": 16, "y": 7}, // L SW05
{"flags": 4, "matrix": [0, 0], "x": 0, "y": 7}, // L SW06
{"flags": 4, "matrix": [1, 0], "x": 0, "y": 24}, // L SW12
{"flags": 4, "matrix": [2, 0], "x": 0, "y": 41}, // L SW18
{"flags": 4, "matrix": [3, 2], "x": 95, "y": 63}, // L SW19
{"flags": 4, "matrix": [3, 1], "x": 80, "y": 58}, // L SW20
{"flags": 4, "matrix": [3, 0], "x": 60, "y": 55}, // L SW21
{"flags": 4, "matrix": [2, 5], "x": 85, "y": 39}, // L SW13
{"flags": 4, "matrix": [2, 4], "x": 68, "y": 37}, // L SW14
{"flags": 4, "matrix": [2, 3], "x": 50, "y": 35}, // L SW15
{"flags": 4, "matrix": [2, 2], "x": 33, "y": 37}, // L SW16
{"flags": 4, "matrix": [2, 1], "x": 16, "y": 42}, // L SW17
{"flags": 4, "matrix": [1, 5], "x": 85, "y": 21}, // L SW07
{"flags": 4, "matrix": [1, 4], "x": 68, "y": 19}, // L SW08
{"flags": 4, "matrix": [1, 3], "x": 50, "y": 13}, // L SW09
{"flags": 4, "matrix": [1, 2], "x": 33, "y": 20}, // L SW10
{"flags": 4, "matrix": [1, 1], "x": 16, "y": 24}, // L SW11
{"flags": 4, "matrix": [0, 5], "x": 85, "y": 4}, // L SW01
{"flags": 4, "matrix": [0, 4], "x": 68, "y": 2}, // L SW02
{"flags": 4, "matrix": [0, 3], "x": 50, "y": 0}, // L SW03
{"flags": 4, "matrix": [0, 2], "x": 33, "y": 3}, // L SW04
{"flags": 4, "matrix": [0, 1], "x": 16, "y": 7}, // L SW05
{"flags": 4, "matrix": [0, 0], "x": 0, "y": 7}, // L SW06
{"flags": 4, "matrix": [1, 0], "x": 0, "y": 24}, // L SW12
{"flags": 4, "matrix": [2, 0], "x": 0, "y": 41}, // L SW18
{"flags": 2, "x": 131, "y": 17}, // R RGB1
{"flags": 2, "x": 165, "y": 3}, // R RGB2
{"flags": 2, "x": 199, "y": 7}, // R RGB3
{"flags": 2, "x": 165, "y": 3}, // R RGB2
{"flags": 2, "x": 199, "y": 7}, // R RGB3
{"flags": 2, "x": 195, "y": 49}, // R RGB4
{"flags": 2, "x": 154, "y": 51}, // R RGB5
{"flags": 2, "x": 120, "y": 55}, // R RGB6
@@ -160,12 +156,12 @@
{"flags": 4, "matrix": [5, 3], "x": 174, "y": 13}, // R SW09
{"flags": 4, "matrix": [5, 2], "x": 191, "y": 20}, // R SW10
{"flags": 4, "matrix": [5, 1], "x": 208, "y": 24}, // R SW11
{"flags": 4, "matrix": [4, 5], "x": 139, "y": 4}, // R SW01
{"flags": 4, "matrix": [4, 4], "x": 156, "y": 2}, // R SW02
{"flags": 4, "matrix": [4, 3], "x": 174, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 2], "x": 191, "y": 3}, // R SW04
{"flags": 4, "matrix": [4, 1], "x": 208, "y": 7}, // R SW05
{"flags": 4, "matrix": [4, 0], "x": 224, "y": 7}, // R SW06
{"flags": 4, "matrix": [4, 5], "x": 139, "y": 4}, // R SW01
{"flags": 4, "matrix": [4, 4], "x": 156, "y": 2}, // R SW02
{"flags": 4, "matrix": [4, 3], "x": 174, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 2], "x": 191, "y": 3}, // R SW04
{"flags": 4, "matrix": [4, 1], "x": 208, "y": 7}, // R SW05
{"flags": 4, "matrix": [4, 0], "x": 224, "y": 7}, // R SW06
{"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12
{"flags": 4, "matrix": [6, 0], "x": 224, "y": 41} // R SW18
]

2
keyboards/splitkb/aurora/corne/rev1/rev1.c
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off

1
keyboards/splitkb/aurora/lily58/rev1/config.h
View File

@@ -28,7 +28,6 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define SPLIT_TRANSPORT_MIRROR

162
keyboards/splitkb/aurora/lily58/rev1/info.json
View File

@@ -13,12 +13,12 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5},
{"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375},
{"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125},
{"label": "L04", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125},
{"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25},
{"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5},
{"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375},
{"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125},
{"label": "L04", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125},
{"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25},
{"label": "R06", "matrix": [5, 5], "x": 10.5, "y": 0.25},
{"label": "R05", "matrix": [5, 4], "x": 11.5, "y": 0.125},
{"label": "R04", "matrix": [5, 3], "x": 12.5, "y": 0},
@@ -26,12 +26,12 @@
{"label": "R02", "matrix": [5, 1], "x": 14.5, "y": 0.375},
{"label": "R01", "matrix": [5, 0], "x": 15.5, "y": 0.5},
{"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5},
{"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375},
{"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125},
{"label": "L10", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125},
{"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25},
{"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5},
{"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375},
{"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125},
{"label": "L10", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125},
{"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25},
{"label": "R12", "matrix": [6, 5], "x": 10.5, "y": 1.25},
{"label": "R11", "matrix": [6, 4], "x": 11.5, "y": 1.125},
{"label": "R10", "matrix": [6, 3], "x": 12.5, "y": 1},
@@ -39,12 +39,12 @@
{"label": "R08", "matrix": [6, 1], "x": 14.5, "y": 1.375},
{"label": "R07", "matrix": [6, 0], "x": 15.5, "y": 1.5},
{"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5},
{"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375},
{"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125},
{"label": "L16", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125},
{"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25},
{"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5},
{"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375},
{"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125},
{"label": "L16", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125},
{"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25},
{"label": "R18", "matrix": [7, 5], "x": 10.5, "y": 2.25},
{"label": "R17", "matrix": [7, 4], "x": 11.5, "y": 2.125},
{"label": "R16", "matrix": [7, 3], "x": 12.5, "y": 2},
@@ -52,14 +52,14 @@
{"label": "R14", "matrix": [7, 1], "x": 14.5, "y": 2.375},
{"label": "R13", "matrix": [7, 0], "x": 15.5, "y": 2.5},
{"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5},
{"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375},
{"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125},
{"label": "L23", "matrix": [3, 3], "x": 3, "y": 3},
{"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125},
{"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25},
{"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75},
{"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75},
{"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5},
{"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375},
{"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125},
{"label": "L23", "matrix": [3, 3], "x": 3, "y": 3},
{"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125},
{"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25},
{"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75},
{"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75},
{"label": "R25", "matrix": [8, 5], "x": 10.5, "y": 3.25},
{"label": "R24", "matrix": [8, 4], "x": 11.5, "y": 3.125},
{"label": "R23", "matrix": [8, 3], "x": 12.5, "y": 3},
@@ -67,14 +67,14 @@
{"label": "R21", "matrix": [8, 1], "x": 14.5, "y": 3.375},
{"label": "R20", "matrix": [8, 0], "x": 15.5, "y": 3.5},
{"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15},
{"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15},
{"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25},
{"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25},
{"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25},
{"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25},
{"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15},
{"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15}
{"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15},
{"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15},
{"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25},
{"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25},
{"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25},
{"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25},
{"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15},
{"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15}
]
}
},
@@ -86,10 +86,7 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "C6",
"pin_b": "D4"
}
{"pin_a": "C6", "pin_b": "D4"}
]
},
"split": {
@@ -107,69 +104,68 @@
"encoder": {
"right": {
"rotary": [
{
"pin_a": "F7",
"pin_b": "F6"
}
{"pin_a": "F7", "pin_b": "F6"}
]
}
}
},
"rgblight": {
"pin": "D3",
"led_count": 68,
"split": true,
"split_count": [34, 34],
"max_brightness": 128
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{"flags": 2, "x": 51, "y": 13}, // L RGB1
{"flags": 2, "x": 22, "y": 18}, // L RGB2
{"flags": 2, "x": 22, "y": 53}, // L RGB3
{"flags": 2, "x": 58, "y": 60}, // L RGB4
{"flags": 2, "x": 87, "y": 56}, // L RGB5
{"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01
{"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02
{"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03
{"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04
{"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05
{"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06
{"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07
{"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08
{"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09
{"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10
{"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11
{"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12
{"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13
{"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14
{"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15
{"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16
{"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17
{"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18
{"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20
{"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21
{"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22
{"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23
{"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24
{"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25
{"flags": 4, "matrix": [4, 1], "x": 87, "y": 41}, // L SW19
{"flags": 4, "matrix": [4, 2], "x": 36, "y": 62}, // L SW26
{"flags": 4, "matrix": [4, 3], "x": 51, "y": 62}, // L SW27
{"flags": 4, "matrix": [4, 4], "x": 65, "y": 64}, // L SW28
{"flags": 4, "matrix": [4, 5], "x": 87, "y": 64}, // L SW29
{"flags": 2, "x": 51, "y": 13}, // L RGB1
{"flags": 2, "x": 22, "y": 18}, // L RGB2
{"flags": 2, "x": 22, "y": 53}, // L RGB3
{"flags": 2, "x": 58, "y": 60}, // L RGB4
{"flags": 2, "x": 87, "y": 56}, // L RGB5
{"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01
{"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02
{"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03
{"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04
{"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05
{"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06
{"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07
{"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08
{"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09
{"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10
{"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11
{"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12
{"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13
{"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14
{"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15
{"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16
{"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17
{"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18
{"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20
{"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21
{"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22
{"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23
{"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24
{"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25
{"flags": 4, "matrix": [4, 1], "x": 87, "y": 41}, // L SW19
{"flags": 4, "matrix": [4, 2], "x": 36, "y": 62}, // L SW26
{"flags": 4, "matrix": [4, 3], "x": 51, "y": 62}, // L SW27
{"flags": 4, "matrix": [4, 4], "x": 65, "y": 64}, // L SW28
{"flags": 4, "matrix": [4, 5], "x": 87, "y": 64}, // L SW29
{"flags": 2, "x": 173, "y": 13}, // R RGB1
{"flags": 2, "x": 202, "y": 18}, // R RGB2
{"flags": 2, "x": 202, "y": 53}, // R RGB3
{"flags": 2, "x": 166, "y": 60}, // R RGB4
{"flags": 2, "x": 137, "y": 56}, // R RGB5
{"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06
{"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05
{"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04
{"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03
{"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02
{"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01
{"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06
{"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05
{"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04
{"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03
{"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02
{"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01
{"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12
{"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11
{"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10

2
keyboards/splitkb/aurora/lily58/rev1/rev1.c
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off

1
keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
View File

@@ -79,7 +79,6 @@
"tapping": {
"term": 200,
"permissive_hold": true,
"ignore_mod_tap_interrupt": true,
"force_hold": true
}
}

5
keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c
View File

@@ -96,12 +96,7 @@ enum combos {
SHIFT_LEFT,
ALTGR_LEFT,
CONTROL_SHIFT_LEFT,
/* Just to replace the define in config.h */
COMBO_LENGTH,
};
uint16_t COMBO_LEN = COMBO_LENGTH;
/* Sequences fo keys */
const uint16_t PROGMEM combo_leader[] = {LT(_MOUSE, KC_COMM), LT(_ARROWS, KC_DOT), COMBO_END};

1
keyboards/splitkb/aurora/sweep/rev1/config.h
View File

@@ -28,7 +28,6 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define SPLIT_TRANSPORT_MIRROR

128
keyboards/splitkb/aurora/sweep/rev1/info.json
View File

@@ -19,36 +19,36 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
{"label": "L01", "matrix": [0, 4], "x": 0, "y": 0.93},
{"label": "L02", "matrix": [0, 3], "x": 1, "y": 0.31},
{"label": "L03", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "L04", "matrix": [0, 1], "x": 3, "y": 0.28},
{"label": "L05", "matrix": [0, 0], "x": 4, "y": 0.42},
{"label": "R05", "matrix": [4, 0], "x": 7, "y": 0.42},
{"label": "R04", "matrix": [4, 1], "x": 8, "y": 0.28},
{"label": "R03", "matrix": [4, 2], "x": 9, "y": 0},
{"label": "L01", "matrix": [0, 4], "x": 0, "y": 0.93},
{"label": "L02", "matrix": [0, 3], "x": 1, "y": 0.31},
{"label": "L03", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "L04", "matrix": [0, 1], "x": 3, "y": 0.28},
{"label": "L05", "matrix": [0, 0], "x": 4, "y": 0.42},
{"label": "R05", "matrix": [4, 0], "x": 7, "y": 0.42},
{"label": "R04", "matrix": [4, 1], "x": 8, "y": 0.28},
{"label": "R03", "matrix": [4, 2], "x": 9, "y": 0},
{"label": "R02", "matrix": [4, 3], "x": 10, "y": 0.31},
{"label": "R01", "matrix": [4, 4], "x": 11, "y": 0.93},
{"label": "L06", "matrix": [1, 4], "x": 0, "y": 1.93},
{"label": "L07", "matrix": [1, 3], "x": 1, "y": 1.31},
{"label": "L08", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "L09", "matrix": [1, 1], "x": 3, "y": 1.28},
{"label": "L10", "matrix": [1, 0], "x": 4, "y": 1.42},
{"label": "R10", "matrix": [5, 0], "x": 7, "y": 1.42},
{"label": "R09", "matrix": [5, 1], "x": 8, "y": 1.28},
{"label": "R08", "matrix": [5, 2], "x": 9, "y": 1},
{"label": "L06", "matrix": [1, 4], "x": 0, "y": 1.93},
{"label": "L07", "matrix": [1, 3], "x": 1, "y": 1.31},
{"label": "L08", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "L09", "matrix": [1, 1], "x": 3, "y": 1.28},
{"label": "L10", "matrix": [1, 0], "x": 4, "y": 1.42},
{"label": "R10", "matrix": [5, 0], "x": 7, "y": 1.42},
{"label": "R09", "matrix": [5, 1], "x": 8, "y": 1.28},
{"label": "R08", "matrix": [5, 2], "x": 9, "y": 1},
{"label": "R07", "matrix": [5, 3], "x": 10, "y": 1.31},
{"label": "R06", "matrix": [5, 4], "x": 11, "y": 1.93},
{"label": "L11", "matrix": [2, 4], "x": 0, "y": 2.93},
{"label": "L12", "matrix": [2, 3], "x": 1, "y": 2.31},
{"label": "L13", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "L14", "matrix": [2, 1], "x": 3, "y": 2.28},
{"label": "L15", "matrix": [2, 0], "x": 4, "y": 2.42},
{"label": "R15", "matrix": [6, 0], "x": 7, "y": 2.42},
{"label": "R14", "matrix": [6, 1], "x": 8, "y": 2.28},
{"label": "R13", "matrix": [6, 2], "x": 9, "y": 2},
{"label": "L11", "matrix": [2, 4], "x": 0, "y": 2.93},
{"label": "L12", "matrix": [2, 3], "x": 1, "y": 2.31},
{"label": "L13", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "L14", "matrix": [2, 1], "x": 3, "y": 2.28},
{"label": "L15", "matrix": [2, 0], "x": 4, "y": 2.42},
{"label": "R15", "matrix": [6, 0], "x": 7, "y": 2.42},
{"label": "R14", "matrix": [6, 1], "x": 8, "y": 2.28},
{"label": "R13", "matrix": [6, 2], "x": 9, "y": 2},
{"label": "R12", "matrix": [6, 3], "x": 10, "y": 2.31},
{"label": "R11", "matrix": [6, 4], "x": 11, "y": 2.93},
@@ -70,14 +70,8 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "B5",
"pin_b": "B4"
},
{
"pin_a": "B3",
"pin_b": "B2"
}
{"pin_a": "B5", "pin_b": "B4"},
{"pin_a": "B3", "pin_b": "B2"}
]
},
"split": {
@@ -95,61 +89,57 @@
"encoder": {
"right": {
"rotary": [
{
"pin_a": "B2",
"pin_b": "B6"
},
{
"pin_a": "F5",
"pin_b": "D4"
}
{"pin_a": "B2", "pin_b": "B6"},
{"pin_a": "F5", "pin_b": "D4"}
]
}
}
},
"rgblight": {
"pin": "D3",
"led_count": 46,
"split": true,
"split_count": [23, 23],
"max_brightness": 128
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{"flags": 2, "x": 71, "y": 15},
{"flags": 2, "x": 51, "y": 8},
{"flags": 2, "x": 10, "y": 13},
{"flags": 2, "x": 10, "y": 42},
{"flags": 2, "x": 41, "y": 45},
{"flags": 2, "x": 76, "y": 50},
{"flags": 4, "matrix": [0, 4], "x": 0, "y": 15},
{"flags": 4, "matrix": [0, 3], "x": 20, "y": 5},
{"flags": 4, "matrix": [0, 2], "x": 41, "y": 0},
{"flags": 4, "matrix": [0, 1], "x": 61, "y": 4},
{"flags": 4, "matrix": [0, 0], "x": 81, "y": 7},
{"flags": 4, "matrix": [1, 4], "x": 0, "y": 31},
{"flags": 4, "matrix": [1, 3], "x": 20, "y": 21},
{"flags": 4, "matrix": [1, 2], "x": 41, "y": 16},
{"flags": 4, "matrix": [1, 1], "x": 61, "y": 20},
{"flags": 4, "matrix": [1, 0], "x": 81, "y": 23},
{"flags": 4, "matrix": [2, 4], "x": 0, "y": 47},
{"flags": 4, "matrix": [2, 3], "x": 20, "y": 37},
{"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
{"flags": 4, "matrix": [2, 1], "x": 61, "y": 36},
{"flags": 4, "matrix": [2, 0], "x": 81, "y": 39},
{"flags": 4, "matrix": [3, 1], "x": 71, "y": 60},
{"flags": 4, "matrix": [3, 0], "x": 92, "y": 64},
{"flags": 2, "x": 71, "y": 15},
{"flags": 2, "x": 51, "y": 8},
{"flags": 2, "x": 10, "y": 13},
{"flags": 2, "x": 10, "y": 42},
{"flags": 2, "x": 41, "y": 45},
{"flags": 2, "x": 76, "y": 50},
{"flags": 4, "matrix": [0, 4], "x": 0, "y": 15},
{"flags": 4, "matrix": [0, 3], "x": 20, "y": 5},
{"flags": 4, "matrix": [0, 2], "x": 41, "y": 0},
{"flags": 4, "matrix": [0, 1], "x": 61, "y": 4},
{"flags": 4, "matrix": [0, 0], "x": 81, "y": 7},
{"flags": 4, "matrix": [1, 4], "x": 0, "y": 31},
{"flags": 4, "matrix": [1, 3], "x": 20, "y": 21},
{"flags": 4, "matrix": [1, 2], "x": 41, "y": 16},
{"flags": 4, "matrix": [1, 1], "x": 61, "y": 20},
{"flags": 4, "matrix": [1, 0], "x": 81, "y": 23},
{"flags": 4, "matrix": [2, 4], "x": 0, "y": 47},
{"flags": 4, "matrix": [2, 3], "x": 20, "y": 37},
{"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
{"flags": 4, "matrix": [2, 1], "x": 61, "y": 36},
{"flags": 4, "matrix": [2, 0], "x": 81, "y": 39},
{"flags": 4, "matrix": [3, 1], "x": 71, "y": 60},
{"flags": 4, "matrix": [3, 0], "x": 92, "y": 64},
{"flags": 2, "x": 150, "y": 15},
{"flags": 2, "x": 190, "y": 8},
{"flags": 2, "x": 190, "y": 8},
{"flags": 2, "x": 210, "y": 13},
{"flags": 2, "x": 220, "y": 42},
{"flags": 2, "x": 183, "y": 45},
{"flags": 2, "x": 155, "y": 50},
{"flags": 4, "matrix": [4, 0], "x": 143, "y": 7},
{"flags": 4, "matrix": [4, 1], "x": 163, "y": 4},
{"flags": 4, "matrix": [4, 2], "x": 183, "y": 0},
{"flags": 4, "matrix": [4, 3], "x": 204, "y": 5},
{"flags": 4, "matrix": [4, 0], "x": 143, "y": 7},
{"flags": 4, "matrix": [4, 1], "x": 163, "y": 4},
{"flags": 4, "matrix": [4, 2], "x": 183, "y": 0},
{"flags": 4, "matrix": [4, 3], "x": 204, "y": 5},
{"flags": 4, "matrix": [4, 4], "x": 224, "y": 15},
{"flags": 4, "matrix": [5, 0], "x": 143, "y": 23},
{"flags": 4, "matrix": [5, 1], "x": 163, "y": 20},

2
keyboards/splitkb/aurora/sweep/rev1/rev1.c
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off

3
keyboards/splitkb/kyria/keymaps/artflag/config.h
View File

@@ -18,6 +18,3 @@
#define TAPPING_TERM 175
#define TAPPING_TOGGLE 2
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT

2
keyboards/splitkb/kyria/keymaps/cameronjlarsen/config.h
View File

@@ -33,8 +33,6 @@
# define RGBLIGHT_LIMIT_VAL 150
#endif
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define TAPPING_FORCE_HOLD
// Configure the global tapping term (default: 200ms)

5
keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c
View File

@@ -176,11 +176,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
enum combo_events {
CAPS_COMBO,
// Other combos...
COMBO_LENGTH
CAPS_COMBO
};
uint16_t COMBO_LEN = COMBO_LENGTH;
const uint16_t PROGMEM caps_combo[] = {KC_F, KC_J, COMBO_END};

4
keyboards/splitkb/kyria/keymaps/cwebster2/config.h
View File

@@ -42,10 +42,6 @@
//#define RGBLIGHT_STARTUP_ANIMATION
#endif
#ifdef COMBO_ENABLE
#define COMBO_COUNT 5
#endif
#define EE_HANDS
//#define DEBUG_MATRIX_SCAN_RATE

2
keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
View File

@@ -40,7 +40,7 @@ const uint16_t PROGMEM curly_combo[] = { KC_F, KC_P, COMBO_END };
const uint16_t PROGMEM parens_combo[] = { KC_P, KC_B, COMBO_END };
const uint16_t PROGMEM square_combo[] = { KC_D, KC_V, COMBO_END };
combo_t key_combos[COMBO_COUNT] = {
combo_t key_combos[] = {
[ZX_COPY] = COMBO(copy_combo, LCTL_T(KC_C)),
[CV_PASTE] = COMBO(paste_combo, LCTL_T(KC_V)),
[PB_PARENS] = COMBO(parens_combo, KC_LPRN),

2
keyboards/splitkb/kyria/keymaps/default/config.h
View File

@@ -35,5 +35,3 @@
# endif
#endif
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT

2
keyboards/splitkb/kyria/keymaps/drashna/keymap.c
View File

@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) },
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },

1
keyboards/splitkb/kyria/keymaps/gotham/config.h
View File

@@ -17,7 +17,6 @@
#pragma once
#define EE_HANDS
#define IGNORE_MOD_TAP_INTERRUPT
// Fix for Elite C rev3
#define SPLIT_USB_DETECT

4
keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
View File

@@ -146,7 +146,7 @@ void update_keycode_status(uint16_t keycode, bool last, bool current) {
void pointing_device_init(void) { thumbstick_init(); }
void pointing_device_task(void) {
bool pointing_device_task(void) {
report_mouse_t report = pointing_device_get_report();
if (!isLeftHand) {
@@ -191,5 +191,5 @@ void pointing_device_task(void) {
}
pointing_device_set_report(report);
pointing_device_send();
return pointing_device_send();
}

20
keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
View File

@@ -1,20 +0,0 @@
/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT

5
keyboards/splitkb/kyria/keymaps/lw/config.h
View File

@@ -16,11 +16,8 @@
#pragma once
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT
// #define NO_USB_STARTUP_CHECK
#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode
#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode

2
keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
View File

@@ -33,8 +33,6 @@
# define RGBLIGHT_LIMIT_VAL 150
#endif
// Lets you roll mod-tap keys
#define IGNORE_MOD_TAP_INTERRUPT
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT

3
keyboards/splitkb/kyria/keymaps/muppetjones/config.h
View File

@@ -39,9 +39,6 @@
// -- defined in user namespace
// #define TAPPING_TERM 200
// Prevent normal rollover on alphas from accidentally triggering mods.
#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0

2
keyboards/splitkb/kyria/keymaps/ohlin/config.h
View File

@@ -23,7 +23,5 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 175
// Prevent normal rollover on alphas from accidentally triggering mods.
#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0

1
keyboards/splitkb/kyria/keymaps/pierrec83/config.h
View File

@@ -43,7 +43,6 @@
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
// Allows to use either side as the master. Look at the documentation for info:
// https://docs.qmk.fm/#/config_options?id=setting-handedness

1
keyboards/splitkb/kyria/keymaps/via/config.h
View File

@@ -18,7 +18,6 @@
#define LAYER_STATE_8BIT
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define IGNORE_MOD_TAP_INTERRUPT
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE

2
keyboards/splitkb/kyria/keymaps/via/keymap.c
View File

@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format on
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
[1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

1
keyboards/splitkb/kyria/keymaps/winternebs/config.h
View File

@@ -28,4 +28,3 @@
#define NO_ACTION_FUNCTION
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
#define IGNORE_MOD_TAP_INTERRUPT

1
keyboards/splitkb/kyria/keymaps/zigotica/config.h
View File

@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// these should work better for homerow modifiers
#define TAPPING_TERM 350
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
#define LEADER_PER_KEY_TIMING

25
keyboards/splitkb/kyria/kyria.h
View File

@@ -1,25 +0,0 @@
/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#if defined(KEYBOARD_splitkb_kyria_rev1)
# include "rev1.h"
#endif
#if defined(KEYBOARD_splitkb_kyria_rev2)
# include "rev2.h"
#endif

5
keyboards/splitkb/kyria/rev1/base/info.json Normal file
View File

@@ -0,0 +1,5 @@
{
"build": {
"lto": true
}
}

0
keyboards/splitkb/kyria/rev1/base/rules.mk Normal file
View File

13
keyboards/splitkb/kyria/rev1/config.h
View File

@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring
#define MATRIX_ROW_PINS \
{ B4, E6, D7, D4 }
#define MATRIX_COL_PINS \
{ B6, B2, B3, B1, F7, F6, F5, F4 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/
@@ -38,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define SERIAL_USART_TX_PIN D3
# define SERIAL_USART_RX_PIN D2
# define RGB_DI_PIN PAL_LINE(GPIOA, 3)
# define WS2812_DI_PIN PAL_LINE(GPIOA, 3)
# define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
# define WS2812_PWM_CHANNEL 4 // default: 2
# define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -46,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
#else
# define RGB_DI_PIN D3
# define WS2812_DI_PIN D3
# define SOFT_SERIAL_PIN D2
#endif

181
keyboards/splitkb/kyria/rev1/info.json
View File

@@ -4,6 +4,14 @@
"pid": "0x9D9D",
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
},
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["B4", "E6", "D7", "D4"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "B5"}
@@ -18,59 +26,130 @@
}
}
},
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x6_5"
},
"layouts": {
"LAYOUT": {
"LAYOUT_split_3x6_5": {
"layout": [
{"x":0, "y":0.75},
{"x":1, "y":0.75},
{"x":2, "y":0.25},
{"x":3, "y":0},
{"x":4, "y":0.25},
{"x":5, "y":0.5},
{"x":10.5, "y":0.5},
{"x":11.5, "y":0.25},
{"x":12.5, "y":0},
{"x":13.5, "y":0.25},
{"x":14.5, "y":0.75},
{"x":15.5, "y":0.75},
{"x":0, "y":1.75},
{"x":1, "y":1.75},
{"x":2, "y":1.25},
{"x":3, "y":1},
{"x":4, "y":1.25},
{"x":5, "y":1.5},
{"x":10.5, "y":1.5},
{"x":11.5, "y":1.25},
{"x":12.5, "y":1},
{"x":13.5, "y":1.25},
{"x":14.5, "y":1.75},
{"x":15.5, "y":1.75},
{"x":0, "y":2.75},
{"x":1, "y":2.75},
{"x":2, "y":2.25},
{"x":3, "y":2},
{"x":4, "y":2.25},
{"x":5, "y":2.5},
{"x":6, "y":3},
{"x":7, "y":3.25},
{"x":8.5, "y":3.25},
{"x":9.5, "y":3},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2},
{"x":13.5, "y":2.25},
{"x":14.5, "y":2.75},
{"x":15.5, "y":2.75},
{"x":2.5, "y":3.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":4},
{"x":6.5, "y":4.25},
{"x":9, "y":4.25},
{"x":10, "y":4},
{"x":11, "y":3.5},
{"x":12, "y":3.25},
{"x":13, "y":3.25}
{"matrix": [0, 7], "x": 0, "y": 0.75},
{"matrix": [0, 6], "x": 1, "y": 0.75},
{"matrix": [0, 5], "x": 2, "y": 0.25},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0.25},
{"matrix": [0, 2], "x": 5, "y": 0.5},
{"matrix": [4, 2], "x": 10.5, "y": 0.5},
{"matrix": [4, 3], "x": 11.5, "y": 0.25},
{"matrix": [4, 4], "x": 12.5, "y": 0},
{"matrix": [4, 5], "x": 13.5, "y": 0.25},
{"matrix": [4, 6], "x": 14.5, "y": 0.75},
{"matrix": [4, 7], "x": 15.5, "y": 0.75},
{"matrix": [1, 7], "x": 0, "y": 1.75},
{"matrix": [1, 6], "x": 1, "y": 1.75},
{"matrix": [1, 5], "x": 2, "y": 1.25},
{"matrix": [1, 4], "x": 3, "y": 1},
{"matrix": [1, 3], "x": 4, "y": 1.25},
{"matrix": [1, 2], "x": 5, "y": 1.5},
{"matrix": [5, 2], "x": 10.5, "y": 1.5},
{"matrix": [5, 3], "x": 11.5, "y": 1.25},
{"matrix": [5, 4], "x": 12.5, "y": 1},
{"matrix": [5, 5], "x": 13.5, "y": 1.25},
{"matrix": [5, 6], "x": 14.5, "y": 1.75},
{"matrix": [5, 7], "x": 15.5, "y": 1.75},
{"matrix": [2, 7], "x": 0, "y": 2.75},
{"matrix": [2, 6], "x": 1, "y": 2.75},
{"matrix": [2, 5], "x": 2, "y": 2.25},
{"matrix": [2, 4], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2.25},
{"matrix": [2, 2], "x": 5, "y": 2.5},
{"matrix": [2, 1], "x": 6, "y": 3},
{"matrix": [2, 0], "x": 7, "y": 3.25},
{"matrix": [6, 0], "x": 8.5, "y": 3.25},
{"matrix": [6, 1], "x": 9.5, "y": 3},
{"matrix": [6, 2], "x": 10.5, "y": 2.5},
{"matrix": [6, 3], "x": 11.5, "y": 2.25},
{"matrix": [6, 4], "x": 12.5, "y": 2},
{"matrix": [6, 5], "x": 13.5, "y": 2.25},
{"matrix": [6, 6], "x": 14.5, "y": 2.75},
{"matrix": [6, 7], "x": 15.5, "y": 2.75},
{"matrix": [3, 4], "x": 2.5, "y": 3.25},
{"matrix": [3, 3], "x": 3.5, "y": 3.25},
{"matrix": [3, 2], "x": 4.5, "y": 3.5},
{"matrix": [3, 1], "x": 5.5, "y": 4},
{"matrix": [3, 0], "x": 6.5, "y": 4.25},
{"matrix": [7, 0], "x": 9, "y": 4.25},
{"matrix": [7, 1], "x": 10, "y": 4},
{"matrix": [7, 2], "x": 11, "y": 3.5},
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 4], "x": 13, "y": 3.25}
]
},
"LAYOUT_stack": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0},
{"matrix": [0, 6], "x": 1, "y": 0},
{"matrix": [0, 5], "x": 2, "y": 0},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},
{"matrix": [1, 7], "x": 6, "y": 0},
{"matrix": [1, 6], "x": 7, "y": 0},
{"matrix": [1, 5], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 3], "x": 10, "y": 0},
{"matrix": [1, 2], "x": 11, "y": 0},
{"matrix": [2, 7], "x": 12, "y": 0},
{"matrix": [2, 6], "x": 13, "y": 0},
{"matrix": [2, 5], "x": 14, "y": 0},
{"matrix": [2, 4], "x": 15, "y": 0},
{"matrix": [2, 3], "x": 16, "y": 0},
{"matrix": [2, 2], "x": 17, "y": 0},
{"matrix": [2, 1], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 19, "y": 0},
{"matrix": [3, 4], "x": 20, "y": 0},
{"matrix": [3, 3], "x": 21, "y": 0},
{"matrix": [3, 2], "x": 22, "y": 0},
{"matrix": [3, 1], "x": 23, "y": 0},
{"matrix": [3, 0], "x": 24, "y": 0},
{"matrix": [4, 2], "x": 25, "y": 0},
{"matrix": [4, 3], "x": 26, "y": 0},
{"matrix": [4, 4], "x": 27, "y": 0},
{"matrix": [4, 5], "x": 28, "y": 0},
{"matrix": [4, 6], "x": 29, "y": 0},
{"matrix": [4, 7], "x": 30, "y": 0},
{"matrix": [5, 2], "x": 31, "y": 0},
{"matrix": [5, 3], "x": 32, "y": 0},
{"matrix": [5, 4], "x": 33, "y": 0},
{"matrix": [5, 5], "x": 34, "y": 0},
{"matrix": [5, 6], "x": 35, "y": 0},
{"matrix": [5, 7], "x": 36, "y": 0},
{"matrix": [6, 0], "x": 37, "y": 0},
{"matrix": [6, 1], "x": 38, "y": 0},
{"matrix": [6, 2], "x": 39, "y": 0},
{"matrix": [6, 3], "x": 40, "y": 0},
{"matrix": [6, 4], "x": 41, "y": 0},
{"matrix": [6, 5], "x": 42, "y": 0},
{"matrix": [6, 6], "x": 43, "y": 0},
{"matrix": [6, 7], "x": 44, "y": 0},
{"matrix": [7, 0], "x": 45, "y": 0},
{"matrix": [7, 1], "x": 46, "y": 0},
{"matrix": [7, 2], "x": 47, "y": 0},
{"matrix": [7, 3], "x": 48, "y": 0},
{"matrix": [7, 4], "x": 49, "y": 0}
]
}
}

5
keyboards/splitkb/kyria/rev1/proton_c/info.json Normal file
View File

@@ -0,0 +1,5 @@
{
"ws2812": {
"driver": "pwm"
}
}

17
keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
View File

@@ -1,17 +0,0 @@
/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "proton_c.h"

19
keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
View File

@@ -1,19 +0,0 @@
/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "rev1.h"

3
keyboards/splitkb/kyria/rev1/proton_c/rules.mk
View File

@@ -1,5 +1,2 @@
WS2812_DRIVER = pwm
SERIAL_DRIVER = usart
AUDIO_ENABLE = no
LTO_ENABLE = no
CONVERT_TO = proton_c

2
keyboards/splitkb/kyria/rev1/rev1.c
View File

@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rev1.h"
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off

70
keyboards/splitkb/kyria/rev1/rev1.h
View File

@@ -1,70 +0,0 @@
/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "kyria.h"
#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c
# include "proton_c.h"
#endif
/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
) \
{ \
{ KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
{ KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
{ L31, L30, L29, L28, L27, L26, L25, L24 }, \
{ L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
{ KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
{ R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
}
#define LAYOUT_stack( \
L00, L01, L02, L03, L04, L05, \
L12, L13, L14, L15, L16, L17, \
L24, L25, L26, L27, L28, L29, L30, L31, \
L40, L41, L42, L43, L44, \
\
R06, R07, R08, R09, R10, R11, \
R18, R19, R20, R21, R22, R23, \
R32, R33, R34, R35, R36, R37, R38, R39, \
R45, R46, R47, R48, R49 \
) \
{ \
{ KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
{ KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
{ L31, L30, L29, L28, L27, L26, L25, L24 }, \
{ L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
{ KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
{ R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
}
#define LAYOUT_split_3x6_5 LAYOUT

1
keyboards/splitkb/kyria/rev1/rules.mk
View File

@@ -11,4 +11,3 @@ OLED_ENABLE = yes # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support

5
keyboards/splitkb/kyria/rev2/base/info.json Normal file
View File

@@ -0,0 +1,5 @@
{
"build": {
"lto": true
}
}

0
keyboards/splitkb/kyria/rev2/base/rules.mk Normal file
View File

17
keyboards/splitkb/kyria/rev2/config.h
View File

@@ -17,19 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring
#define MATRIX_ROW_PINS \
{ F6, F7, B1, B3 }
#define MATRIX_COL_PINS \
{ B2, B6, B5, B4, E6, D7, C6, D4 }
#define MATRIX_ROW_PINS_RIGHT \
{ D4, C6, D7, E6 }
#define MATRIX_COL_PINS_RIGHT \
{ B4, B5, B6, B2, B3, B1, F7, F6 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
// Side detection
// col 4 row 3 on right-hand-side
#define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
@@ -48,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define SERIAL_USART_TX_PIN D3
# define SERIAL_USART_RX_PIN D2
# define RGB_DI_PIN PAL_LINE(GPIOA, 3)
# define WS2812_DI_PIN PAL_LINE(GPIOA, 3)
# define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
# define WS2812_PWM_CHANNEL 4 // default: 2
# define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -56,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
#else
# define RGB_DI_PIN D3
# define WS2812_DI_PIN D3
# define SOFT_SERIAL_PIN D2
#endif

185
keyboards/splitkb/kyria/rev2/info.json
View File

@@ -4,6 +4,14 @@
"pid": "0x9D9D",
"device_version": "0.0.2"
},
"rgb_matrix": {
"driver": "WS2812"
},
"matrix_pins": {
"cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
"rows": ["F6", "F7", "B1", "B3"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5"}
@@ -16,61 +24,138 @@
{"pin_a": "F5", "pin_b": "F4"}
]
}
},
"matrix_pins": {
"right": {
"cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6"]
}
}
},
"layout_aliases": {
"LAYOUT_split_3x6_5": "LAYOUT"
},
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0.75},
{"x":1, "y":0.75},
{"x":2, "y":0.25},
{"x":3, "y":0},
{"x":4, "y":0.25},
{"x":5, "y":0.5},
{"x":10.5, "y":0.5},
{"x":11.5, "y":0.25},
{"x":12.5, "y":0},
{"x":13.5, "y":0.25},
{"x":14.5, "y":0.75},
{"x":15.5, "y":0.75},
{"x":0, "y":1.75},
{"x":1, "y":1.75},
{"x":2, "y":1.25},
{"x":3, "y":1},
{"x":4, "y":1.25},
{"x":5, "y":1.5},
{"x":10.5, "y":1.5},
{"x":11.5, "y":1.25},
{"x":12.5, "y":1},
{"x":13.5, "y":1.25},
{"x":14.5, "y":1.75},
{"x":15.5, "y":1.75},
{"x":0, "y":2.75},
{"x":1, "y":2.75},
{"x":2, "y":2.25},
{"x":3, "y":2},
{"x":4, "y":2.25},
{"x":5, "y":2.5},
{"x":6, "y":3},
{"x":7, "y":3.25},
{"x":8.5, "y":3.25},
{"x":9.5, "y":3},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2},
{"x":13.5, "y":2.25},
{"x":14.5, "y":2.75},
{"x":15.5, "y":2.75},
{"x":2.5, "y":3.25},
{"x":3.5, "y":3.25},
{"x":4.5, "y":3.5},
{"x":5.5, "y":4},
{"x":6.5, "y":4.25},
{"x":9, "y":4.25},
{"x":10, "y":4},
{"x":11, "y":3.5},
{"x":12, "y":3.25},
{"x":13, "y":3.25}
{"matrix": [0, 7], "x": 0, "y": 0.75},
{"matrix": [0, 6], "x": 1, "y": 0.75},
{"matrix": [0, 5], "x": 2, "y": 0.25},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0.25},
{"matrix": [0, 2], "x": 5, "y": 0.5},
{"matrix": [4, 2], "x": 10.5, "y": 0.5},
{"matrix": [4, 3], "x": 11.5, "y": 0.25},
{"matrix": [4, 4], "x": 12.5, "y": 0},
{"matrix": [4, 5], "x": 13.5, "y": 0.25},
{"matrix": [4, 6], "x": 14.5, "y": 0.75},
{"matrix": [4, 7], "x": 15.5, "y": 0.75},
{"matrix": [1, 7], "x": 0, "y": 1.75},
{"matrix": [1, 6], "x": 1, "y": 1.75},
{"matrix": [1, 5], "x": 2, "y": 1.25},
{"matrix": [1, 4], "x": 3, "y": 1},
{"matrix": [1, 3], "x": 4, "y": 1.25},
{"matrix": [1, 2], "x": 5, "y": 1.5},
{"matrix": [5, 2], "x": 10.5, "y": 1.5},
{"matrix": [5, 3], "x": 11.5, "y": 1.25},
{"matrix": [5, 4], "x": 12.5, "y": 1},
{"matrix": [5, 5], "x": 13.5, "y": 1.25},
{"matrix": [5, 6], "x": 14.5, "y": 1.75},
{"matrix": [5, 7], "x": 15.5, "y": 1.75},
{"matrix": [2, 7], "x": 0, "y": 2.75},
{"matrix": [2, 6], "x": 1, "y": 2.75},
{"matrix": [2, 5], "x": 2, "y": 2.25},
{"matrix": [2, 4], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2.25},
{"matrix": [2, 2], "x": 5, "y": 2.5},
{"matrix": [2, 1], "x": 6, "y": 3},
{"matrix": [2, 0], "x": 7, "y": 3.25},
{"matrix": [6, 0], "x": 8.5, "y": 3.25},
{"matrix": [6, 1], "x": 9.5, "y": 3},
{"matrix": [6, 2], "x": 10.5, "y": 2.5},
{"matrix": [6, 3], "x": 11.5, "y": 2.25},
{"matrix": [6, 4], "x": 12.5, "y": 2},
{"matrix": [6, 5], "x": 13.5, "y": 2.25},
{"matrix": [6, 6], "x": 14.5, "y": 2.75},
{"matrix": [6, 7], "x": 15.5, "y": 2.75},
{"matrix": [3, 5], "x": 2.5, "y": 3.25},
{"matrix": [3, 3], "x": 3.5, "y": 3.25},
{"matrix": [3, 2], "x": 4.5, "y": 3.5},
{"matrix": [3, 1], "x": 5.5, "y": 4},
{"matrix": [3, 0], "x": 6.5, "y": 4.25},
{"matrix": [7, 0], "x": 9, "y": 4.25},
{"matrix": [7, 1], "x": 10, "y": 4},
{"matrix": [7, 2], "x": 11, "y": 3.5},
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 5], "x": 13, "y": 3.25}
]
},
"LAYOUT_stack": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0},
{"matrix": [0, 6], "x": 1, "y": 0},
{"matrix": [0, 5], "x": 2, "y": 0},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},
{"matrix": [1, 7], "x": 6, "y": 0},
{"matrix": [1, 6], "x": 7, "y": 0},
{"matrix": [1, 5], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 3], "x": 10, "y": 0},
{"matrix": [1, 2], "x": 11, "y": 0},
{"matrix": [2, 7], "x": 12, "y": 0},
{"matrix": [2, 6], "x": 13, "y": 0},
{"matrix": [2, 5], "x": 14, "y": 0},
{"matrix": [2, 4], "x": 15, "y": 0},
{"matrix": [2, 3], "x": 16, "y": 0},
{"matrix": [2, 2], "x": 17, "y": 0},
{"matrix": [2, 1], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 19, "y": 0},
{"matrix": [3, 5], "x": 20, "y": 0},
{"matrix": [3, 3], "x": 21, "y": 0},
{"matrix": [3, 2], "x": 22, "y": 0},
{"matrix": [3, 1], "x": 23, "y": 0},
{"matrix": [3, 0], "x": 24, "y": 0},
{"matrix": [4, 2], "x": 25, "y": 0},
{"matrix": [4, 3], "x": 26, "y": 0},
{"matrix": [4, 4], "x": 27, "y": 0},
{"matrix": [4, 5], "x": 28, "y": 0},
{"matrix": [4, 6], "x": 29, "y": 0},
{"matrix": [4, 7], "x": 30, "y": 0},
{"matrix": [5, 2], "x": 31, "y": 0},
{"matrix": [5, 3], "x": 32, "y": 0},
{"matrix": [5, 4], "x": 33, "y": 0},
{"matrix": [5, 5], "x": 34, "y": 0},
{"matrix": [5, 6], "x": 35, "y": 0},
{"matrix": [5, 7], "x": 36, "y": 0},
{"matrix": [6, 0], "x": 37, "y": 0},
{"matrix": [6, 1], "x": 38, "y": 0},
{"matrix": [6, 2], "x": 39, "y": 0},
{"matrix": [6, 3], "x": 40, "y": 0},
{"matrix": [6, 4], "x": 41, "y": 0},
{"matrix": [6, 5], "x": 42, "y": 0},
{"matrix": [6, 6], "x": 43, "y": 0},
{"matrix": [6, 7], "x": 44, "y": 0},
{"matrix": [7, 0], "x": 45, "y": 0},
{"matrix": [7, 1], "x": 46, "y": 0},
{"matrix": [7, 2], "x": 47, "y": 0},
{"matrix": [7, 3], "x": 48, "y": 0},
{"matrix": [7, 5], "x": 49, "y": 0}
]
}
}

5
keyboards/splitkb/kyria/rev2/proton_c/info.json Normal file
View File

@@ -0,0 +1,5 @@
{
"ws2812": {
"driver": "pwm"
}
}

17
keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
View File

@@ -1,17 +0,0 @@
/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "proton_c.h"

19
keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
View File

@@ -1,19 +0,0 @@
/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "rev2.h"

3
keyboards/splitkb/kyria/rev2/proton_c/rules.mk
View File

@@ -1,5 +1,2 @@
WS2812_DRIVER = pwm
SERIAL_DRIVER = usart
AUDIO_ENABLE = no
LTO_ENABLE = no
CONVERT_TO = proton_c

2
keyboards/splitkb/kyria/rev2/rev2.c
View File

@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rev2.h"
#include "quantum.h"
// Mask out handedness diode to prevent it
// from keeping the keyboard awake

70
keyboards/splitkb/kyria/rev2/rev2.h
View File

@@ -1,70 +0,0 @@
/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "kyria.h"
#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c
# include "proton_c.h"
#endif
/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
) \
{ \
{ KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
{ KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
{ L31, L30, L29, L28, L27, L26, L25, L24 }, \
{ L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
{ KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
{ R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \
}
#define LAYOUT_stack( \
L00, L01, L02, L03, L04, L05, \
L12, L13, L14, L15, L16, L17, \
L24, L25, L26, L27, L28, L29, L30, L31, \
L40, L41, L42, L43, L44, \
\
R06, R07, R08, R09, R10, R11, \
R18, R19, R20, R21, R22, R23, \
R32, R33, R34, R35, R36, R37, R38, R39, \
R45, R46, R47, R48, R49 \
) \
{ \
{ KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
{ KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
{ L31, L30, L29, L28, L27, L26, L25, L24 }, \
{ L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
{ KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
{ R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \
}
#define LAYOUT_split_3x6_5 LAYOUT

1
keyboards/splitkb/kyria/rev2/rules.mk
View File

@@ -11,4 +11,3 @@ OLED_ENABLE = yes # Enables the use of OLED displays
ENCODER_ENABLE = yes # Enables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support

1
keyboards/splitkb/kyria/rev3/config.h
View File

@@ -28,7 +28,6 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define SPLIT_TRANSPORT_MIRROR

221
keyboards/splitkb/kyria/rev3/info.json
View File

@@ -1,11 +1,14 @@
{
"keyboard_name": "Kyria rev3",
"usb": {
"pid": "0xCF44",
"pid": "0xCF44"
},
"bootmagic": {
"matrix": [0, 6]
},
"build": {
"lto": true
},
"features": {
"mousekey": true,
"bootmagic": true,
@@ -16,12 +19,12 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
{"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
@@ -29,12 +32,12 @@
{"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
{"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
{"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
{"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
@@ -42,16 +45,16 @@
{"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
{"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
{"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
{"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
@@ -59,48 +62,48 @@
{"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
{"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}
]
},
"LAYOUT_stack": {
"layout": [
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
{"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
{"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
{"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
{"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
{"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
{"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
{"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
{"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
@@ -116,8 +119,8 @@
{"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
{"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
{"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
{"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
@@ -125,11 +128,11 @@
{"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
{"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
{"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
{"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
{"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}
]
}
},
@@ -141,10 +144,7 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "F4",
"pin_b": "F5"
}
{"pin_a": "F4", "pin_b": "F5"}
]
},
"split": {
@@ -162,58 +162,57 @@
"encoder": {
"right": {
"rotary": [
{
"pin_a": "F4",
"pin_b": "F5"
}
{"pin_a": "F4", "pin_b": "F5"}
]
}
}
},
"rgblight": {
"pin": "D3",
"led_count": 62,
"split": true,
"split_count": [31, 31],
"max_brightness": 128
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{"flags": 2, "x": 75, "y": 2}, // L RGB1
{"flags": 2, "x": 50, "y": 1}, // L RGB2
{"flags": 2, "x": 14, "y": 4}, // L RGB3
{"flags": 2, "x": 25, "y": 45}, // L RGB4
{"flags": 2, "x": 58, "y": 49}, // L RGB5
{"flags": 2, "x": 94, "y": 53}, // L RGB6
{"flags": 4, "matrix": [3, 0], "x": 94, "y": 64}, // L SW21
{"flags": 4, "matrix": [3, 5], "x": 79, "y": 60}, // L SW22
{"flags": 4, "matrix": [3, 1], "x": 65, "y": 53}, // L SW23
{"flags": 4, "matrix": [3, 2], "x": 51, "y": 49}, // L SW24
{"flags": 4, "matrix": [3, 4], "x": 36, "y": 49}, // L SW25
{"flags": 2, "x": 75, "y": 2}, // L RGB1
{"flags": 2, "x": 50, "y": 1}, // L RGB2
{"flags": 2, "x": 14, "y": 4}, // L RGB3
{"flags": 2, "x": 25, "y": 45}, // L RGB4
{"flags": 2, "x": 58, "y": 49}, // L RGB5
{"flags": 2, "x": 94, "y": 53}, // L RGB6
{"flags": 4, "matrix": [3, 0], "x": 94, "y": 64}, // L SW21
{"flags": 4, "matrix": [3, 5], "x": 79, "y": 60}, // L SW22
{"flags": 4, "matrix": [3, 1], "x": 65, "y": 53}, // L SW23
{"flags": 4, "matrix": [3, 2], "x": 51, "y": 49}, // L SW24
{"flags": 4, "matrix": [3, 4], "x": 36, "y": 49}, // L SW25
{"flags": 4, "matrix": [2, 0], "x": 101, "y": 49}, // L SW13
{"flags": 4, "matrix": [3, 3], "x": 87, "y": 45}, // L SW14
{"flags": 4, "matrix": [2, 1], "x": 72, "y": 38}, // L SW15
{"flags": 4, "matrix": [2, 2], "x": 58, "y": 34}, // L SW16
{"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW17
{"flags": 4, "matrix": [2, 4], "x": 29, "y": 34}, // L SW18
{"flags": 4, "matrix": [2, 5], "x": 14, "y": 41}, // L SW19
{"flags": 4, "matrix": [2, 6], "x": 0, "y": 41}, // L SW20
{"flags": 4, "matrix": [1, 1], "x": 72, "y": 23}, // L SW07
{"flags": 4, "matrix": [1, 2], "x": 58, "y": 19}, // L SW08
{"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW09
{"flags": 4, "matrix": [1, 4], "x": 29, "y": 19}, // L SW10
{"flags": 4, "matrix": [1, 5], "x": 14, "y": 26}, // L SW11
{"flags": 4, "matrix": [1, 6], "x": 0, "y": 26}, // L SW12
{"flags": 4, "matrix": [0, 1], "x": 72, "y": 8}, // L SW01
{"flags": 4, "matrix": [0, 2], "x": 58, "y": 4}, // L SW02
{"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW03
{"flags": 4, "matrix": [0, 4], "x": 29, "y": 4}, // L SW04
{"flags": 4, "matrix": [0, 5], "x": 14, "y": 11}, // L SW05
{"flags": 4, "matrix": [0, 6], "x": 0, "y": 11}, // L SW06
{"flags": 2, "x": 149, "y": 2}, // R RGB1
{"flags": 2, "x": 174, "y": 1}, // R RGB2
{"flags": 2, "x": 210, "y": 4}, // R RGB3
{"flags": 4, "matrix": [3, 3], "x": 87, "y": 45}, // L SW14
{"flags": 4, "matrix": [2, 1], "x": 72, "y": 38}, // L SW15
{"flags": 4, "matrix": [2, 2], "x": 58, "y": 34}, // L SW16
{"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW17
{"flags": 4, "matrix": [2, 4], "x": 29, "y": 34}, // L SW18
{"flags": 4, "matrix": [2, 5], "x": 14, "y": 41}, // L SW19
{"flags": 4, "matrix": [2, 6], "x": 0, "y": 41}, // L SW20
{"flags": 4, "matrix": [1, 1], "x": 72, "y": 23}, // L SW07
{"flags": 4, "matrix": [1, 2], "x": 58, "y": 19}, // L SW08
{"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW09
{"flags": 4, "matrix": [1, 4], "x": 29, "y": 19}, // L SW10
{"flags": 4, "matrix": [1, 5], "x": 14, "y": 26}, // L SW11
{"flags": 4, "matrix": [1, 6], "x": 0, "y": 26}, // L SW12
{"flags": 4, "matrix": [0, 1], "x": 72, "y": 8}, // L SW01
{"flags": 4, "matrix": [0, 2], "x": 58, "y": 4}, // L SW02
{"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW03
{"flags": 4, "matrix": [0, 4], "x": 29, "y": 4}, // L SW04
{"flags": 4, "matrix": [0, 5], "x": 14, "y": 11}, // L SW05
{"flags": 4, "matrix": [0, 6], "x": 0, "y": 11}, // L SW06
{"flags": 2, "x": 149, "y": 2}, // R RGB1
{"flags": 2, "x": 174, "y": 1}, // R RGB2
{"flags": 2, "x": 210, "y": 4}, // R RGB3
{"flags": 2, "x": 199, "y": 45}, // R RGB4
{"flags": 2, "x": 166, "y": 49}, // R RGB5
{"flags": 2, "x": 130, "y": 53}, // R RGB6
@@ -236,10 +235,10 @@
{"flags": 4, "matrix": [5, 4], "x": 195, "y": 19}, // R SW10
{"flags": 4, "matrix": [5, 5], "x": 210, "y": 26}, // R SW11
{"flags": 4, "matrix": [5, 6], "x": 224, "y": 26}, // R SW12
{"flags": 4, "matrix": [4, 1], "x": 152, "y": 8}, // R SW01
{"flags": 4, "matrix": [4, 2], "x": 166, "y": 4}, // R SW02
{"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04
{"flags": 4, "matrix": [4, 1], "x": 152, "y": 8}, // R SW01
{"flags": 4, "matrix": [4, 2], "x": 166, "y": 4}, // R SW02
{"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04
{"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
{"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}, // R SW06
]

2
keyboards/splitkb/kyria/rev3/rev3.c
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off

2
keyboards/splitkb/zima/config.h
View File

@@ -21,12 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_CLICKY
#define NO_MUSIC_MODE
#define RGB_DI_PIN B5
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD

27
keyboards/splitkb/zima/info.json
View File

@@ -8,6 +8,9 @@
"pid": "0xF75B",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "B5"
},
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "D7", "resolution": 2}
@@ -26,18 +29,18 @@
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
{"x":0, "y":1, "matrix": [0, 0]},
{"x":1, "y":1, "matrix": [0, 1]},
{"x":2, "y":1, "matrix": [0, 2]},
{"x":0, "y":2, "matrix": [1, 0]},
{"x":1, "y":2, "matrix": [1, 1]},
{"x":2, "y":2, "matrix": [1, 2]},
{"x":0, "y":3, "matrix": [2, 0]},
{"x":1, "y":3, "matrix": [2, 1]},
{"x":2, "y":3, "matrix": [2, 2]},
{"x":0, "y":4, "matrix": [3, 0]},
{"x":1, "y":4, "matrix": [3, 1]},
{"x":2, "y":4, "matrix": [3, 2]}
{"x": 0, "y": 0, "matrix": [0, 0]},
{"x": 1, "y": 0, "matrix": [0, 1]},
{"x": 2, "y": 0, "matrix": [0, 2]},
{"x": 0, "y": 1, "matrix": [1, 0]},
{"x": 1, "y": 1, "matrix": [1, 1]},
{"x": 2, "y": 1, "matrix": [1, 2]},
{"x": 0, "y": 2, "matrix": [2, 0]},
{"x": 1, "y": 2, "matrix": [2, 1]},
{"x": 2, "y": 2, "matrix": [2, 2]},
{"x": 0, "y": 3, "matrix": [3, 0]},
{"x": 1, "y": 3, "matrix": [3, 1]},
{"x": 2, "y": 3, "matrix": [3, 2]}
]
}
}

2
keyboards/splitkb/zima/keymaps/drashna/keymap.c
View File

@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { { KC_DOWN, KC_UP } },
[1] = { { KC_VOLD, KC_VOLU } },
[2] = { { RGB_MOD, RGB_RMOD} },