Skip to content

Commit 6602ee0

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 7e53bb9 + 2ad1303 commit 6602ee0

File tree

4 files changed

+316
-0
lines changed

4 files changed

+316
-0
lines changed

‎keyboards/jaykeeb/jk60rgb/jk60rgb.c

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* Copyright 2024 Alabahuy
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+
#include "quantum.h"
18+
19+
#ifdef RGB_MATRIX_ENABLE
20+
bool rgb_matrix_indicators_kb(void) {
21+
if (!rgb_matrix_indicators_user()) {
22+
return false;
23+
}
24+
if (host_keyboard_led_state().caps_lock) { // Capslock = WHITE
25+
rgb_matrix_set_color(36, 255, 255, 255);
26+
}
27+
return true;
28+
}
29+
#endif

‎keyboards/jaykeeb/jk60rgb/keyboard.json

+238
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
{
2+
"manufacturer": "Jaykeeb Studio",
3+
"keyboard_name": "JK60 RGB",
4+
"maintainer": "Alabahuy",
5+
"bootloader": "rp2040",
6+
"diode_direction": "COL2ROW",
7+
"features": {
8+
"bootmagic": true,
9+
"command": false,
10+
"console": false,
11+
"extrakey": true,
12+
"mousekey": true,
13+
"nkro": true,
14+
"rgb_matrix": true
15+
},
16+
"matrix_pins": {
17+
"cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP20", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"],
18+
"rows": ["GP21", "GP22", "GP23", "GP24", "GP15"]
19+
},
20+
"ws2812": {
21+
"driver": "vendor",
22+
"pin": "GP19"
23+
},
24+
"rgb_matrix": {
25+
"max_brightness": 125,
26+
"sleep": true,
27+
"animations": {
28+
"alphas_mods": true,
29+
"band_pinwheel_sat": true,
30+
"band_pinwheel_val": true,
31+
"band_sat": true,
32+
"band_spiral_sat": true,
33+
"band_spiral_val": true,
34+
"band_val": true,
35+
"breathing": true,
36+
"cycle_all": true,
37+
"cycle_left_right": true,
38+
"cycle_out_in": true,
39+
"cycle_out_in_dual": true,
40+
"cycle_pinwheel": true,
41+
"cycle_spiral": true,
42+
"cycle_up_down": true,
43+
"digital_rain": true,
44+
"dual_beacon": true,
45+
"gradient_left_right": true,
46+
"gradient_up_down": true,
47+
"hue_breathing": true,
48+
"hue_pendulum": true,
49+
"hue_wave": true,
50+
"jellybean_raindrops": true,
51+
"multisplash": true,
52+
"pixel_flow": true,
53+
"pixel_rain": true,
54+
"rainbow_beacon": true,
55+
"rainbow_moving_chevron": true,
56+
"rainbow_pinwheels": true,
57+
"raindrops": true,
58+
"solid_multisplash": true,
59+
"solid_reactive": true,
60+
"solid_reactive_cross": true,
61+
"solid_reactive_multicross": true,
62+
"solid_reactive_multinexus": true,
63+
"solid_reactive_multiwide": true,
64+
"solid_reactive_nexus": true,
65+
"solid_reactive_simple": true,
66+
"solid_reactive_wide": true,
67+
"solid_splash": true,
68+
"splash": true,
69+
"typing_heatmap": true
70+
},
71+
"driver": "ws2812",
72+
"layout": [
73+
{"x": 4, "y": 5, "flags": 2},
74+
{"matrix": [0, 0], "x": 8, "y": 7, "flags": 1},
75+
{"matrix": [0, 1], "x": 23, "y": 7, "flags": 4},
76+
{"matrix": [0, 2], "x": 37, "y": 7, "flags": 4},
77+
{"matrix": [0, 3], "x": 52, "y": 7, "flags": 4},
78+
{"x": 60, "y": 0, "flags": 2},
79+
{"matrix": [0, 4], "x": 67, "y": 7, "flags": 4},
80+
{"matrix": [0, 5], "x": 82, "y": 7, "flags": 4},
81+
{"matrix": [0, 6], "x": 97, "y": 7, "flags": 4},
82+
{"x": 105, "y": 0, "flags": 2},
83+
{"matrix": [0, 7], "x": 112, "y": 7, "flags": 4},
84+
{"matrix": [0, 8], "x": 127, "y": 7, "flags": 4},
85+
{"matrix": [0, 9], "x": 142, "y": 7, "flags": 4},
86+
{"x": 150, "y": 0, "flags": 2},
87+
{"matrix": [0, 10], "x": 157, "y": 7, "flags": 4},
88+
{"matrix": [0, 11], "x": 172, "y": 7, "flags": 4},
89+
{"matrix": [0, 12], "x": 187, "y": 7, "flags": 4},
90+
{"x": 195, "y": 0, "flags": 2},
91+
{"matrix": [0, 13], "x": 201, "y": 7, "flags": 4},
92+
{"matrix": [1, 13], "x": 216, "y": 7, "flags": 1},
93+
{"x": 224, "y": 13, "flags": 2},
94+
95+
{"matrix": [2, 13], "x": 213, "y": 19, "flags": 1},
96+
{"matrix": [1, 12], "x": 194, "y": 19, "flags": 4},
97+
{"matrix": [1, 11], "x": 179, "y": 19, "flags": 4},
98+
{"matrix": [1, 10], "x": 164, "y": 19, "flags": 4},
99+
{"matrix": [1, 9], "x": 149, "y": 19, "flags": 4},
100+
{"matrix": [1, 8], "x": 134, "y": 19, "flags": 4},
101+
{"matrix": [1, 7], "x": 119, "y": 19, "flags": 4},
102+
{"matrix": [1, 6], "x": 105, "y": 19, "flags": 4},
103+
{"matrix": [1, 5], "x": 90, "y": 19, "flags": 4},
104+
{"matrix": [1, 4], "x": 75, "y": 19, "flags": 4},
105+
{"matrix": [1, 3], "x": 60, "y": 19, "flags": 4},
106+
{"matrix": [1, 2], "x": 45, "y": 19, "flags": 4},
107+
{"matrix": [1, 1], "x": 30, "y": 19, "flags": 4},
108+
{"matrix": [1, 0], "x": 11, "y": 19, "flags": 1},
109+
{"x": 4, "y": 19, "flags": 2},
110+
111+
{"matrix": [2, 0], "x": 13, "y": 32, "flags": 8},
112+
{"matrix": [2, 1], "x": 34, "y": 32, "flags": 4},
113+
{"matrix": [2, 2], "x": 49, "y": 32, "flags": 4},
114+
{"matrix": [2, 3], "x": 64, "y": 32, "flags": 4},
115+
{"matrix": [2, 4], "x": 79, "y": 32, "flags": 4},
116+
{"matrix": [2, 5], "x": 94, "y": 32, "flags": 4},
117+
{"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
118+
{"matrix": [2, 7], "x": 123, "y": 32, "flags": 4},
119+
{"matrix": [2, 8], "x": 138, "y": 32, "flags": 4},
120+
{"matrix": [2, 9], "x": 153, "y": 32, "flags": 4},
121+
{"matrix": [2, 10], "x": 168, "y": 32, "flags": 4},
122+
{"matrix": [2, 11], "x": 183, "y": 32, "flags": 4},
123+
{"matrix": [2, 12], "x": 183, "y": 32, "flags": 1},
124+
125+
{"matrix": [3, 13], "x": 216, "y": 45, "flags": 1},
126+
{"matrix": [3, 12], "x": 196, "y": 45, "flags": 4},
127+
{"matrix": [3, 11], "x": 175, "y": 45, "flags": 4},
128+
{"matrix": [3, 10], "x": 161, "y": 45, "flags": 4},
129+
{"matrix": [3, 9], "x": 146, "y": 45, "flags": 4},
130+
{"matrix": [3, 8], "x": 135, "y": 45, "flags": 4},
131+
{"matrix": [3, 7], "x": 116, "y": 45, "flags": 4},
132+
{"matrix": [3, 6], "x": 101, "y": 45, "flags": 4},
133+
{"matrix": [3, 5], "x": 86, "y": 45, "flags": 4},
134+
{"matrix": [3, 4], "x": 71, "y": 45, "flags": 4},
135+
{"matrix": [3, 3], "x": 56, "y": 45, "flags": 4},
136+
{"matrix": [3, 2], "x": 41, "y": 45, "flags": 4},
137+
{"matrix": [3, 0], "x": 17, "y": 45, "flags": 1},
138+
139+
{"x": 4, "y": 51, "flags": 2},
140+
{"matrix": [4, 0], "x": 11, "y": 57, "flags": 1},
141+
{"x": 15, "y": 57, "flags": 2},
142+
{"matrix": [4, 1], "x": 28, "y": 57, "flags": 1},
143+
{"matrix": [4, 2], "x": 50, "y": 57, "flags": 1},
144+
{"x": 72, "y": 57, "flags": 2},
145+
{"x": 92, "y": 57, "flags": 2},
146+
{"matrix": [4, 7], "x": 112, "y": 57, "flags": 1},
147+
{"x": 132, "y": 57, "flags": 2},
148+
{"x": 152, "y": 57, "flags": 2},
149+
{"matrix": [4, 11], "x": 172, "y": 57, "flags": 1},
150+
{"matrix": [4, 12], "x": 194, "y": 57, "flags": 1},
151+
{"x": 209, "y": 57, "flags": 2},
152+
{"matrix": [4, 13], "x": 213, "y": 57, "flags": 1},
153+
{"x": 220, "y": 51, "flags": 2}
154+
]
155+
},
156+
"processor": "RP2040",
157+
"url": "",
158+
"usb": {
159+
"device_version": "1.0.0",
160+
"pid": "0x7762",
161+
"vid": "0x414C"
162+
},
163+
"community_layouts": [
164+
"60_ansi_tsangan_split_bs_rshift"
165+
],
166+
"layouts": {
167+
"LAYOUT_60_ansi_tsangan_split_bs_rshift": {
168+
"layout": [
169+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
170+
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
171+
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
172+
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
173+
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
174+
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
175+
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
176+
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
177+
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
178+
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
179+
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
180+
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
181+
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
182+
{"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
183+
{"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0},
184+
185+
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
186+
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
187+
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
188+
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
189+
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
190+
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
191+
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
192+
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
193+
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
194+
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
195+
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
196+
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
197+
{"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
198+
{"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
199+
200+
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
201+
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
202+
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
203+
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
204+
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
205+
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
206+
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
207+
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
208+
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
209+
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
210+
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
211+
{"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
212+
{"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
213+
214+
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
215+
{"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
216+
{"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
217+
{"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
218+
{"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
219+
{"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
220+
{"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
221+
{"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
222+
{"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
223+
{"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
224+
{"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
225+
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
226+
{"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
227+
228+
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
229+
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
230+
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
231+
{"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
232+
{"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
233+
{"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
234+
{"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
235+
]
236+
}
237+
}
238+
}

‎keyboards/jaykeeb/jk60rgb/keymaps/default/keymap.c

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2024 Alabahuy
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#include QMK_KEYBOARD_H
5+
6+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7+
[0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
8+
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
9+
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
10+
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
11+
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
12+
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
13+
),
14+
15+
[1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
16+
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
17+
RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
18+
_______, RM_PREV, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, _______, _______, _______, _______, _______, _______, _______,
19+
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
20+
_______, _______, _______, QK_BOOT, _______, _______, _______
21+
)
22+
};

‎keyboards/jaykeeb/jk60rgb/readme.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# JK60 RGB
2+
3+
![jk60 RGB]( https://i.imgur.com/YP978wp.jpeg )
4+
5+
Layout 60% rgb per keys support keyboard case existing
6+
7+
* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy)
8+
* Hardware Supported: JK60 RGB pcb, RP2040, led sk6812 per switch
9+
* Hardware Availability: Private GB
10+
11+
Make example for this keyboard (after setting up your build environment):
12+
13+
make jaykeeb/jk60rgb:default
14+
15+
Flashing example for this keyboard:
16+
17+
make jaykeeb/jk60rgb:default:flash
18+
19+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
20+
21+
## Bootloader
22+
23+
Enter the bootloader in 3 ways:
24+
25+
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
26+
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
27+
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

0 commit comments

Comments
 (0)