Skip to content

Commit 3499677

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents c2362b4 + cf45a05 commit 3499677

File tree

10 files changed

+677
-103
lines changed

10 files changed

+677
-103
lines changed

‎keyboards/jacky_studio/bear_65/bear_65.h

+5-27
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,8 @@
1818

1919
#include "quantum.h"
2020

21-
#define LAYOUT_all( \
22-
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
23-
K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
24-
K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
25-
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
26-
K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
27-
) { \
28-
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
29-
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
30-
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
31-
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
32-
{ K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
33-
}
34-
35-
#define LAYOUT_full_bs( \
36-
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
37-
K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
38-
K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
39-
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
40-
K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
41-
) { \
42-
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
43-
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
44-
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
45-
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
46-
{ K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
47-
}
21+
#if defined(KEYBOARD_jacky_studio_bear_65_rev1)
22+
#include "rev1.h"
23+
#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
24+
#include "rev2.h"
25+
#endif

‎keyboards/jacky_studio/bear_65/config.h

+25-34
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
/* Copyright 2020 MudkipMao
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-
*/
1+
// Copyright 2017-2021 QMK
2+
// SPDX-License-Identifier: GPL-2.0-or-later
163

174
#pragma once
185

@@ -34,26 +21,31 @@
3421
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
3522
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
3623

37-
/* Setting the matrix value of top left key for bootmagic lite */
38-
#define BOOTMAGIC_LITE_ROW 3
39-
#define BOOTMAGIC_LITE_COLUMN 1
40-
24+
/* COL2ROW or ROW2COL */
4125
#define DIODE_DIRECTION ROW2COL
4226

4327
#define LED_CAPS_LOCK_PIN C7
28+
#define LED_PIN_ON_STATE 0
4429

30+
/* number of backlight levels */
4531
#define BACKLIGHT_PIN B6
46-
#define BACKLIGHT_BREATHING
47-
#define BACKLIGHT_LEVELS 4
32+
#ifdef BACKLIGHT_PIN
33+
#define BACKLIGHT_LEVELS 3
34+
#endif
35+
36+
/* Set 0 if debouncing isn't needed */
37+
#define DEBOUNCE 5
38+
39+
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
40+
#define LOCKING_SUPPORT_ENABLE
41+
42+
/* Locking resynchronize hack */
43+
#define LOCKING_RESYNC_ENABLE
4844

4945
#define RGB_DI_PIN E2
5046
#ifdef RGB_DI_PIN
51-
#define RGBLED_NUM 15
52-
#define RGBLIGHT_HUE_STEP 8
53-
#define RGBLIGHT_SAT_STEP 8
54-
#define RGBLIGHT_VAL_STEP 8
55-
#define RGBLIGHT_LIMIT_VAL 139 /* The maximum brightness level */
56-
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
47+
#define RGBLIGHT_LIMIT_VAL 200
48+
#define RGBLIGHT_DEFAULT_VAL 50
5749
#define RGBLIGHT_EFFECT_BREATHING
5850
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
5951
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -64,12 +56,11 @@
6456
#define RGBLIGHT_EFFECT_RGB_TEST
6557
#define RGBLIGHT_EFFECT_ALTERNATING
6658
#define RGBLIGHT_EFFECT_TWINKLE
67-
#endif
59+
#define RGBLED_NUM 20
60+
#define RGBLIGHT_HUE_STEP 8
61+
#define RGBLIGHT_SAT_STEP 8
62+
#define RGBLIGHT_VAL_STEP 8
63+
/* If defined, the RGB lighting will be switched off when the host goes to sleep */
64+
#define RGBLIGHT_SLEEP
6865

69-
/* RGB matrix support */
70-
#ifdef RGB_MATRIX_ENABLE
71-
#define RGB_MATRIX_KEYPRESSES
72-
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
73-
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
74-
#define RGB_MATRIX_LED_COUNT 12 // Number of LEDs
7566
#endif

‎keyboards/jacky_studio/bear_65/info.json

-19
This file was deleted.

‎keyboards/jacky_studio/bear_65/rev1/info.json

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
{
2+
"keyboard_name": "Bear 65",
3+
"manufacturer": "Jacky",
4+
"url": "https://qmk.fm/keyboards",
5+
"maintainer": "qmk",
6+
"processor": "atmega32u4",
7+
"bootloader": "atmel-dfu",
8+
"usb": {
9+
"vid": "0xA13B",
10+
"pid": "0x000A",
11+
"device_version": "0.0.1"
12+
},
13+
"layouts": {
14+
"LAYOUT_all": {
15+
"layout": [
16+
{"label":"Esc", "x":0.5, "y":0},
17+
{"label":"~", "x":1.75, "y":0},
18+
{"label":"!", "x":2.75, "y":0},
19+
{"label":"@", "x":3.75, "y":0},
20+
{"label":"#", "x":4.75, "y":0},
21+
{"label":"$", "x":5.75, "y":0},
22+
{"label":"%", "x":6.75, "y":0},
23+
{"label":"^", "x":7.75, "y":0},
24+
{"label":"&", "x":11.25, "y":0},
25+
{"label":"*", "x":12.25, "y":0},
26+
{"label":"(", "x":13.25, "y":0},
27+
{"label":")", "x":14.25, "y":0},
28+
{"label":"_", "x":15.25, "y":0},
29+
{"label":"+", "x":16.25, "y":0},
30+
{"label":"|", "x":17.25, "y":0},
31+
{"label":"~", "x":18.25, "y":0},
32+
{"label":"Del", "x":19.75, "y":0},
33+
34+
{"label":"PgUp", "x":0.25, "y":1},
35+
{"label":"Tab", "x":1.75, "y":1, "w":1.5},
36+
{"label":"Q", "x":3.25, "y":1},
37+
{"label":"W", "x":4.25, "y":1},
38+
{"label":"E", "x":5.25, "y":1},
39+
{"label":"R", "x":6.25, "y":1},
40+
{"label":"T", "x":7.25, "y":1},
41+
{"label":"Y", "x":10.75, "y":1},
42+
{"label":"U", "x":11.75, "y":1},
43+
{"label":"I", "x":12.75, "y":1},
44+
{"label":"O", "x":13.75, "y":1},
45+
{"label":"P", "x":14.75, "y":1},
46+
{"label":"{", "x":15.75, "y":1},
47+
{"label":"}", "x":16.75, "y":1},
48+
{"label":"Backspace", "x":17.75, "y":1, "w":1.5},
49+
50+
{"label":"PgDn", "x":0, "y":2},
51+
{"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
52+
{"label":"A", "x":3.5, "y":2},
53+
{"label":"S", "x":4.5, "y":2},
54+
{"label":"D", "x":5.5, "y":2},
55+
{"label":"F", "x":6.5, "y":2},
56+
{"label":"G", "x":7.5, "y":2},
57+
{"label":"H", "x":11, "y":2},
58+
{"label":"J", "x":12, "y":2},
59+
{"label":"K", "x":13, "y":2},
60+
{"label":"L", "x":14, "y":2},
61+
{"label":":", "x":15, "y":2},
62+
{"label":"\"", "x":16, "y":2},
63+
{"label":"Enter", "x":17, "y":2, "w":2.25},
64+
65+
{"label":"Shift", "x":1.75, "y":3, "w":2.25},
66+
{"label":"Z", "x":4, "y":3},
67+
{"label":"X", "x":5, "y":3},
68+
{"label":"C", "x":6, "y":3},
69+
{"label":"V", "x":7, "y":3},
70+
{"label":"B", "x":8, "y":3},
71+
{"label":"B", "x":10.5, "y":3},
72+
{"label":"N", "x":11.5, "y":3},
73+
{"label":"M", "x":12.5, "y":3},
74+
{"label":"<", "x":13.5, "y":3},
75+
{"label":">", "x":14.5, "y":3},
76+
{"label":"?", "x":15.5, "y":3},
77+
{"label":"Shift", "x":16.5, "y":3, "w":1.75},
78+
{"label":"Up", "x":18.25, "y":3},
79+
80+
{"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
81+
{"label":"Alt", "x":4.75, "y":4, "w":1.25},
82+
{"x":6, "y":4, "w":2.25},
83+
{"label":"Win", "x":8.25, "y":4},
84+
{"x":10.5, "y":4, "w":2.75},
85+
{"label":"Alt", "x":13.25, "y":4, "w":1.5},
86+
{"label":"Left", "x":17.25, "y":4},
87+
{"label":"Down", "x":18.25, "y":4},
88+
{"label":"Right", "x":19.25, "y":4}]
89+
},
90+
"LAYOUT_full_bs": {
91+
"layout": [
92+
{"label":"Esc", "x":0.5, "y":0},
93+
{"label":"~", "x":1.75, "y":0},
94+
{"label":"!", "x":2.75, "y":0},
95+
{"label":"@", "x":3.75, "y":0},
96+
{"label":"#", "x":4.75, "y":0},
97+
{"label":"$", "x":5.75, "y":0},
98+
{"label":"%", "x":6.75, "y":0},
99+
{"label":"^", "x":7.75, "y":0},
100+
{"label":"&", "x":11.25, "y":0},
101+
{"label":"*", "x":12.25, "y":0},
102+
{"label":"(", "x":13.25, "y":0},
103+
{"label":")", "x":14.25, "y":0},
104+
{"label":"_", "x":15.25, "y":0},
105+
{"label":"+", "x":16.25, "y":0},
106+
{"label":"Backspace", "x":17.25, "y":0, "w":2},
107+
{"label":"Del", "x":19.75, "y":0},
108+
109+
{"label":"PgUp", "x":0.25, "y":1},
110+
{"label":"Tab", "x":1.75, "y":1, "w":1.5},
111+
{"label":"Q", "x":3.25, "y":1},
112+
{"label":"W", "x":4.25, "y":1},
113+
{"label":"E", "x":5.25, "y":1},
114+
{"label":"R", "x":6.25, "y":1},
115+
{"label":"T", "x":7.25, "y":1},
116+
{"label":"Y", "x":10.75, "y":1},
117+
{"label":"U", "x":11.75, "y":1},
118+
{"label":"I", "x":12.75, "y":1},
119+
{"label":"O", "x":13.75, "y":1},
120+
{"label":"P", "x":14.75, "y":1},
121+
{"label":"{", "x":15.75, "y":1},
122+
{"label":"}", "x":16.75, "y":1},
123+
{"label":"|", "x":17.75, "y":1, "w":1.5},
124+
125+
{"label":"PgDn", "x":0, "y":2},
126+
{"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
127+
{"label":"A", "x":3.5, "y":2},
128+
{"label":"S", "x":4.5, "y":2},
129+
{"label":"D", "x":5.5, "y":2},
130+
{"label":"F", "x":6.5, "y":2},
131+
{"label":"G", "x":7.5, "y":2},
132+
{"label":"H", "x":11, "y":2},
133+
{"label":"J", "x":12, "y":2},
134+
{"label":"K", "x":13, "y":2},
135+
{"label":"L", "x":14, "y":2},
136+
{"label":":", "x":15, "y":2},
137+
{"label":"\"", "x":16, "y":2},
138+
{"label":"Enter", "x":17, "y":2, "w":2.25},
139+
140+
{"label":"Shift", "x":1.75, "y":3, "w":2.25},
141+
{"label":"Z", "x":4, "y":3},
142+
{"label":"X", "x":5, "y":3},
143+
{"label":"C", "x":6, "y":3},
144+
{"label":"V", "x":7, "y":3},
145+
{"label":"B", "x":8, "y":3},
146+
{"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
147+
{"label":"M", "x":12.5, "y":3},
148+
{"label":"<", "x":13.5, "y":3},
149+
{"label":">", "x":14.5, "y":3},
150+
{"label":"?", "x":15.5, "y":3},
151+
{"label":"Shift", "x":16.5, "y":3, "w":1.75},
152+
{"label":"Up", "x":18.25, "y":3},
153+
154+
{"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
155+
{"label":"Alt", "x":4.75, "y":4, "w":1.25},
156+
{"x":6, "y":4, "w":2.25},
157+
{"label":"Win", "x":8.25, "y":4},
158+
{"x":10.5, "y":4, "w":2.75},
159+
{"label":"Alt", "x":13.25, "y":4, "w":1.5},
160+
{"label":"Left", "x":17.25, "y":4},
161+
{"label":"Down", "x":18.25, "y":4},
162+
{"label":"Right", "x":19.25, "y":4}]
163+
}
164+
}
165+
}

0 commit comments

Comments
 (0)