summaryrefslogtreecommitdiffstats
path: root/keyboards/0xcb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/0xcb')
-rw-r--r--keyboards/0xcb/1337/config.h3
-rw-r--r--keyboards/0xcb/1337/info.json21
-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.h4
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c8
-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
-rw-r--r--keyboards/0xcb/static/config.h19
-rw-r--r--keyboards/0xcb/static/info.json183
-rw-r--r--keyboards/0xcb/static/static.c17
-rw-r--r--keyboards/0xcb/static/static.h66
-rw-r--r--keyboards/0xcb/tutelpad/config.h1
-rw-r--r--keyboards/0xcb/tutelpad/info.json3
16 files changed, 222 insertions, 316 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index a247d1b367..9eaded2188 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAP_CODE_DELAY 10
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -44,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_DEFAULT_SAT 232
#define RGBLIGHT_DEFAULT_VAR 255
#define RGBLIGHT_DEFAULT_SPD 2
-#endif
// clang-format on
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index d34d7166bf..a0b04ba7df 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -21,6 +21,9 @@
"qmk_lufa_bootloader": {
"led": "B0"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"matrix_pins": {
@@ -33,15 +36,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"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": 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]}
]
}
}
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..1786ae776d 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
@@ -5,15 +5,11 @@
#define TAPPING_TERM 180
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE
#ifdef COMBO_ENABLE
- #define COMBO_COUNT 9
#define COMBO_TERM 20
#define COMBO_ONLY_FROM_LAYER 0
#endif
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
index cbdfdf16b3..07036b7245 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM ent_combo[] = {HM_K, HM_L, COMBO_END};
const uint16_t PROGMEM tab_combo[] = {HM_F, HM_D, COMBO_END};
const uint16_t PROGMEM esc_combo[] = {HM_D, HM_S, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
COMBO(ae_combo, RALT(KC_Q)),
COMBO(ss_combo, RALT(KC_S)),
COMBO(ue_combo, RALT(KC_Y)),
@@ -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) },
@@ -298,7 +298,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_NUMBERS] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FUNCTION] = { 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
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index f77002e8ab..10b1f88216 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-// clang-format off
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
-// clang-format on
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index a18bd7b313..7a678a0194 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -8,6 +8,11 @@
"pid": "0xA455",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
+ "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D0", "pin_b": "D1"}
@@ -21,95 +26,103 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":11, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":5.25, "y":2},
- {"x":6.25, "y":2},
- {"x":7.25, "y":2},
- {"x":8.25, "y":2},
- {"x":9.25, "y":2},
- {"x":10.25, "y":2, "w":1.75},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3, "w":1.25},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4, "w":2.75},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4, "w":2.25},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4}
+ {"matrix": [1, 5], "x": 11, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [0, 1], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [0, 2], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [0, 3], "x": 6, "y": 1},
+ {"matrix": [1, 3], "x": 7, "y": 1},
+ {"matrix": [0, 4], "x": 8, "y": 1},
+ {"matrix": [1, 4], "x": 9, "y": 1},
+ {"matrix": [0, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [3, 0], "x": 1.25, "y": 2},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [3, 2], "x": 5.25, "y": 2},
+ {"matrix": [2, 3], "x": 6.25, "y": 2},
+ {"matrix": [3, 3], "x": 7.25, "y": 2},
+ {"matrix": [2, 4], "x": 8.25, "y": 2},
+ {"matrix": [3, 4], "x": 9.25, "y": 2},
+ {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 3},
+ {"matrix": [5, 1], "x": 2.75, "y": 3},
+ {"matrix": [4, 2], "x": 3.75, "y": 3},
+ {"matrix": [5, 2], "x": 4.75, "y": 3},
+ {"matrix": [4, 3], "x": 5.75, "y": 3},
+ {"matrix": [5, 3], "x": 6.75, "y": 3},
+ {"matrix": [4, 4], "x": 7.75, "y": 3},
+ {"matrix": [5, 4], "x": 8.75, "y": 3},
+ {"matrix": [4, 5], "x": 9.75, "y": 3},
+ {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 4},
+ {"matrix": [7, 0], "x": 1, "y": 4},
+ {"matrix": [6, 1], "x": 2, "y": 4},
+ {"matrix": [7, 1], "x": 3, "y": 4, "w": 2.75},
+ {"matrix": [7, 2], "x": 5.75, "y": 4},
+ {"matrix": [6, 4], "x": 6.75, "y": 4, "w": 2.25},
+ {"matrix": [7, 4], "x": 9, "y": 4},
+ {"matrix": [6, 5], "x": 10, "y": 4},
+ {"matrix": [7, 5], "x": 11, "y": 4}
]
},
"LAYOUT_bigbar": {
"layout": [
- {"x":11, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":0, "y":2, "w":1.25},
- {"x":1.25, "y":2},
- {"x":2.25, "y":2},
- {"x":3.25, "y":2},
- {"x":4.25, "y":2},
- {"x":5.25, "y":2},
- {"x":6.25, "y":2},
- {"x":7.25, "y":2},
- {"x":8.25, "y":2},
- {"x":9.25, "y":2},
- {"x":10.25, "y":2, "w":1.75},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3, "w":1.25},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4},
- {"x":2.25, "y":4},
- {"x":3.25, "y":4, "w":6.25},
- {"x":9.5, "y":4, "w":1.25},
- {"x":10.75, "y":4, "w":1.25}
+ {"matrix": [1, 5], "x": 11, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [0, 1], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [0, 2], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [0, 3], "x": 6, "y": 1},
+ {"matrix": [1, 3], "x": 7, "y": 1},
+ {"matrix": [0, 4], "x": 8, "y": 1},
+ {"matrix": [1, 4], "x": 9, "y": 1},
+ {"matrix": [0, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [3, 0], "x": 1.25, "y": 2},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [3, 2], "x": 5.25, "y": 2},
+ {"matrix": [2, 3], "x": 6.25, "y": 2},
+ {"matrix": [3, 3], "x": 7.25, "y": 2},
+ {"matrix": [2, 4], "x": 8.25, "y": 2},
+ {"matrix": [3, 4], "x": 9.25, "y": 2},
+ {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 3},
+ {"matrix": [5, 1], "x": 2.75, "y": 3},
+ {"matrix": [4, 2], "x": 3.75, "y": 3},
+ {"matrix": [5, 2], "x": 4.75, "y": 3},
+ {"matrix": [4, 3], "x": 5.75, "y": 3},
+ {"matrix": [5, 3], "x": 6.75, "y": 3},
+ {"matrix": [4, 4], "x": 7.75, "y": 3},
+ {"matrix": [5, 4], "x": 8.75, "y": 3},
+ {"matrix": [4, 5], "x": 9.75, "y": 3},
+ {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 4},
+ {"matrix": [6, 1], "x": 2.25, "y": 4},
+ {"matrix": [7, 2], "x": 3.25, "y": 4, "w": 6.25},
+ {"matrix": [6, 5], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [7, 5], "x": 10.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/0xcb/static/static.c b/keyboards/0xcb/static/static.c
deleted file mode 100644
index c6f5601f29..0000000000
--- a/keyboards/0xcb/static/static.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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 "static.h"
diff --git a/keyboards/0xcb/static/static.h b/keyboards/0xcb/static/static.h
deleted file mode 100644
index 19b698ef3f..0000000000
--- a/keyboards/0xcb/static/static.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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"
-
-/* 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.
- */
-
-// clang-format off
-#define LAYOUT_all( \
- K15, \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
- K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \
- K60, K70, K61, K71, K72, K64, K74, K65, K75 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, K34, K35 }, \
- { K40, K41, K42, K43, K44, K45 }, \
- { KC_NO, K51, K52, K53, K54, K55 }, \
- { K60, K61, KC_NO, KC_NO, K64, K65 }, \
- { K70, K71, K72, KC_NO, K74, K75 }, \
-}
-
-#define LAYOUT_bigbar( \
- K15, \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
- K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \
- K60, K70, K61, K72, K65, K75 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, K34, K35 }, \
- { K40, K41, K42, K43, K44, K45 }, \
- { KC_NO, K51, K52, K53, K54, K55 }, \
- { K60, K61, KC_NO, KC_NO, KC_NO, K65 }, \
- { K70, KC_NO, K72, KC_NO, KC_NO, K75 }, \
-}
-// clang-format on
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index cdb29e6bd1..b211d6f5f2 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGB_DI_PIN D3 // LED data pin on controller
#define RGBLED_NUM 4 // Number of LEDs connected
#define RGBLIGHT_HUE_STEP 10 // The number of steps to cycle through the hue by
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 646b4dc882..79fdf0af45 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -11,6 +11,9 @@
"bootmagic": {
"matrix": [1, 0]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"matrix_pins": {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 16:15:34 +0000