diff options
author | joric <joric@users.noreply.github.com> | 2021-12-16 13:28:29 +0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-16 19:28:29 +1100 |
commit | 42555157b8275c42857acfc076d5aa7f375f3b79 (patch) | |
tree | 9be63b5e4e7aac36a6f8531937320f7d491ce510 | |
parent | 231cd7a39fe91f31fadee94cf30c80d2587ca9fc (diff) | |
download | qmk_firmware-42555157b8275c42857acfc076d5aa7f375f3b79.tar.gz qmk_firmware-42555157b8275c42857acfc076d5aa7f375f3b79.zip |
[Keyboard] Add Jorne (#15461)
* added jorne-dev (kyria-based)
* updated files
* raw logo
* removed font
* Fix after rebase on master: #undef SH_TG
* Fix LTO parameter name.
* Fix OLED.
* Add VIA Jorne layout.
* readme.md
* updated jorne readme
* Add info.json
* Update keyboards/jorne/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/jorne/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/jorne/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/jorne/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/jorne/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* PR changes (added GPL headers, moved oled_task_user)
* info.jsoon: fix thumbs poositions, reorder keys.
* fix info.json maintainer
* fixed layouts
* Sync config.h for VIA with default keymap.
* added post_config (sets brightness to 120 or it hangs)
* added SPLIT_LAYER_STATE_ENABLE/SPLIT_LED_STATE_ENABLE
* Update keyboards/jorne/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/jorne/rev1/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/jorne/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/jorne/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/jorne/jorne.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/jorne/jorne.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* fixed layout, removed unnecessary defines
* vendor_id set to 0x4753
Co-authored-by: beta-tank <beta-tank@outlook.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
-rw-r--r-- | keyboards/jorne/config.h | 6 | ||||
-rw-r--r-- | keyboards/jorne/info.json | 240 | ||||
-rw-r--r-- | keyboards/jorne/jorne.c | 70 | ||||
-rw-r--r-- | keyboards/jorne/jorne.h | 31 | ||||
-rw-r--r-- | keyboards/jorne/keymaps/default/config.h | 25 | ||||
-rw-r--r-- | keyboards/jorne/keymaps/default/keymap.c | 84 | ||||
-rw-r--r-- | keyboards/jorne/keymaps/via/config.h | 24 | ||||
-rw-r--r-- | keyboards/jorne/keymaps/via/keymap.c | 84 | ||||
-rw-r--r-- | keyboards/jorne/keymaps/via/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/jorne/post_config.h | 29 | ||||
-rw-r--r-- | keyboards/jorne/readme.md | 25 | ||||
-rw-r--r-- | keyboards/jorne/rev1/config.h | 46 | ||||
-rw-r--r-- | keyboards/jorne/rev1/rev1.c | 3 | ||||
-rw-r--r-- | keyboards/jorne/rev1/rev1.h | 31 | ||||
-rw-r--r-- | keyboards/jorne/rev1/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/jorne/rules.mk | 21 |
16 files changed, 722 insertions, 0 deletions
diff --git a/keyboards/jorne/config.h b/keyboards/jorne/config.h new file mode 100644 index 000000000..771719443 --- /dev/null +++ b/keyboards/jorne/config.h | |||
@@ -0,0 +1,6 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #include "config_common.h" | ||
6 | |||
diff --git a/keyboards/jorne/info.json b/keyboards/jorne/info.json new file mode 100644 index 000000000..a28af0a32 --- /dev/null +++ b/keyboards/jorne/info.json | |||
@@ -0,0 +1,240 @@ | |||
1 | { | ||
2 | "keyboard_name": "Jorne", | ||
3 | "url": "https://github.com/joric/jorne/wiki", | ||
4 | "maintainer": "joric", | ||
5 | "layouts": { | ||
6 | "LAYOUT": { | ||
7 | "layout": [ | ||
8 | { | ||
9 | "label": "GUI", | ||
10 | "x": 0, | ||
11 | "y": 2.13 | ||
12 | }, | ||
13 | { | ||
14 | "label": "~", | ||
15 | "x": 1, | ||
16 | "y": 1.38 | ||
17 | }, | ||
18 | { | ||
19 | "label": "Q", | ||
20 | "x": 2, | ||
21 | "y": 1.38 | ||
22 | }, | ||
23 | { | ||
24 | "label": "W", | ||
25 | "x": 3, | ||
26 | "y": 1.13 | ||
27 | }, | ||
28 | { | ||
29 | "label": "E", | ||
30 | "x": 4, | ||
31 | "y": 1 | ||
32 | }, | ||
33 | { | ||
34 | "label": "R", | ||
35 | "x": 5, | ||
36 | "y": 1.13 | ||
37 | }, | ||
38 | { | ||
39 | "label": "T", | ||
40 | "x": 6, | ||
41 | "y": 1.25 | ||
42 | }, | ||
43 | |||
44 | { | ||
45 | "label": "Y", | ||
46 | "x": 10.5, | ||
47 | "y": 1.25 | ||
48 | }, | ||
49 | { | ||
50 | "label": "U", | ||
51 | "x": 11.5, | ||
52 | "y": 1.125 | ||
53 | }, | ||
54 | { | ||
55 | "label": "I", | ||
56 | "x": 12.5, | ||
57 | "y": 1 | ||
58 | }, | ||
59 | { | ||
60 | "label": "O", | ||
61 | "x": 13.5, | ||
62 | "y": 1.125 | ||
63 | }, | ||
64 | { | ||
65 | "label": "P", | ||
66 | "x": 14.5, | ||
67 | "y": 1.375 | ||
68 | }, | ||
69 | { | ||
70 | "label": "{[", | ||
71 | "x": 15.5, | ||
72 | "y": 1.375 | ||
73 | }, | ||
74 | { | ||
75 | "label": "}]", | ||
76 | "x": 16.5, | ||
77 | "y": 2.13 | ||
78 | }, | ||
79 | |||
80 | { | ||
81 | "label": "Ctrl", | ||
82 | "x": 1, | ||
83 | "y": 2.38 | ||
84 | }, | ||
85 | { | ||
86 | "label": "A", | ||
87 | "x": 2, | ||
88 | "y": 2.38 | ||
89 | }, | ||
90 | { | ||
91 | "label": "S", | ||
92 | "x": 3, | ||
93 | "y": 2.13 | ||
94 | }, | ||
95 | { | ||
96 | "label": "D", | ||
97 | "x": 4, | ||
98 | "y": 2 | ||
99 | }, | ||
100 | { | ||
101 | "label": "F", | ||
102 | "x": 5, | ||
103 | "y": 2.13 | ||
104 | }, | ||
105 | { | ||
106 | "label": "G", | ||
107 | "x": 6, | ||
108 | "y": 2.25 | ||
109 | }, | ||
110 | |||
111 | { | ||
112 | "label": "H", | ||
113 | "x": 10.5, | ||
114 | "y": 2.25 | ||
115 | }, | ||
116 | { | ||
117 | "label": "J", | ||
118 | "x": 11.5, | ||
119 | "y": 2.13 | ||
120 | }, | ||
121 | { | ||
122 | "label": "K", | ||
123 | "x": 12.5, | ||
124 | "y": 2 | ||
125 | }, | ||
126 | { | ||
127 | "label": "L", | ||
128 | "x": 13.5, | ||
129 | "y": 2.125 | ||
130 | }, | ||
131 | { | ||
132 | "label": ":;", | ||
133 | "x": 14.5, | ||
134 | "y": 2.375 | ||
135 | }, | ||
136 | { | ||
137 | "label": "\"'", | ||
138 | "x": 15.5, | ||
139 | "y": 2.375 | ||
140 | }, | ||
141 | |||
142 | { | ||
143 | "label": "Alt", | ||
144 | "x": 1, | ||
145 | "y": 3.38 | ||
146 | }, | ||
147 | { | ||
148 | "label": "Z", | ||
149 | "x": 2, | ||
150 | "y": 3.38 | ||
151 | }, | ||
152 | { | ||
153 | "label": "X", | ||
154 | "x": 3, | ||
155 | "y": 3.13 | ||
156 | }, | ||
157 | { | ||
158 | "label": "C", | ||
159 | "x": 4, | ||
160 | "y": 3 | ||
161 | }, | ||
162 | { | ||
163 | "label": "V", | ||
164 | "x": 5, | ||
165 | "y": 3.13 | ||
166 | }, | ||
167 | { | ||
168 | "label": "B", | ||
169 | "x": 6, | ||
170 | "y": 3.25 | ||
171 | }, | ||
172 | |||
173 | { | ||
174 | "label": "N", | ||
175 | "x": 10.5, | ||
176 | "y": 3.25 | ||
177 | }, | ||
178 | { | ||
179 | "label": "M", | ||
180 | "x": 11.5, | ||
181 | "y": 3.13 | ||
182 | }, | ||
183 | { | ||
184 | "label": "<,", | ||
185 | "x": 12.5, | ||
186 | "y": 3 | ||
187 | }, | ||
188 | { | ||
189 | "label": ">.", | ||
190 | "x": 13.5, | ||
191 | "y": 3.13 | ||
192 | }, | ||
193 | { | ||
194 | "label": "?/", | ||
195 | "x": 14.5, | ||
196 | "y": 3.38 | ||
197 | }, | ||
198 | { | ||
199 | "label": "|\\", | ||
200 | "x": 15.5, | ||
201 | "y": 3.38 | ||
202 | }, | ||
203 | |||
204 | { | ||
205 | "label": "Rise", | ||
206 | "x": 5, | ||
207 | "y": 5 | ||
208 | }, | ||
209 | { | ||
210 | "label": "Space", | ||
211 | "x": 6, | ||
212 | "y": 5 | ||
213 | }, | ||
214 | { | ||
215 | "label": "Lower", | ||
216 | "x": 7, | ||
217 | "y": 4.5, | ||
218 | "h": 1.5 | ||
219 | }, | ||
220 | |||
221 | { | ||
222 | "label": "Lower", | ||
223 | "x": 9.5, | ||
224 | "y": 4.5, | ||
225 | "h": 1.5 | ||
226 | }, | ||
227 | { | ||
228 | "label": "Bcs", | ||
229 | "x": 10.5, | ||
230 | "y": 5 | ||
231 | }, | ||
232 | { | ||
233 | "label": "Rise", | ||
234 | "x": 11.5, | ||
235 | "y": 5 | ||
236 | } | ||
237 | ] | ||
238 | } | ||
239 | } | ||
240 | } \ No newline at end of file | ||
diff --git a/keyboards/jorne/jorne.c b/keyboards/jorne/jorne.c new file mode 100644 index 000000000..fec24d476 --- /dev/null +++ b/keyboards/jorne/jorne.c | |||
@@ -0,0 +1,70 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #include "jorne.h" | ||
4 | |||
5 | #ifdef OLED_ENABLE | ||
6 | static void render_logo(void) { | ||
7 | static const char PROGMEM raw_logo[] = { | ||
8 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 192, 224, 240, 240, 240, 240, 240, 240, 240, 224, | ||
9 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 112, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
10 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
11 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 192, 224, 240, 0, 0, 240, 252, 254, 255, 255, 255, 1, 240, 252, 255, | ||
12 | 255, 255, 255, 255, 255, 255, 255, 127, 31, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 254, 254, 0, 0, 240, | ||
13 | 248, 252, 30, 14, 14, 14, 14, 14, 14, 30, 252, 248, 240, 0, 0, 254, 254, 252, 28, 14, 14, 14, 14, 0, 0, 254, 254, 252, 28, 14, 14, | ||
14 | 14, 14, 30, 252, 248, 240, 0, 0, 240, 248, 252, 222, 206, 206, 206, 206, 206, 206, 222, 252, 248, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
15 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 255, 255, 255, 254, 240, 255, 255, 255, 255, 255, 255, 248, 255, 255, 255, 255, | ||
16 | 255, 255, 255, 255, 255, 193, 128, 128, 128, 192, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 255, 255, 0, 0, | ||
17 | 15, 31, 63, 120, 112, 112, 112, 112, 112, 112, 120, 63, 31, 15, 0, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 0, 0, | ||
18 | 0, 0, 0, 127, 127, 127, 0, 0, 15, 31, 63, 121, 113, 113, 113, 113, 113, 113, 121, 61, 29, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
19 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 1, 1, 3, 3, 7, 7, 7, 3, 3, 1, 3, 7, 7, 7, 7, 7, 7, 7, 3, 1, 0, 0, 0, 0, | ||
20 | 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
21 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
22 | 0, 0 | ||
23 | }; | ||
24 | oled_write_raw_P(raw_logo, sizeof(raw_logo)); | ||
25 | } | ||
26 | |||
27 | enum layers { | ||
28 | _QWERTY = 0, | ||
29 | _LOWER, | ||
30 | _RAISE, | ||
31 | _ADJUST, | ||
32 | }; | ||
33 | |||
34 | static void render_status(void) { | ||
35 | // Host Keyboard Layer Status | ||
36 | oled_write_P(PSTR("Layer: "), false); | ||
37 | switch (get_highest_layer(layer_state)) { | ||
38 | case _QWERTY: | ||
39 | oled_write_P(PSTR("Default\n"), false); | ||
40 | break; | ||
41 | case _LOWER: | ||
42 | oled_write_P(PSTR("Lower\n"), false); | ||
43 | break; | ||
44 | case _RAISE: | ||
45 | oled_write_P(PSTR("Raise\n"), false); | ||
46 | break; | ||
47 | case _ADJUST: | ||
48 | oled_write_P(PSTR("Adjust\n"), false); | ||
49 | break; | ||
50 | default: | ||
51 | oled_write_P(PSTR("Undefined\n"), false); | ||
52 | } | ||
53 | |||
54 | // Host Keyboard LED Status | ||
55 | led_t led_state = host_keyboard_led_state(); | ||
56 | oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false); | ||
57 | oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); | ||
58 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | ||
59 | } | ||
60 | |||
61 | bool oled_task_kb(void) { | ||
62 | if (!oled_task_user()) { return false; } | ||
63 | if (is_keyboard_left()) { | ||
64 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | ||
65 | } else { | ||
66 | render_logo(); | ||
67 | } | ||
68 | return true; | ||
69 | } | ||
70 | #endif | ||
diff --git a/keyboards/jorne/jorne.h b/keyboards/jorne/jorne.h new file mode 100644 index 000000000..0158032e5 --- /dev/null +++ b/keyboards/jorne/jorne.h | |||
@@ -0,0 +1,31 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #include "quantum.h" | ||
6 | |||
7 | /* This a shortcut to help you visually see your layout. | ||
8 | * | ||
9 | * The first section contains all of the arguments representing the physical | ||
10 | * layout of the board and position of the keys. | ||
11 | * | ||
12 | * The second converts the arguments into a two-dimensional array which | ||
13 | * represents the switch matrix. | ||
14 | */ | ||
15 | |||
16 | #define LAYOUT( \ | ||
17 | L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \ | ||
18 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
19 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
20 | L30, L31, L32, R30, R31, R32 \ | ||
21 | ) \ | ||
22 | { \ | ||
23 | { L00, L01, L02, L03, L04, L05 }, \ | ||
24 | { L10, L11, L12, L13, L14, L15 }, \ | ||
25 | { L20, L21, L22, L23, L24, L25 }, \ | ||
26 | { L33, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
27 | { R05, R04, R03, R02, R01, R00 }, \ | ||
28 | { R15, R14, R13, R12, R11, R10 }, \ | ||
29 | { R25, R24, R23, R22, R21, R20 }, \ | ||
30 | { R33, KC_NO, KC_NO, R32, R31, R30 } \ | ||
31 | } | ||
diff --git a/keyboards/jorne/keymaps/default/config.h b/keyboards/jorne/keymaps/default/config.h new file mode 100644 index 000000000..2fb5ca4c4 --- /dev/null +++ b/keyboards/jorne/keymaps/default/config.h | |||
@@ -0,0 +1,25 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #define OLED_DISPLAY_128X32 | ||
6 | |||
7 | #ifdef RGBLIGHT_ENABLE | ||
8 | #define RGBLIGHT_EFFECT_BREATHING | ||
9 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
10 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
11 | #define RGBLIGHT_EFFECT_SNAKE | ||
12 | #define RGBLIGHT_EFFECT_KNIGHT | ||
13 | #define RGBLIGHT_EFFECT_CHRISTMAS | ||
14 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
15 | #define RGBLIGHT_EFFECT_RGB_TEST | ||
16 | #define RGBLIGHT_EFFECT_ALTERNATING | ||
17 | #define RGBLIGHT_EFFECT_TWINKLE | ||
18 | #define RGBLIGHT_HUE_STEP 8 | ||
19 | #define RGBLIGHT_SAT_STEP 8 | ||
20 | #define RGBLIGHT_VAL_STEP 8 | ||
21 | #endif | ||
22 | |||
23 | // If you are using an Elite C rev3 on the slave side, uncomment the lines below: | ||
24 | // #define SPLIT_USB_DETECT | ||
25 | // #define NO_USB_STARTUP_CHECK | ||
diff --git a/keyboards/jorne/keymaps/default/keymap.c b/keyboards/jorne/keymaps/default/keymap.c new file mode 100644 index 000000000..cd7eab170 --- /dev/null +++ b/keyboards/jorne/keymaps/default/keymap.c | |||
@@ -0,0 +1,84 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #include QMK_KEYBOARD_H | ||
4 | |||
5 | enum layers { | ||
6 | _QWERTY = 0, | ||
7 | _LOWER, | ||
8 | _RAISE, | ||
9 | _ADJUST, | ||
10 | }; | ||
11 | |||
12 | |||
13 | enum custom_keycodes { | ||
14 | RGBRST = SAFE_RANGE | ||
15 | }; | ||
16 | |||
17 | #define RBR_RGU MT(MOD_RGUI, KC_RBRC) | ||
18 | #define F12_RGU MT(MOD_RGUI, KC_F12) | ||
19 | #define PLS_LCT MT(MOD_LCTL, KC_PPLS) | ||
20 | #define EQL_LCT MT(MOD_LCTL, KC_PEQL) | ||
21 | #define APP_LCT MT(MOD_LCTL, KC_APP) | ||
22 | #define EQL_RCT MT(MOD_RCTL, KC_PEQL) | ||
23 | #define QUO_RCT MT(MOD_RCTL, KC_QUOT) | ||
24 | #define APP_RCT MT(MOD_RCTL, KC_APP) | ||
25 | #define MIN_RCT MT(MOD_RCTL, KC_MINS) | ||
26 | #define EQL_LAL MT(MOD_LALT, KC_EQL) | ||
27 | #define BSL_RAL MT(MOD_RALT, KC_BSLS) | ||
28 | #define BSP_LSH MT(MOD_LSFT, KC_BSPC) | ||
29 | #define SPC_RSH MT(MOD_RSFT, KC_SPC) | ||
30 | #define DEL_RSE LT(_RAISE, KC_DEL) | ||
31 | #define TAB_RSE LT(_RAISE, KC_TAB) | ||
32 | #define ENT_LWR LT(_LOWER, KC_ENT) | ||
33 | #define ESC_LWR LT(_LOWER, KC_ESC) | ||
34 | |||
35 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
36 | |||
37 | [_QWERTY] = LAYOUT( | ||
38 | KC_LGUI, KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, RGUI_T(KC_RBRC), | ||
39 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), | ||
40 | KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, BSL_RAL, | ||
41 | TAB_RSE, SPC_RSH, ENT_LWR, ESC_LWR, BSP_LSH, DEL_RSE | ||
42 | ), | ||
43 | |||
44 | [_LOWER] = LAYOUT( | ||
45 | _______, KC_UNDS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, F12_RGU, | ||
46 | PLS_LCT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, MIN_RCT, | ||
47 | EQL_LAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, | ||
48 | _______, _______, _______, _______, _______, _______ | ||
49 | ), | ||
50 | |||
51 | [_RAISE] = LAYOUT( | ||
52 | _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______, | ||
53 | EQL_LCT, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_INS, APP_RCT, | ||
54 | _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, | ||
55 | _______, _______, _______, _______, _______, _______ | ||
56 | ), | ||
57 | |||
58 | [_ADJUST] = LAYOUT( | ||
59 | RESET, RGBRST, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, _______, _______, KC_ASDN, KC_ASTG, KC_ASUP, RGBRST, RESET, | ||
60 | RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG, | ||
61 | RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD, | ||
62 | _______, SH_TG, _______, _______, SH_TG, _______ | ||
63 | ), | ||
64 | |||
65 | }; | ||
66 | |||
67 | layer_state_t layer_state_set_user(layer_state_t state) { | ||
68 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | ||
69 | } | ||
70 | |||
71 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
72 | switch (keycode) { | ||
73 | case RGBRST: | ||
74 | #ifdef RGBLIGHT_ENABLE | ||
75 | if (record->event.pressed) { | ||
76 | eeconfig_update_rgblight_default(); | ||
77 | rgblight_enable(); | ||
78 | } | ||
79 | #endif | ||
80 | break; | ||
81 | } | ||
82 | return true; | ||
83 | } | ||
84 | |||
diff --git a/keyboards/jorne/keymaps/via/config.h b/keyboards/jorne/keymaps/via/config.h new file mode 100644 index 000000000..0b25d4a0b --- /dev/null +++ b/keyboards/jorne/keymaps/via/config.h | |||
@@ -0,0 +1,24 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #define OLED_DISPLAY_128X32 | ||
6 | |||
7 | #ifdef RGBLIGHT_ENABLE | ||
8 | #define RGBLIGHT_EFFECT_BREATHING | ||
9 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
10 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
11 | #define RGBLIGHT_EFFECT_SNAKE | ||
12 | #define RGBLIGHT_EFFECT_KNIGHT | ||
13 | #define RGBLIGHT_EFFECT_CHRISTMAS | ||
14 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
15 | #define RGBLIGHT_EFFECT_RGB_TEST | ||
16 | #define RGBLIGHT_EFFECT_ALTERNATING | ||
17 | #define RGBLIGHT_HUE_STEP 8 | ||
18 | #define RGBLIGHT_SAT_STEP 8 | ||
19 | #define RGBLIGHT_VAL_STEP 8 | ||
20 | #endif | ||
21 | |||
22 | // If you are using an Elite C rev3 on the slave side, uncomment the lines below: | ||
23 | // #define SPLIT_USB_DETECT | ||
24 | // #define NO_USB_STARTUP_CHECK | ||
diff --git a/keyboards/jorne/keymaps/via/keymap.c b/keyboards/jorne/keymaps/via/keymap.c new file mode 100644 index 000000000..cd7eab170 --- /dev/null +++ b/keyboards/jorne/keymaps/via/keymap.c | |||
@@ -0,0 +1,84 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #include QMK_KEYBOARD_H | ||
4 | |||
5 | enum layers { | ||
6 | _QWERTY = 0, | ||
7 | _LOWER, | ||
8 | _RAISE, | ||
9 | _ADJUST, | ||
10 | }; | ||
11 | |||
12 | |||
13 | enum custom_keycodes { | ||
14 | RGBRST = SAFE_RANGE | ||
15 | }; | ||
16 | |||
17 | #define RBR_RGU MT(MOD_RGUI, KC_RBRC) | ||
18 | #define F12_RGU MT(MOD_RGUI, KC_F12) | ||
19 | #define PLS_LCT MT(MOD_LCTL, KC_PPLS) | ||
20 | #define EQL_LCT MT(MOD_LCTL, KC_PEQL) | ||
21 | #define APP_LCT MT(MOD_LCTL, KC_APP) | ||
22 | #define EQL_RCT MT(MOD_RCTL, KC_PEQL) | ||
23 | #define QUO_RCT MT(MOD_RCTL, KC_QUOT) | ||
24 | #define APP_RCT MT(MOD_RCTL, KC_APP) | ||
25 | #define MIN_RCT MT(MOD_RCTL, KC_MINS) | ||
26 | #define EQL_LAL MT(MOD_LALT, KC_EQL) | ||
27 | #define BSL_RAL MT(MOD_RALT, KC_BSLS) | ||
28 | #define BSP_LSH MT(MOD_LSFT, KC_BSPC) | ||
29 | #define SPC_RSH MT(MOD_RSFT, KC_SPC) | ||
30 | #define DEL_RSE LT(_RAISE, KC_DEL) | ||
31 | #define TAB_RSE LT(_RAISE, KC_TAB) | ||
32 | #define ENT_LWR LT(_LOWER, KC_ENT) | ||
33 | #define ESC_LWR LT(_LOWER, KC_ESC) | ||
34 | |||
35 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
36 | |||
37 | [_QWERTY] = LAYOUT( | ||
38 | KC_LGUI, KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, RGUI_T(KC_RBRC), | ||
39 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), | ||
40 | KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, BSL_RAL, | ||
41 | TAB_RSE, SPC_RSH, ENT_LWR, ESC_LWR, BSP_LSH, DEL_RSE | ||
42 | ), | ||
43 | |||
44 | [_LOWER] = LAYOUT( | ||
45 | _______, KC_UNDS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, F12_RGU, | ||
46 | PLS_LCT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, MIN_RCT, | ||
47 | EQL_LAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, | ||
48 | _______, _______, _______, _______, _______, _______ | ||
49 | ), | ||
50 | |||
51 | [_RAISE] = LAYOUT( | ||
52 | _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______, | ||
53 | EQL_LCT, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_INS, APP_RCT, | ||
54 | _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, | ||
55 | _______, _______, _______, _______, _______, _______ | ||
56 | ), | ||
57 | |||
58 | [_ADJUST] = LAYOUT( | ||
59 | RESET, RGBRST, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, _______, _______, KC_ASDN, KC_ASTG, KC_ASUP, RGBRST, RESET, | ||
60 | RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG, | ||
61 | RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD, | ||
62 | _______, SH_TG, _______, _______, SH_TG, _______ | ||
63 | ), | ||
64 | |||
65 | }; | ||
66 | |||
67 | layer_state_t layer_state_set_user(layer_state_t state) { | ||
68 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | ||
69 | } | ||
70 | |||
71 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
72 | switch (keycode) { | ||
73 | case RGBRST: | ||
74 | #ifdef RGBLIGHT_ENABLE | ||
75 | if (record->event.pressed) { | ||
76 | eeconfig_update_rgblight_default(); | ||
77 | rgblight_enable(); | ||
78 | } | ||
79 | #endif | ||
80 | break; | ||
81 | } | ||
82 | return true; | ||
83 | } | ||
84 | |||
diff --git a/keyboards/jorne/keymaps/via/rules.mk b/keyboards/jorne/keymaps/via/rules.mk new file mode 100644 index 000000000..824642767 --- /dev/null +++ b/keyboards/jorne/keymaps/via/rules.mk | |||
@@ -0,0 +1 @@ | |||
VIA_ENABLE = yes \ No newline at end of file | |||
diff --git a/keyboards/jorne/post_config.h b/keyboards/jorne/post_config.h new file mode 100644 index 000000000..8da923087 --- /dev/null +++ b/keyboards/jorne/post_config.h | |||
@@ -0,0 +1,29 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #ifndef BOOTMAGIC_LITE_ROW | ||
6 | # define BOOTMAGIC_LITE_ROW 0 | ||
7 | #endif | ||
8 | #ifndef BOOTMAGIC_LITE_COLUMN | ||
9 | # define BOOTMAGIC_LITE_COLUMN 1 | ||
10 | #endif | ||
11 | |||
12 | #ifndef BOOTMAGIC_LITE_ROW_RIGHT | ||
13 | # define BOOTMAGIC_LITE_ROW_RIGHT 4 | ||
14 | #endif | ||
15 | #ifndef BOOTMAGIC_LITE_COLUMN_RIGHT | ||
16 | # define BOOTMAGIC_LITE_COLUMN_RIGHT 1 | ||
17 | #endif | ||
18 | |||
19 | #ifdef RGBLIGHT_ENABLE | ||
20 | # ifndef RGBLIGHT_LIMIT_VAL | ||
21 | # define RGBLIGHT_LIMIT_VAL 120 | ||
22 | # endif | ||
23 | #endif | ||
24 | |||
25 | #ifdef RGB_MATRIX_ENABLE | ||
26 | # ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||
27 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | ||
28 | # endif | ||
29 | #endif | ||
diff --git a/keyboards/jorne/readme.md b/keyboards/jorne/readme.md new file mode 100644 index 000000000..71c698e67 --- /dev/null +++ b/keyboards/jorne/readme.md | |||
@@ -0,0 +1,25 @@ | |||
1 | # Jorne | ||
2 | |||
3 | <img src="https://i.imgur.com/ywDcw2w.jpg" data-canonical-src="Jorne" width="600"/> | ||
4 | |||
5 | Jorne is essentially [Corne](https://github.com/foostan/crkbd) but with an extra keys for brackets and international layouts (44 keys instead of 42). | ||
6 | |||
7 | * Keyboard Maintainer: [joric](https://github.com/joric) | ||
8 | * Hardware Supported: Jorne 2.1, 3.0 | ||
9 | * Layout: [keyboard-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/df19fba80500d1179dfda8c41b9f221a) | ||
10 | * Hardware Availability: [wiki](https://github.com/joric/jorne/wiki) | ||
11 | |||
12 | ## Bootloader | ||
13 | |||
14 | Enter the bootloader in 2 ways: | ||
15 | |||
16 | * **Physical reset button**: Briefly press the reset button on the PCB | ||
17 | * **Keycode in layout**: Press the key mapped to `RESET` | ||
18 | |||
19 | ## Make | ||
20 | |||
21 | Make example for this keyboard (after setting up your build environment): | ||
22 | |||
23 | make jorne/rev1:default | ||
24 | |||
25 | 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). | ||
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h new file mode 100644 index 000000000..7144d9fe0 --- /dev/null +++ b/keyboards/jorne/rev1/config.h | |||
@@ -0,0 +1,46 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | |||
6 | /* USB Device descriptor parameter */ | ||
7 | #define VENDOR_ID 0x4753 | ||
8 | #define PRODUCT_ID 0x0001 | ||
9 | #define DEVICE_VER 0x0001 | ||
10 | #define MANUFACTURER joric | ||
11 | #define PRODUCT Jorne Keyboard | ||
12 | |||
13 | /* key matrix size */ | ||
14 | /* Rows are doubled up */ | ||
15 | #define MATRIX_ROWS 8 | ||
16 | #define MATRIX_COLS 6 | ||
17 | |||
18 | #define MATRIX_ROW_PINS { D4, C6, D7, E6 } | ||
19 | #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } | ||
20 | #define UNUSED_PINS | ||
21 | |||
22 | /* COL2ROW, ROW2COL*/ | ||
23 | #define DIODE_DIRECTION COL2ROW | ||
24 | |||
25 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ | ||
26 | //#define MATRIX_HAS_GHOST | ||
27 | |||
28 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
29 | #define DEBOUNCE 5 | ||
30 | |||
31 | /* | ||
32 | * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. | ||
33 | */ | ||
34 | #define SOFT_SERIAL_PIN D2 | ||
35 | |||
36 | #define RGB_DI_PIN D3 | ||
37 | #define RGBLED_SPLIT { 28, 28 } | ||
38 | #define RGBLED_NUM 56 | ||
39 | |||
40 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||
41 | #define LOCKING_SUPPORT_ENABLE | ||
42 | /* Locking resynchronize hack */ | ||
43 | #define LOCKING_RESYNC_ENABLE | ||
44 | |||
45 | #define SPLIT_LAYER_STATE_ENABLE | ||
46 | #define SPLIT_LED_STATE_ENABLE | ||
diff --git a/keyboards/jorne/rev1/rev1.c b/keyboards/jorne/rev1/rev1.c new file mode 100644 index 000000000..f120ef87f --- /dev/null +++ b/keyboards/jorne/rev1/rev1.c | |||
@@ -0,0 +1,3 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #include "rev1.h" | ||
diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h new file mode 100644 index 000000000..af4ef8e3b --- /dev/null +++ b/keyboards/jorne/rev1/rev1.h | |||
@@ -0,0 +1,31 @@ | |||
1 | // Copyright 2021 Joric (@joric) | ||
2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
3 | #pragma once | ||
4 | |||
5 | #include "jorne.h" | ||
6 | |||
7 | /* This a shortcut to help you visually see your layout. | ||
8 | * | ||
9 | * The first section contains all of the arguments representing the physical | ||
10 | * layout of the board and position of the keys. | ||
11 | * | ||
12 | * The second converts the arguments into a two-dimensional array which | ||
13 | * represents the switch matrix. | ||
14 | */ | ||
15 | |||
16 | #define LAYOUT( \ | ||
17 | L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \ | ||
18 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
19 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
20 | L30, L31, L32, R30, R31, R32 \ | ||
21 | ) \ | ||
22 | { \ | ||
23 | { L00, L01, L02, L03, L04, L05 }, \ | ||
24 | { L10, L11, L12, L13, L14, L15 }, \ | ||
25 | { L20, L21, L22, L23, L24, L25 }, \ | ||
26 | { L33, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
27 | { R05, R04, R03, R02, R01, R00 }, \ | ||
28 | { R15, R14, R13, R12, R11, R10 }, \ | ||
29 | { R25, R24, R23, R22, R21, R20 }, \ | ||
30 | { R33, KC_NO, KC_NO, R32, R31, R30 } \ | ||
31 | } | ||
diff --git a/keyboards/jorne/rev1/rules.mk b/keyboards/jorne/rev1/rules.mk new file mode 100644 index 000000000..52a6de4da --- /dev/null +++ b/keyboards/jorne/rev1/rules.mk | |||
@@ -0,0 +1,2 @@ | |||
1 | OLED_ENABLE = yes # Enable OLED | ||
2 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | ||
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk new file mode 100644 index 000000000..cb35ae6cf --- /dev/null +++ b/keyboards/jorne/rules.mk | |||
@@ -0,0 +1,21 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | BOOTLOADER = caterina | ||
6 | |||
7 | # Build Options | ||
8 | # change yes to no to disable | ||
9 | # | ||
10 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite | ||
11 | MOUSEKEY_ENABLE = yes # Mouse keys | ||
12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
13 | CONSOLE_ENABLE = no # Console for debug | ||
14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
15 | NKRO_ENABLE = no # Enable N-Key Rollover | ||
16 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
17 | AUDIO_ENABLE = no # Audio output | ||
18 | SPLIT_KEYBOARD = yes # Split common | ||
19 | LTO_ENABLE = yes | ||
20 | |||
21 | DEFAULT_FOLDER = jorne/rev1 | ||