aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-06-20 00:13:34 -0700
committerGitHub <noreply@github.com>2021-06-20 00:13:34 -0700
commit0624698d331edc7f0201b2edc199616b852e456a (patch)
treec73514029edee93031e98ae2377da6da38cc1cfe
parent88e53ad9ca3ca59a6a767cc5fd49811c7dc5aa85 (diff)
downloadqmk_firmware-0624698d331edc7f0201b2edc199616b852e456a.tar.gz
qmk_firmware-0624698d331edc7f0201b2edc199616b852e456a.zip
MisonoWorks Karina Layout Macro Rework (#13259)
-rw-r--r--keyboards/misonoworks/karina/info.json56
-rw-r--r--keyboards/misonoworks/karina/karina.h17
-rw-r--r--keyboards/misonoworks/karina/keymaps/default/keymap.c32
-rw-r--r--keyboards/misonoworks/karina/keymaps/voltex/keymap.c32
-rw-r--r--keyboards/misonoworks/karina/readme.md8
5 files changed, 104 insertions, 41 deletions
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 3d724ea4a..cc8a81e6a 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -1,12 +1,56 @@
1{ 1{
2 "keyboard_name": "Karina", 2 "keyboard_name": "Karina",
3 "url": "https://github.com/autumnisacutie/karina", 3 "url": "https://github.com/autumnisacutie/karina",
4 "maintainer": "MisonoWorks", 4 "maintainer": "MisonoWorks",
5 "width": 11, 5 "width": 11,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "layout": [{"x":0, "y":0}, {"x":10, "y":0}, {"label":"Q", "x":0.5, "y":1}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"Tab", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":"Enter", "x":10, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":"Shift", "x":9.5, "y":3, "w":1.5}, {"label":"Alt", "x":0, "y":4, "w":1.75}, {"x":1.75, "y":4, "w":1.25}, {"x":3, "y":4, "w":2.75}, {"x":5.75, "y":4, "w":2.25}, {"x":8, "y":4, "w":1.25}, {"label":"Control", "x":9.25, "y":4, "w":1.75}] 9 "layout": [
10 {"label":"Encoder 1", "x":0, "y":0},
11 {"label":"Encoder 2", "x":10, "y":0},
12
13 {"label":"Q", "x":0.5, "y":1},
14 {"label":"W", "x":1.5, "y":1},
15 {"label":"E", "x":2.5, "y":1},
16 {"label":"R", "x":3.5, "y":1},
17 {"label":"T", "x":4.5, "y":1},
18 {"label":"Y", "x":5.5, "y":1},
19 {"label":"U", "x":6.5, "y":1},
20 {"label":"I", "x":7.5, "y":1},
21 {"label":"O", "x":8.5, "y":1},
22 {"label":"P", "x":9.5, "y":1},
23
24 {"label":"Tab", "x":0, "y":2},
25 {"label":"A", "x":1, "y":2},
26 {"label":"S", "x":2, "y":2},
27 {"label":"D", "x":3, "y":2},
28 {"label":"F", "x":4, "y":2},
29 {"label":"G", "x":5, "y":2},
30 {"label":"H", "x":6, "y":2},
31 {"label":"J", "x":7, "y":2},
32 {"label":"K", "x":8, "y":2},
33 {"label":"L", "x":9, "y":2},
34 {"label":"Enter", "x":10, "y":2},
35
36 {"label":"Shift", "x":0, "y":3, "w":1.5},
37 {"label":"Z", "x":1.5, "y":3},
38 {"label":"X", "x":2.5, "y":3},
39 {"label":"C", "x":3.5, "y":3},
40 {"label":"V", "x":4.5, "y":3},
41 {"label":"B", "x":5.5, "y":3},
42 {"label":"N", "x":6.5, "y":3},
43 {"label":"M", "x":7.5, "y":3},
44 {"label":"<", "x":8.5, "y":3},
45 {"label":">", "x":9.5, "y":3, "w":1.5},
46
47 {"label":"Alt", "x":0, "y":4, "w":1.75},
48 {"label":"MO(1)", "x":1.75, "y":4, "w":1.25},
49 {"label":"Space", "x":3, "y":4, "w":2.75},
50 {"label":"Backspace", "x":5.75, "y":4, "w":2.25},
51 {"label":"MO(2)", "x":8, "y":4, "w":1.25},
52 {"label":"Control", "x":9.25, "y":4, "w":1.75}
53 ]
10 } 54 }
11 } 55 }
12} 56}
diff --git a/keyboards/misonoworks/karina/karina.h b/keyboards/misonoworks/karina/karina.h
index 3192b8e40..2baeb5db5 100644
--- a/keyboards/misonoworks/karina/karina.h
+++ b/keyboards/misonoworks/karina/karina.h
@@ -20,13 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "quantum.h" 20#include "quantum.h"
21 21
22#define LAYOUT( \ 22#define LAYOUT( \
23 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ 23 K000, K210, \
24 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ 24 K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
25 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ 25 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
26 K300, K301, K303, K306, K308, K309 \ 26 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \
27 K300, K301, K303, K306, K308, K309 \
27) { \ 28) { \
28 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ 29 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
29 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ 30 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
30 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ 31 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
31 { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \ 32 { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \
32} 33}
diff --git a/keyboards/misonoworks/karina/keymaps/default/keymap.c b/keyboards/misonoworks/karina/keymaps/default/keymap.c
index 74c0324fe..a9af182f8 100644
--- a/keyboards/misonoworks/karina/keymaps/default/keymap.c
+++ b/keyboards/misonoworks/karina/keymaps/default/keymap.c
@@ -26,22 +26,28 @@ enum layers {
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 27
28 [DEFAULT] = LAYOUT( 28 [DEFAULT] = LAYOUT(
29 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 29 KC_ESC, KC_MUTE,
30 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, 30 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
31 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MUTE, 31 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
32 KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL), 32 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
33 KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL
34 ),
33 35
34 [SUPER] = LAYOUT( 36 [SUPER] = LAYOUT(
35 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 37 KC_TRNS, KC_TRNS,
36 KC_MINUS, KC_EQUAL, KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, 38 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
37 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, KC_TRNS, 39 KC_MINS, KC_EQL, KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS), 40 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS
42 ),
39 43
40 [META] = LAYOUT( 44 [META] = LAYOUT(
41 KC_NUMLOCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 45 KC_NLCK, KC_TRNS,
42 KC_F11, KC_F12, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, 46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
43 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_PLUS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_F11, KC_F12, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,
44 RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD) 48 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS,
49 RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD
50 )
45 51
46}; 52};
47 53
diff --git a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
index 80fc13a57..f06522f92 100644
--- a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
+++ b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
@@ -26,22 +26,28 @@ enum layers {
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 27
28 [DEFAULT] = LAYOUT( 28 [DEFAULT] = LAYOUT(
29 KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 29 KC_TRNS, KC_TRNS,
30 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, 30 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
31 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_TRNS, 31 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
32 KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL), 32 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
33 KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL
34 ),
33 35
34 [SUPER] = LAYOUT( 36 [SUPER] = LAYOUT(
35 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 37 KC_ESC, KC_TRNS,
36 KC_MINUS, KC_EQUAL, KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, 38 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
37 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, KC_TRNS, 39 KC_MINS, KC_EQL, KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS), 40 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS
42 ),
39 43
40 [META] = LAYOUT( 44 [META] = LAYOUT(
41 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 45 KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, 46 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
43 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_PLUS, KC_KP_2, KC_KP_0, KC_KP_1, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,
44 RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD) 48 KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS,
49 RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD
50 )
45 51
46}; 52};
47 53
diff --git a/keyboards/misonoworks/karina/readme.md b/keyboards/misonoworks/karina/readme.md
index a6dcd8444..debd418b3 100644
--- a/keyboards/misonoworks/karina/readme.md
+++ b/keyboards/misonoworks/karina/readme.md
@@ -4,7 +4,7 @@
4 4
535% keyboard with two rotary encoders and an LED bar. 535% keyboard with two rotary encoders and an LED bar.
6 6
7* Keyboard Maintainer: [MisonoWorks](https://github.com/autumnisacutie/) 7* Keyboard Maintainer: [MisonoWorks](https://github.com/misonoworks/)
8* Hardware Supported: Karina V1 PCB 8* Hardware Supported: Karina V1 PCB
9* Hardware Availability: [P3D Store](https://p3dstore.com/) 9* Hardware Availability: [P3D Store](https://p3dstore.com/)
10 10
@@ -12,4 +12,10 @@ Make example for this keyboard (after setting up your build environment):
12 12
13 make misonoworks/karina:default 13 make misonoworks/karina:default
14 14
15Flashing example for this keyboard:
16
17 make misonoworks/karina:default:flash
18
19To reset the board into bootloader mode, hold Space+B while connecting the USB cable.
20
15See 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). 21See 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).