summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-02-08 04:55:11 +0000
committerQMK Bot <hello@qmk.fm>2023-02-08 04:55:11 +0000
commit3499677b6a5a9ee5845122382f93f0500dfd8429 (patch)
tree0ef9754a565a90652631ae85bac866f940294680 /keyboards
parentc2362b4bea60adff0b4995a9faf1ee59117e5bfa (diff)
parentcf45a0529671e33fdb63e3003d4340d7320b3e8e (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/jacky_studio/bear_65/bear_65.h32
-rw-r--r--keyboards/jacky_studio/bear_65/config.h59
-rw-r--r--keyboards/jacky_studio/bear_65/info.json19
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/info.json165
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/rev1.h47
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/rules.mk17
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/info.json324
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rev2.h76
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rules.mk17
-rw-r--r--keyboards/jacky_studio/bear_65/rules.mk24
10 files changed, 677 insertions, 103 deletions
diff --git a/keyboards/jacky_studio/bear_65/bear_65.h b/keyboards/jacky_studio/bear_65/bear_65.h
index 872436fcd4..be8a14a86f 100644
--- a/keyboards/jacky_studio/bear_65/bear_65.h
+++ b/keyboards/jacky_studio/bear_65/bear_65.h
@@ -18,30 +18,8 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT_all( \ 21#if defined(KEYBOARD_jacky_studio_bear_65_rev1)
22 K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \ 22 #include "rev1.h"
23 K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 23#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
24 K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ 24 #include "rev2.h"
25 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ 25#endif
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}
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 781887446f..9b9f7b7cab 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -1,18 +1,5 @@
1/* Copyright 2020 MudkipMao 1// Copyright 2017-2021 QMK
2 * 2// SPDX-License-Identifier: GPL-2.0-or-later
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 3
17#pragma once 4#pragma once
18 5
@@ -34,26 +21,31 @@
34#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } 21#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
35#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } 22#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
36 23
37/* Setting the matrix value of top left key for bootmagic lite */ 24/* COL2ROW or ROW2COL */
38#define BOOTMAGIC_LITE_ROW 3
39#define BOOTMAGIC_LITE_COLUMN 1
40
41#define DIODE_DIRECTION ROW2COL 25#define DIODE_DIRECTION ROW2COL
42 26
43#define LED_CAPS_LOCK_PIN C7 27#define LED_CAPS_LOCK_PIN C7
28#define LED_PIN_ON_STATE 0
44 29
30/* number of backlight levels */
45#define BACKLIGHT_PIN B6 31#define BACKLIGHT_PIN B6
46#define BACKLIGHT_BREATHING 32#ifdef BACKLIGHT_PIN
47#define BACKLIGHT_LEVELS 4 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
48 44
49#define RGB_DI_PIN E2 45#define RGB_DI_PIN E2
50#ifdef RGB_DI_PIN 46#ifdef RGB_DI_PIN
51 #define RGBLED_NUM 15 47#define RGBLIGHT_LIMIT_VAL 200
52 #define RGBLIGHT_HUE_STEP 8 48#define RGBLIGHT_DEFAULT_VAL 50
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 */
57#define RGBLIGHT_EFFECT_BREATHING 49#define RGBLIGHT_EFFECT_BREATHING
58#define RGBLIGHT_EFFECT_RAINBOW_MOOD 50#define RGBLIGHT_EFFECT_RAINBOW_MOOD
59#define RGBLIGHT_EFFECT_RAINBOW_SWIRL 51#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -64,12 +56,11 @@
64#define RGBLIGHT_EFFECT_RGB_TEST 56#define RGBLIGHT_EFFECT_RGB_TEST
65#define RGBLIGHT_EFFECT_ALTERNATING 57#define RGBLIGHT_EFFECT_ALTERNATING
66#define RGBLIGHT_EFFECT_TWINKLE 58#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
68 65
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
75#endif 66#endif
diff --git a/keyboards/jacky_studio/bear_65/info.json b/keyboards/jacky_studio/bear_65/info.json
deleted file mode 100644
index 151fd6fa5f..0000000000
--- a/keyboards/jacky_studio/bear_65/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
1{
2 "keyboard_name": "Bear 65",
3 "manufacturer": "Jacky",
4 "url": "https://qmk.fm/keyboards",
5 "maintainer": "qmk",
6 "usb": {
7 "vid": "0xA13B",
8 "pid": "0x000A",
9 "device_version": "0.0.1"
10 },
11 "layouts": {
12 "LAYOUT_all": {
13 "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"~", "x":18.25, "y":0}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"Backspace", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
14 },
15 "LAYOUT_full_bs": {
16 "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"Backspace", "x":17.25, "y":0, "w":2}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"|", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
17 }
18 }
19}
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
new file mode 100644
index 0000000000..e87eeb5484
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -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}
diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h
new file mode 100644
index 0000000000..901efe70b7
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev1/rev1.h
@@ -0,0 +1,47 @@
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 */
16
17#pragma once
18
19#include "bear_65.h"
20
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}
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
new file mode 100644
index 0000000000..5d90baa2af
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev1/rules.mk
@@ -0,0 +1,17 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = no # Enable N-Key Rollover
10BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13
14LTO_ENABLE = yes # Use LTO flags to reduce firmware size
15
16RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
17RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
new file mode 100644
index 0000000000..661ebecc92
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -0,0 +1,324 @@
1{
2 "keyboard_name": "Bear65 V2",
3 "manufacturer": "Jacky",
4 "url": "https://qmk.fm/keyboards",
5 "maintainer": "qmk",
6 "processor": "atmega32u4",
7 "bootloader": "atmel-dfu",
8 "usb": {
9 "vid": "0x45D4",
10 "pid": "0x0428",
11 "device_version": "0.0.1"
12 },
13 "layout_aliases": {
14 "LAYOUT_all": "LAYOUT_wkl_full",
15 "LAYOUT_full_bs": "LAYOUT_wkl_bs"
16 },
17 "layouts": {
18 "LAYOUT_wk_full": {
19 "layout": [
20 {"label":"Esc", "x":0.5, "y":0},
21 {"label":"~", "x":1.75, "y":0},
22 {"label":"!", "x":2.75, "y":0},
23 {"label":"@", "x":3.75, "y":0},
24 {"label":"#", "x":4.75, "y":0},
25 {"label":"$", "x":5.75, "y":0},
26 {"label":"%", "x":6.75, "y":0},
27 {"label":"^", "x":7.75, "y":0},
28 {"label":"&", "x":11.25, "y":0},
29 {"label":"*", "x":12.25, "y":0},
30 {"label":"(", "x":13.25, "y":0},
31 {"label":")", "x":14.25, "y":0},
32 {"label":"_", "x":15.25, "y":0},
33 {"label":"+", "x":16.25, "y":0},
34 {"label":"|", "x":17.25, "y":0},
35 {"label":"~", "x":18.25, "y":0},
36 {"label":"Del", "x":19.75, "y":0},
37
38 {"label":"PgUp", "x":0.25, "y":1},
39 {"label":"Tab", "x":1.75, "y":1, "w":1.5},
40 {"label":"Q", "x":3.25, "y":1},
41 {"label":"W", "x":4.25, "y":1},
42 {"label":"E", "x":5.25, "y":1},
43 {"label":"R", "x":6.25, "y":1},
44 {"label":"T", "x":7.25, "y":1},
45 {"label":"Y", "x":10.75, "y":1},
46 {"label":"U", "x":11.75, "y":1},
47 {"label":"I", "x":12.75, "y":1},
48 {"label":"O", "x":13.75, "y":1},
49 {"label":"P", "x":14.75, "y":1},
50 {"label":"{", "x":15.75, "y":1},
51 {"label":"}", "x":16.75, "y":1},
52 {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
53
54 {"label":"PgDn", "x":0, "y":2},
55 {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
56 {"label":"A", "x":3.5, "y":2},
57 {"label":"S", "x":4.5, "y":2},
58 {"label":"D", "x":5.5, "y":2},
59 {"label":"F", "x":6.5, "y":2},
60 {"label":"G", "x":7.5, "y":2},
61 {"label":"H", "x":11, "y":2},
62 {"label":"J", "x":12, "y":2},
63 {"label":"K", "x":13, "y":2},
64 {"label":"L", "x":14, "y":2},
65 {"label":":", "x":15, "y":2},
66 {"label":"\"", "x":16, "y":2},
67 {"label":"Enter", "x":17, "y":2, "w":2.25},
68
69 {"label":"Shift", "x":1.75, "y":3, "w":2.25},
70 {"label":"Z", "x":4, "y":3},
71 {"label":"X", "x":5, "y":3},
72 {"label":"C", "x":6, "y":3},
73 {"label":"V", "x":7, "y":3},
74 {"label":"B", "x":8, "y":3},
75 {"label":"B", "x":10.5, "y":3},
76 {"label":"N", "x":11.5, "y":3},
77 {"label":"M", "x":12.5, "y":3},
78 {"label":"<", "x":13.5, "y":3},
79 {"label":">", "x":14.5, "y":3},
80 {"label":"?", "x":15.5, "y":3},
81 {"label":"Shift", "x":16.5, "y":3, "w":1.75},
82 {"label":"Up", "x":18.25, "y":3},
83
84 {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
85 {"label":"Super", "x":3, "y":4},
86 {"label":"Alt", "x":4, "y":4, "w":1.25},
87 {"x":5.25, "y":4, "w":2.25},
88 {"label":"Fn", "x":8.25, "y":4},
89 {"x":11, "y":4, "w":2.75},
90 {"label":"Alt", "x":13.75, "y":4, "w":1.25},
91 {"label":"Ctrl", "x":15, "y":4},
92 {"label":"Left", "x":17.25, "y":4},
93 {"label":"Down", "x":18.25, "y":4},
94 {"label":"Right", "x":19.25, "y":4}]
95 },
96 "LAYOUT_wkl_full": {
97 "layout": [
98 {"label":"Esc", "x":0.5, "y":0},
99 {"label":"~", "x":1.75, "y":0},
100 {"label":"!", "x":2.75, "y":0},
101 {"label":"@", "x":3.75, "y":0},
102 {"label":"#", "x":4.75, "y":0},
103 {"label":"$", "x":5.75, "y":0},
104 {"label":"%", "x":6.75, "y":0},
105 {"label":"^", "x":7.75, "y":0},
106 {"label":"&", "x":11.25, "y":0},
107 {"label":"*", "x":12.25, "y":0},
108 {"label":"(", "x":13.25, "y":0},
109 {"label":")", "x":14.25, "y":0},
110 {"label":"_", "x":15.25, "y":0},
111 {"label":"+", "x":16.25, "y":0},
112 {"label":"|", "x":17.25, "y":0},
113 {"label":"~", "x":18.25, "y":0},
114 {"label":"Del", "x":19.75, "y":0},
115
116 {"label":"PgUp", "x":0.25, "y":1},
117 {"label":"Tab", "x":1.75, "y":1, "w":1.5},
118 {"label":"Q", "x":3.25, "y":1},
119 {"label":"W", "x":4.25, "y":1},
120 {"label":"E", "x":5.25, "y":1},
121 {"label":"R", "x":6.25, "y":1},
122 {"label":"T", "x":7.25, "y":1},
123 {"label":"Y", "x":10.75, "y":1},
124 {"label":"U", "x":11.75, "y":1},
125 {"label":"I", "x":12.75, "y":1},
126 {"label":"O", "x":13.75, "y":1},
127 {"label":"P", "x":14.75, "y":1},
128 {"label":"{", "x":15.75, "y":1},
129 {"label":"}", "x":16.75, "y":1},
130 {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
131
132 {"label":"PgDn", "x":0, "y":2},
133 {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
134 {"label":"A", "x":3.5, "y":2},
135 {"label":"S", "x":4.5, "y":2},
136 {"label":"D", "x":5.5, "y":2},
137 {"label":"F", "x":6.5, "y":2},
138 {"label":"G", "x":7.5, "y":2},
139 {"label":"H", "x":11, "y":2},
140 {"label":"J", "x":12, "y":2},
141 {"label":"K", "x":13, "y":2},
142 {"label":"L", "x":14, "y":2},
143 {"label":":", "x":15, "y":2},
144 {"label":"\"", "x":16, "y":2},
145 {"label":"Enter", "x":17, "y":2, "w":2.25},
146
147 {"label":"Shift", "x":1.75, "y":3, "w":2.25},
148 {"label":"Z", "x":4, "y":3},
149 {"label":"X", "x":5, "y":3},
150 {"label":"C", "x":6, "y":3},
151 {"label":"V", "x":7, "y":3},
152 {"label":"B", "x":8, "y":3},
153 {"label":"B", "x":10.5, "y":3},
154 {"label":"N", "x":11.5, "y":3},
155 {"label":"M", "x":12.5, "y":3},
156 {"label":"<", "x":13.5, "y":3},
157 {"label":">", "x":14.5, "y":3},
158 {"label":"?", "x":15.5, "y":3},
159 {"label":"Shift", "x":16.5, "y":3, "w":1.75},
160 {"label":"Up", "x":18.25, "y":3},
161
162 {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
163 {"label":"Alt", "x":3, "y":4},
164 {"x":5.25, "y":4, "w":2.25},
165 {"label":"Fn", "x":8.25, "y":4},
166 {"x":11, "y":4, "w":2.75},
167 {"label":"Alt", "x":13.75, "y":4, "w":1.25},
168 {"label":"Left", "x":17.25, "y":4},
169 {"label":"Down", "x":18.25, "y":4},
170 {"label":"Right", "x":19.25, "y":4}]
171 }
172 "LAYOUT_wk_bs": {
173 "layout": [
174 {"label":"Esc", "x":0.5, "y":0},
175 {"label":"~", "x":1.75, "y":0},
176 {"label":"!", "x":2.75, "y":0},
177 {"label":"@", "x":3.75, "y":0},
178 {"label":"#", "x":4.75, "y":0},
179 {"label":"$", "x":5.75, "y":0},
180 {"label":"%", "x":6.75, "y":0},
181 {"label":"^", "x":7.75, "y":0},
182 {"label":"&", "x":11.25, "y":0},
183 {"label":"*", "x":12.25, "y":0},
184 {"label":"(", "x":13.25, "y":0},
185 {"label":")", "x":14.25, "y":0},
186 {"label":"_", "x":15.25, "y":0},
187 {"label":"+", "x":16.25, "y":0},
188 {"label":"Back Space", "x":17.25, "y":0},
189 {"label":"Del", "x":19.75, "y":0},
190
191 {"label":"PgUp", "x":0.25, "y":1},
192 {"label":"Tab", "x":1.75, "y":1, "w":1.5},
193 {"label":"Q", "x":3.25, "y":1},
194 {"label":"W", "x":4.25, "y":1},
195 {"label":"E", "x":5.25, "y":1},
196 {"label":"R", "x":6.25, "y":1},
197 {"label":"T", "x":7.25, "y":1},
198 {"label":"Y", "x":10.75, "y":1},
199 {"label":"U", "x":11.75, "y":1},
200 {"label":"I", "x":12.75, "y":1},
201 {"label":"O", "x":13.75, "y":1},
202 {"label":"P", "x":14.75, "y":1},
203 {"label":"{", "x":15.75, "y":1},
204 {"label":"}", "x":16.75, "y":1},
205 {"label":"|", "x":17.75, "y":1, "w":1.5},
206
207 {"label":"PgDn", "x":0, "y":2},
208 {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
209 {"label":"A", "x":3.5, "y":2},
210 {"label":"S", "x":4.5, "y":2},
211 {"label":"D", "x":5.5, "y":2},
212 {"label":"F", "x":6.5, "y":2},
213 {"label":"G", "x":7.5, "y":2},
214 {"label":"H", "x":11, "y":2},
215 {"label":"J", "x":12, "y":2},
216 {"label":"K", "x":13, "y":2},
217 {"label":"L", "x":14, "y":2},
218 {"label":":", "x":15, "y":2},
219 {"label":"\"", "x":16, "y":2},
220 {"label":"Enter", "x":17, "y":2, "w":2.25},
221
222 {"label":"Shift", "x":1.75, "y":3, "w":2.25},
223 {"label":"Z", "x":4, "y":3},
224 {"label":"X", "x":5, "y":3},
225 {"label":"C", "x":6, "y":3},
226 {"label":"V", "x":7, "y":3},
227 {"label":"B", "x":8, "y":3},
228 {"label":"B", "x":10.5, "y":3},
229 {"label":"N", "x":11.5, "y":3},
230 {"label":"M", "x":12.5, "y":3},
231 {"label":"<", "x":13.5, "y":3},
232 {"label":">", "x":14.5, "y":3},
233 {"label":"?", "x":15.5, "y":3},
234 {"label":"Shift", "x":16.5, "y":3, "w":1.75},
235 {"label":"Up", "x":18.25, "y":3},
236
237 {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
238 {"label":"Super", "x":3, "y":4},
239 {"label":"Alt", "x":4, "y":4, "w":1.25},
240 {"x":5.25, "y":4, "w":2.25},
241 {"label":"Fn", "x":8.25, "y":4},
242 {"x":11, "y":4, "w":2.75},
243 {"label":"Alt", "x":13.75, "y":4, "w":1.25},
244 {"label":"Ctrl", "x":15, "y":4},
245 {"label":"Left", "x":17.25, "y":4},
246 {"label":"Down", "x":18.25, "y":4},
247 {"label":"Right", "x":19.25, "y":4}]
248 },
249 "LAYOUT_wkl_bs": {
250 "layout": [
251 {"label":"Esc", "x":0.5, "y":0},
252 {"label":"~", "x":1.75, "y":0},
253 {"label":"!", "x":2.75, "y":0},
254 {"label":"@", "x":3.75, "y":0},
255 {"label":"#", "x":4.75, "y":0},
256 {"label":"$", "x":5.75, "y":0},
257 {"label":"%", "x":6.75, "y":0},
258 {"label":"^", "x":7.75, "y":0},
259 {"label":"&", "x":11.25, "y":0},
260 {"label":"*", "x":12.25, "y":0},
261 {"label":"(", "x":13.25, "y":0},
262 {"label":")", "x":14.25, "y":0},
263 {"label":"_", "x":15.25, "y":0},
264 {"label":"+", "x":16.25, "y":0},
265 {"label":"Back Space", "x":17.25, "y":0},
266 {"label":"Del", "x":19.75, "y":0},
267
268 {"label":"PgUp", "x":0.25, "y":1},
269 {"label":"Tab", "x":1.75, "y":1, "w":1.5},
270 {"label":"Q", "x":3.25, "y":1},
271 {"label":"W", "x":4.25, "y":1},
272 {"label":"E", "x":5.25, "y":1},
273 {"label":"R", "x":6.25, "y":1},
274 {"label":"T", "x":7.25, "y":1},
275 {"label":"Y", "x":10.75, "y":1},
276 {"label":"U", "x":11.75, "y":1},
277 {"label":"I", "x":12.75, "y":1},
278 {"label":"O", "x":13.75, "y":1},
279 {"label":"P", "x":14.75, "y":1},
280 {"label":"{", "x":15.75, "y":1},
281 {"label":"}", "x":16.75, "y":1},
282 {"label":"|", "x":17.75, "y":1, "w":1.5},
283
284 {"label":"PgDn", "x":0, "y":2},
285 {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
286 {"label":"A", "x":3.5, "y":2},
287 {"label":"S", "x":4.5, "y":2},
288 {"label":"D", "x":5.5, "y":2},
289 {"label":"F", "x":6.5, "y":2},
290 {"label":"G", "x":7.5, "y":2},
291 {"label":"H", "x":11, "y":2},
292 {"label":"J", "x":12, "y":2},
293 {"label":"K", "x":13, "y":2},
294 {"label":"L", "x":14, "y":2},
295 {"label":":", "x":15, "y":2},
296 {"label":"\"", "x":16, "y":2},
297 {"label":"Enter", "x":17, "y":2, "w":2.25},
298
299 {"label":"Shift", "x":1.75, "y":3, "w":2.25},
300 {"label":"Z", "x":4, "y":3},
301 {"label":"X", "x":5, "y":3},
302 {"label":"C", "x":6, "y":3},
303 {"label":"V", "x":7, "y":3},
304 {"label":"B", "x":8, "y":3},
305 {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
306 {"label":"M", "x":12.5, "y":3},
307 {"label":"<", "x":13.5, "y":3},
308 {"label":">", "x":14.5, "y":3},
309 {"label":"?", "x":15.5, "y":3},
310 {"label":"Shift", "x":16.5, "y":3, "w":1.75},
311 {"label":"Up", "x":18.25, "y":3},
312
313 {"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
314 {"label":"Alt", "x":4.75, "y":4, "w":1.25},
315 {"x":6, "y":4, "w":2.25},
316 {"label":"Win", "x":8.25, "y":4},
317 {"x":10.5, "y":4, "w":2.75},
318 {"label":"Alt", "x":13.25, "y":4, "w":1.5},
319 {"label":"Left", "x":17.25, "y":4},
320 {"label":"Down", "x":18.25, "y":4},
321 {"label":"Right", "x":19.25, "y":4}]
322 }
323 }
324}
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
new file mode 100644
index 0000000000..31cc430504
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev2/rev2.h
@@ -0,0 +1,76 @@
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 */
16
17#pragma once
18
19#include "bear_65.h"
20
21#define LAYOUT_wk_full( \
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, K41, K43, K45, K46, K48, K49, 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, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
33}
34
35#define LAYOUT_wkl_full( \
36 K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, 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, K49, K4B, K4C, K4D \
41) { \
42 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
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, K49, KC_NO, K4B, K4C, K4D, K4E }, \
47}
48
49#define LAYOUT_wk_bs( \
50 K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
51 K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
52 K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
53 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
54 K40, K41, K43, K45, K46, K48, K49, K4A, K4B, K4C, K4D \
55) { \
56 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
57 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
58 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
59 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
60 { K40, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
61}
62
63#define LAYOUT_wkl_bs( \
64 K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
65 K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
66 K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
67 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
68 K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
69) { \
70 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
71 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
72 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
73 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
74 { K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
75}
76
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
new file mode 100644
index 0000000000..5d90baa2af
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev2/rules.mk
@@ -0,0 +1,17 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = no # Enable N-Key Rollover
10BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13
14LTO_ENABLE = yes # Use LTO flags to reduce firmware size
15
16RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
17RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/jacky_studio/bear_65/rules.mk b/keyboards/jacky_studio/bear_65/rules.mk
index 684173395e..67e93335d8 100644
--- a/keyboards/jacky_studio/bear_65/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rules.mk
@@ -1,23 +1 @@
1# MCU name DEFAULT_FOLDER = jacky_studio/bear65/rev1
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = atmel-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15NKRO_ENABLE = no # Enable N-Key Rollover
16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
17RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
18AUDIO_ENABLE = no # Audio output
19
20LTO_ENABLE = yes # Use LTO flags to reduce firmware size
21
22RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
23RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support