summaryrefslogtreecommitdiff
path: root/keyboards/jadookb
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-07-11 10:09:41 +1000
committerGitHub <noreply@github.com>2024-07-10 17:09:41 -0700
commitfb54a59bba20d83be7a42da52faf3e6afebc1c26 (patch)
treeb10cfaa741343a89553c769b8e9b559ff5cf8186 /keyboards/jadookb
parentfbbc71ec34e1e9dc5450e9620e71526f5488fe81 (diff)
`jadookb/jkb65`: move RGB Matrix LED config to data driven (#24080)
Diffstat (limited to 'keyboards/jadookb')
-rw-r--r--keyboards/jadookb/jkb65/config.h19
-rw-r--r--keyboards/jadookb/jkb65/info.json73
-rw-r--r--keyboards/jadookb/jkb65/jkb65.c29
3 files changed, 74 insertions, 47 deletions
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
deleted file mode 100644
index a0793c5861..0000000000
--- a/keyboards/jadookb/jkb65/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
1 /* Copyright 2021 Wizad-GG
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#define RGB_MATRIX_LED_COUNT 67
diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index 054b1c5452..c4a44a0d74 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -77,6 +77,79 @@
77 "animation": "cycle_all" 77 "animation": "cycle_all"
78 }, 78 },
79 "driver": "ws2812", 79 "driver": "ws2812",
80 "layout": [
81 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
82 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
83 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
84 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
85 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
86 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
87 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
88 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
89 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
90 {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
91 {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
92 {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
93 {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
94 {"matrix": [0, 14], "x": 202, "y": 0, "flags": 1},
95 {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
96
97 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
98 {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
99 {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
100 {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
101 {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
102 {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
103 {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
104 {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
105 {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
106 {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
107 {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
108 {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
109 {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
110 {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
111 {"matrix": [1, 15], "x": 224, "y": 16, "flags": 1},
112
113 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
114 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
115 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
116 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
117 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
118 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
119 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
120 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
121 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
122 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
123 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
124 {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
125 {"matrix": [2, 13], "x": 200, "y": 32, "flags": 1},
126 {"matrix": [2, 15], "x": 224, "y": 32, "flags": 1},
127
128 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
129 {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
130 {"matrix": [3, 3], "x": 49, "y": 48, "flags": 4},
131 {"matrix": [3, 4], "x": 63, "y": 48, "flags": 4},
132 {"matrix": [3, 5], "x": 78, "y": 48, "flags": 4},
133 {"matrix": [3, 6], "x": 93, "y": 48, "flags": 4},
134 {"matrix": [3, 7], "x": 108, "y": 48, "flags": 4},
135 {"matrix": [3, 8], "x": 123, "y": 48, "flags": 4},
136 {"matrix": [3, 9], "x": 138, "y": 48, "flags": 4},
137 {"matrix": [3, 10], "x": 153, "y": 48, "flags": 4},
138 {"matrix": [3, 11], "x": 168, "y": 48, "flags": 4},
139 {"matrix": [3, 12], "x": 189, "y": 48, "flags": 1},
140 {"matrix": [3, 13], "x": 209, "y": 48, "flags": 1},
141 {"matrix": [3, 15], "x": 224, "y": 48, "flags": 1},
142
143 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
144 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
145 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
146 {"matrix": [4, 6], "x": 95, "y": 64, "flags": 4},
147 {"matrix": [4, 10], "x": 151, "y": 64, "flags": 1},
148 {"matrix": [4, 11], "x": 170, "y": 64, "flags": 1},
149 {"matrix": [4, 12], "x": 194, "y": 64, "flags": 1},
150 {"matrix": [4, 13], "x": 209, "y": 64, "flags": 1},
151 {"matrix": [4, 15], "x": 224, "y": 64, "flags": 1}
152 ],
80 "led_process_limit": 4, 153 "led_process_limit": 4,
81 "led_flush_limit": 26, 154 "led_flush_limit": 26,
82 "sleep": true, 155 "sleep": true,
diff --git a/keyboards/jadookb/jkb65/jkb65.c b/keyboards/jadookb/jkb65/jkb65.c
index 0e76162b5a..54037899dc 100644
--- a/keyboards/jadookb/jkb65/jkb65.c
+++ b/keyboards/jadookb/jkb65/jkb65.c
@@ -17,38 +17,11 @@
17#include "quantum.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20
21led_config_t g_led_config = { {
22 // Key Matrix to LED Index
23 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
24 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
25 { 30, NO_LED, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 },
26 { NO_LED, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 },
27 { 58, 59, 60, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, 66 }
28}, {
29 // LED Index to Physical Position
30 { 0, 0}, { 15, 0}, { 30, 0}, { 45, 0}, { 60, 0}, { 75, 0}, { 90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {202, 0}, {225, 0}, // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Delete
31 { 4, 16}, { 22, 16}, { 37, 16}, { 52, 16}, { 67, 16}, { 82, 16}, { 97, 16}, {112, 16}, {127, 16}, {142, 16}, {157, 16}, {172, 16}, {187, 16}, {206, 16}, {225, 16}, // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], backslash , Home
32 { 6, 32}, { 26, 32}, { 41, 32}, { 56, 32}, { 71, 32}, { 86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {176, 32}, {201, 32}, {225, 32}, // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Page up
33 { 9, 48}, { 34, 48}, { 49, 48}, { 64, 48}, { 79, 48}, { 94, 48}, {109, 48}, {124, 48}, {139, 48}, {154, 48}, {169, 48}, {189, 48}, {208, 48}, {225, 48}, // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Page Down
34 { 2, 64}, { 21, 64}, { 39, 64}, { 94, 64}, {148, 64}, {163, 64}, {193, 64}, {208, 64}, {225, 64}, // Ctrl, GUI, Alt, Space, RAlt, FN, Ctrl, Left, Down, Right
35
36}, {
37 // LED Index to Flag
38 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Delete
39 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], backslash , Home
40 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Page up
41 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Page Down
42 1, 1, 1, 4, 1, 1, 1, 1, 1, // Ctrl, GUI, Alt, Space, Alt, FN, Left, Down, Right
43
44} };
45
46
47bool rgb_matrix_indicators_kb(void) { 20bool rgb_matrix_indicators_kb(void) {
48 if (!rgb_matrix_indicators_user()) { 21 if (!rgb_matrix_indicators_user()) {
49 return false; 22 return false;
50 } 23 }
51 if (host_keyboard_led_state().caps_lock) { 24 if (host_keyboard_led_state().caps_lock) {
52 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); 25 rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
53 } 26 }
54 return true; 27 return true;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:35:13 +0000