summaryrefslogtreecommitdiffstats
path: root/keyboards/0xcb/splaytoraid
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/0xcb/splaytoraid')
-rw-r--r--keyboards/0xcb/splaytoraid/config.h2
-rw-r--r--keyboards/0xcb/splaytoraid/info.json201
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/default/keymap.c2
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/pi/config.h3
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c2
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/via/keymap.c2
-rw-r--r--keyboards/0xcb/splaytoraid/rp2040_ce/info.json5
-rw-r--r--keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk1
8 files changed, 108 insertions, 110 deletions
diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h
index 01eb276069..2f2eb82fee 100644
--- a/keyboards/0xcb/splaytoraid/config.h
+++ b/keyboards/0xcb/splaytoraid/config.h
@@ -3,8 +3,6 @@
#pragma once
-#define RGB_DI_PIN D0
-
#define RGB_MATRIX_LED_COUNT 18
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 7b8177df9f..5b7334ff9d 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -32,121 +32,120 @@
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "B5",
- "pin_b": "B6",
- "resolution": 4
- }
+ {"pin_a": "B5", "pin_b": "B6", "resolution": 4}
]
},
"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 }
+ {"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}
]
},
+ "ws2812": {
+ "pin": "D0"
+ },
"layouts": {
"LAYOUT_36": {
"layout": [
- { "label": "K10", "matrix": [1, 0], "x": 0, "y": 0 },
- { "label": "K11", "matrix": [1, 1], "x": 1, "y": 0 },
- { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
- { "label": "K01", "matrix": [0, 1], "x": 3, "y": 0 },
- { "label": "K12", "matrix": [1, 2], "x": 4, "y": 0 },
- { "label": "K52", "matrix": [5, 2], "x": 6, "y": 0 },
- { "label": "K04", "matrix": [0, 4], "x": 7, "y": 0 },
- { "label": "K03", "matrix": [0, 3], "x": 8, "y": 0 },
- { "label": "K14", "matrix": [1, 4], "x": 9, "y": 0 },
- { "label": "K15", "matrix": [1, 5], "x": 10, "y": 0 },
- { "label": "K30", "matrix": [3, 0], "x": 0, "y": 1 },
- { "label": "K31", "matrix": [3, 1], "x": 1, "y": 1 },
- { "label": "K22", "matrix": [2, 2], "x": 2, "y": 1 },
- { "label": "K21", "matrix": [2, 1], "x": 3, "y": 1 },
- { "label": "K13", "matrix": [1, 3], "x": 4, "y": 1 },
- { "label": "K53", "matrix": [5, 3], "x": 6, "y": 1 },
- { "label": "K24", "matrix": [2, 4], "x": 7, "y": 1 },
- { "label": "K23", "matrix": [2, 3], "x": 8, "y": 1 },
- { "label": "K34", "matrix": [3, 4], "x": 9, "y": 1 },
- { "label": "K35", "matrix": [3, 5], "x": 10, "y": 1 },
- { "label": "K50", "matrix": [5, 0], "x": 0, "y": 2 },
- { "label": "K51", "matrix": [5, 1], "x": 1, "y": 2 },
- { "label": "K42", "matrix": [4, 2], "x": 2, "y": 2 },
- { "label": "K41", "matrix": [4, 1], "x": 3, "y": 2 },
- { "label": "K32", "matrix": [3, 2], "x": 4, "y": 2 },
- { "label": "K72", "matrix": [7, 2], "x": 6, "y": 2 },
- { "label": "K44", "matrix": [4, 4], "x": 7, "y": 2 },
- { "label": "K43", "matrix": [4, 3], "x": 8, "y": 2 },
- { "label": "K54", "matrix": [5, 4], "x": 9, "y": 2 },
- { "label": "K55", "matrix": [5, 5], "x": 10, "y": 2 },
- { "label": "K62", "matrix": [6, 2], "x": 2, "y": 3 },
- { "label": "K61", "matrix": [6, 1], "x": 3, "y": 3 },
- { "label": "K33", "matrix": [3, 3], "x": 4, "y": 3 },
- { "label": "K66", "matrix": [6, 6], "x": 5, "y": 3 },
- { "label": "K73", "matrix": [7, 3], "x": 6, "y": 3 },
- { "label": "K64", "matrix": [6, 4], "x": 7, "y": 3 },
- { "label": "K63", "matrix": [6, 3], "x": 8, "y": 3 }
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 8, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 9, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 10, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 2, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K53", "matrix": [5, 3], "x": 6, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 8, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 9, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 10, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 2, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 3, "y": 2},
+ {"label": "K32", "matrix": [3, 2], "x": 4, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 6, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 8, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 9, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 10, "y": 2},
+ {"label": "K62", "matrix": [6, 2], "x": 2, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 3, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3},
+ {"label": "K66", "matrix": [6, 6], "x": 5, "y": 3},
+ {"label": "K73", "matrix": [7, 3], "x": 6, "y": 3},
+ {"label": "K64", "matrix": [6, 4], "x": 7, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "x": 8, "y": 3}
]
},
"LAYOUT_40": {
"layout": [
- { "label": "K70", "matrix": [7, 0], "x": 0, "y": 0 },
- { "label": "K10", "matrix": [1, 0], "x": 1, "y": 0 },
- { "label": "K11", "matrix": [1, 1], "x": 2, "y": 0 },
- { "label": "K02", "matrix": [0, 2], "x": 3, "y": 0 },
- { "label": "K01", "matrix": [0, 1], "x": 4, "y": 0 },
- { "label": "K12", "matrix": [1, 2], "x": 5, "y": 0 },
- { "label": "K52", "matrix": [5, 2], "x": 7, "y": 0 },
- { "label": "K04", "matrix": [0, 4], "x": 8, "y": 0 },
- { "label": "K03", "matrix": [0, 3], "x": 9, "y": 0 },
- { "label": "K14", "matrix": [1, 4], "x": 10, "y": 0 },
- { "label": "K15", "matrix": [1, 5], "x": 11, "y": 0 },
- { "label": "K75", "matrix": [7, 5], "x": 12, "y": 0 },
- { "label": "K71", "matrix": [7, 1], "x": 0, "y": 1 },
- { "label": "K30", "matrix": [3, 0], "x": 1, "y": 1 },
- { "label": "K31", "matrix": [3, 1], "x": 2, "y": 1 },
- { "label": "K22", "matrix": [2, 2], "x": 3, "y": 1 },
- { "label": "K21", "matrix": [2, 1], "x": 4, "y": 1 },
- { "label": "K13", "matrix": [1, 3], "x": 5, "y": 1 },
- { "label": "K53", "matrix": [5, 3], "x": 7, "y": 1 },
- { "label": "K24", "matrix": [2, 4], "x": 8, "y": 1 },
- { "label": "K23", "matrix": [2, 3], "x": 9, "y": 1 },
- { "label": "K34", "matrix": [3, 4], "x": 10, "y": 1 },
- { "label": "K35", "matrix": [3, 5], "x": 11, "y": 1 },
- { "label": "K74", "matrix": [7, 4], "x": 12, "y": 1 },
- { "label": "K50", "matrix": [5, 0], "x": 1, "y": 2 },
- { "label": "K51", "matrix": [5, 1], "x": 2, "y": 2 },
- { "label": "K42", "matrix": [4, 2], "x": 3, "y": 2 },
- { "label": "K41", "matrix": [4, 1], "x": 4, "y": 2 },
- { "label": "K32", "matrix": [3, 2], "x": 5, "y": 2 },
- { "label": "K72", "matrix": [7, 2], "x": 7, "y": 2 },
- { "label": "K44", "matrix": [4, 4], "x": 8, "y": 2 },
- { "label": "K43", "matrix": [4, 3], "x": 9, "y": 2 },
- { "label": "K54", "matrix": [5, 4], "x": 10, "y": 2 },
- { "label": "K55", "matrix": [5, 5], "x": 11, "y": 2 },
- { "label": "K62", "matrix": [6, 2], "x": 3, "y": 3 },
- { "label": "K61", "matrix": [6, 1], "x": 4, "y": 3 },
- { "label": "K33", "matrix": [3, 3], "x": 5, "y": 3 },
- { "label": "K66", "matrix": [6, 6], "x": 6, "y": 3 },
- { "label": "K73", "matrix": [7, 3], "x": 7, "y": 3 },
- { "label": "K64", "matrix": [6, 4], "x": 8, "y": 3 },
- { "label": "K63", "matrix": [6, 3], "x": 9, "y": 3 }
+ {"label": "K70", "matrix": [7, 0], "x": 0, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 4, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 5, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 7, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 8, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 9, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 10, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 11, "y": 0},
+ {"label": "K75", "matrix": [7, 5], "x": 12, "y": 0},
+ {"label": "K71", "matrix": [7, 1], "x": 0, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 1, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 2, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 4, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 1},
+ {"label": "K53", "matrix": [5, 3], "x": 7, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 8, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 9, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 10, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 11, "y": 1},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "x": 1, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 2, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 4, "y": 2},
+ {"label": "K32", "matrix": [3, 2], "x": 5, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 7, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 8, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 9, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 10, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 11, "y": 2},
+ {"label": "K62", "matrix": [6, 2], "x": 3, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 4, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 5, "y": 3},
+ {"label": "K66", "matrix": [6, 6], "x": 6, "y": 3},
+ {"label": "K73", "matrix": [7, 3], "x": 7, "y": 3},
+ {"label": "K64", "matrix": [6, 4], "x": 8, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "x": 9, "y": 3}
]
}
}
diff --git a/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
index e9dc9a50a0..dbc7e417f7 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_LOWER] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
[_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
index d955f36ab3..52e39aef65 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
@@ -5,9 +5,6 @@
#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
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
index cbdfdf16b3..29953eedef 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
@@ -290,7 +290,7 @@ bool caps_word_press_user(uint16_t keycode) {
// │ e n c o d e r │
// └───────────────────────────────────────────────────────────┘
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_NAVIGATION] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_COLEMAK] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
index 900344a42c..852417922e 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_LOWER] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
[_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
new file mode 100644
index 0000000000..9f0eb51118
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
@@ -0,0 +1,5 @@
+{
+ "ws2812": {
+ "driver": "vendor"
+ }
+}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
index 4b30a1bae0..9617c1460e 100644
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
@@ -1,2 +1 @@
-WS2812_DRIVER = vendor
CONVERT_TO = rp2040_ce
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 13:04:37 +0000