diff options
-rw-r--r-- | keyboards/crkbd/keymaps/ninjonas/README.md | 6 | ||||
-rw-r--r-- | keyboards/crkbd/keymaps/ninjonas/config.h | 2 | ||||
-rw-r--r-- | keyboards/crkbd/keymaps/ninjonas/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/hotdox/keymaps/ninjonas/README.md | 2 | ||||
-rw-r--r-- | keyboards/hotdox/keymaps/ninjonas/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/kyria/keymaps/ninjonas/README.md | 113 | ||||
-rw-r--r-- | keyboards/kyria/keymaps/ninjonas/config.h | 2 | ||||
-rw-r--r-- | keyboards/kyria/keymaps/ninjonas/keymap.c | 19 | ||||
-rw-r--r-- | keyboards/kyria/keymaps/ninjonas/oled.c | 3 | ||||
-rw-r--r-- | keyboards/lily58/keymaps/ninjonas/README.md | 6 | ||||
-rw-r--r-- | keyboards/lily58/keymaps/ninjonas/keymap.c | 112 | ||||
-rw-r--r-- | keyboards/pinky/3/keymaps/ninjonas/README.md | 6 | ||||
-rw-r--r-- | keyboards/pinky/3/keymaps/ninjonas/config.h | 2 | ||||
-rw-r--r-- | users/ninjonas/README.md | 27 | ||||
-rw-r--r-- | users/ninjonas/config.h | 2 | ||||
-rw-r--r-- | users/ninjonas/ninjonas.h | 18 | ||||
-rw-r--r-- | users/ninjonas/oled.c | 5 | ||||
-rw-r--r-- | users/ninjonas/process_records.c | 6 | ||||
-rw-r--r-- | users/ninjonas/tap_dances.c | 86 | ||||
-rw-r--r-- | users/ninjonas/tap_dances.h | 23 |
20 files changed, 378 insertions, 80 deletions
diff --git a/keyboards/crkbd/keymaps/ninjonas/README.md b/keyboards/crkbd/keymaps/ninjonas/README.md index 4d7434fa7..08d694521 100644 --- a/keyboards/crkbd/keymaps/ninjonas/README.md +++ b/keyboards/crkbd/keymaps/ninjonas/README.md | |||
@@ -14,7 +14,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar | |||
14 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 14 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
15 | // LShift, Z, X, C, V, B, N, M, ,, ., /, = | 15 | // LShift, Z, X, C, V, B, N, M, ,, ., /, = |
16 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 16 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
17 | // , Ctrl, Space, Enter, BackSP, Del | 17 | // Cmd, Ctrl, Space, Enter, BackSP, Del |
18 | //`---------------------' `---------------------' | 18 | //`---------------------' `---------------------' |
19 | ``` | 19 | ``` |
20 | 20 | ||
@@ -27,7 +27,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar | |||
27 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 27 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
28 | // LShift, ;, Q, J, K, X, B, M, W, V, Z, = | 28 | // LShift, ;, Q, J, K, X, B, M, W, V, Z, = |
29 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 29 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
30 | // , Ctrl, Space, Enter, BackSP, Del | 30 | // Cmd, Ctrl, Space, Enter, BackSP, Del |
31 | //`---------------------' `---------------------' | 31 | //`---------------------' `---------------------' |
32 | ``` | 32 | ``` |
33 | 33 | ||
@@ -40,7 +40,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar | |||
40 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 40 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
41 | // LShift, Z, X, C, V, B, K, M, ,, ., /, = | 41 | // LShift, Z, X, C, V, B, K, M, ,, ., /, = |
42 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | 42 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| |
43 | // , Ctrl, Space, Enter, BackSP, Del | 43 | // Cmd, Ctrl, Space, Enter, BackSP, Del |
44 | //`---------------------' `---------------------' | 44 | //`---------------------' `---------------------' |
45 | ``` | 45 | ``` |
46 | 46 | ||
diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h index 8a4ddad74..33fe4a5c9 100644 --- a/keyboards/crkbd/keymaps/ninjonas/config.h +++ b/keyboards/crkbd/keymaps/ninjonas/config.h | |||
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
20 | 20 | ||
21 | #pragma once | 21 | #pragma once |
22 | 22 | ||
23 | #define TAPPING_TERM 200 | 23 | #define TAPPING_TERM 300 |
24 | 24 | ||
25 | #define MASTER_LEFT | 25 | #define MASTER_LEFT |
26 | 26 | ||
diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c index 57164441b..57cc23226 100644 --- a/keyboards/crkbd/keymaps/ninjonas/keymap.c +++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c | |||
@@ -73,6 +73,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
73 | _______,_______,_______, _______,_______,_______ | 73 | _______,_______,_______, _______,_______,_______ |
74 | //`---------------------' `---------------------' | 74 | //`---------------------' `---------------------' |
75 | ), | 75 | ), |
76 | |||
77 | [_NUMPAD] = LAYOUT_wrapper( \ | ||
78 | //,----------------------------------------------------. ,----------------------------------------------------. | ||
79 | _______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________, | ||
80 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | ||
81 | _______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________, | ||
82 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | ||
83 | _______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________, | ||
84 | //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| | ||
85 | _______,_______,_______, _______,_______,_______ | ||
86 | //`---------------------' `---------------------' | ||
87 | ), | ||
76 | /* | 88 | /* |
77 | [_TEMPLATE] = LAYOUT_wrapper( \ | 89 | [_TEMPLATE] = LAYOUT_wrapper( \ |
78 | //,----------------------------------------------------. ,----------------------------------------------------. | 90 | //,----------------------------------------------------. ,----------------------------------------------------. |
diff --git a/keyboards/hotdox/keymaps/ninjonas/README.md b/keyboards/hotdox/keymaps/ninjonas/README.md index d761bf9c9..be733fde2 100644 --- a/keyboards/hotdox/keymaps/ninjonas/README.md +++ b/keyboards/hotdox/keymaps/ninjonas/README.md | |||
@@ -43,7 +43,7 @@ This keymap is designed based off my typing habits and is subject to change. Inf | |||
43 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| | 43 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| |
44 | * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | | 44 | * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | |
45 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' | 45 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' |
46 | * | | | Alt | | Ctl | | BkSP | Del |LOWER | | | | 46 | * | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | | |
47 | * `----------------------------------' `----------------------------------' | 47 | * `----------------------------------' `----------------------------------' |
48 | * ,-------------. ,-------------. | 48 | * ,-------------. ,-------------. |
49 | * | Up | Down | | Left | Right| | 49 | * | Up | Down | | Left | Right| |
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c index 6637eb3b3..93c0b266b 100644 --- a/keyboards/hotdox/keymaps/ninjonas/keymap.c +++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c | |||
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
28 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| | 28 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| |
29 | * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | | 29 | * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | |
30 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' | 30 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' |
31 | * | | | Alt | | Ctl | | BkSP | Del |LOWER | | | | 31 | * | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | | |
32 | * `----------------------------------' `----------------------------------' | 32 | * `----------------------------------' `----------------------------------' |
33 | * ,-------------. ,-------------. | 33 | * ,-------------. ,-------------. |
34 | * | Up | Down | | Left | Right| | 34 | * | Up | Down | | Left | Right| |
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
75 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| | 75 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| |
76 | * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | = | | 76 | * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | = | |
77 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' | 77 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' |
78 | * | | | Alt | | Ctl | | BkSP | Del |LOWER | | | | 78 | * | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | | |
79 | * `----------------------------------' `----------------------------------' | 79 | * `----------------------------------' `----------------------------------' |
80 | * ,-------------. ,-------------. | 80 | * ,-------------. ,-------------. |
81 | * | Up | Down | | Left | Right| | 81 | * | Up | Down | | Left | Right| |
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
122 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| | 122 | * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| |
123 | * | LShift | Z | X | C | V | B | | | | K | M | , | . | / | = | | 123 | * | LShift | Z | X | C | V | B | | | | K | M | , | . | / | = | |
124 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' | 124 | * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' |
125 | * | | | Alt | | Ctl | | BkSP | Del |LOWER | | | | 125 | * | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | | |
126 | * `----------------------------------' `----------------------------------' | 126 | * `----------------------------------' `----------------------------------' |
127 | * ,-------------. ,-------------. | 127 | * ,-------------. ,-------------. |
128 | * | Up | Down | | Left | Right| | 128 | * | Up | Down | | Left | Right| |
diff --git a/keyboards/kyria/keymaps/ninjonas/README.md b/keyboards/kyria/keymaps/ninjonas/README.md new file mode 100644 index 000000000..5c8678659 --- /dev/null +++ b/keyboards/kyria/keymaps/ninjonas/README.md | |||
@@ -0,0 +1,113 @@ | |||
1 | # ninjonas Keymap for [Kyria](https://github.com/splitkb/kyria) | ||
2 | |||
3 | ## Keymap | ||
4 | This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas). | ||
5 | |||
6 | More information about the Kyria keyboard can be found [here](https://blog.splitkb.com/blog/introducing-the-kyria) | ||
7 | |||
8 | ### QWERTY | ||
9 | ```c | ||
10 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
11 | // Tab, Q, W, E, R, T, Y, U, I, O, P, \ | ||
12 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
13 | // ESC, A, S, D, F, G, H, J, K, L, ;, ' | ||
14 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
15 | // LShift, Z, X, C, V, B, ALT, NUMLK, N, M, ,, ., /, = | ||
16 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
17 | // ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE | ||
18 | // `----------------------------------------' `----------------------------------------' | ||
19 | ``` | ||
20 | |||
21 | ### DVORAK | ||
22 | ```c | ||
23 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
24 | // Tab, ', ,, ., P, Y, F, G, C, R, L, \ | ||
25 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
26 | // ESC, A, O, E, U, I, D, H, T, N, S, / | ||
27 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
28 | // LShift, ;, Q, J, K, X, ALT, NUMLK, B, M, W, V, Z, = | ||
29 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
30 | // ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE | ||
31 | // `----------------------------------------' `----------------------------------------' | ||
32 | ``` | ||
33 | |||
34 | ### COLEMAK | ||
35 | ```c | ||
36 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
37 | // Tab, Q, W, F, P, G, J, L, U, Y, ;, \ | ||
38 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
39 | // ESC, A, R, S, T, D, H, N, E, I, O, ' | ||
40 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
41 | // LShift, Z, X, C, V, B, ALT, NUMLK, K, M, ,, ., /, = | ||
42 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
43 | // ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE | ||
44 | // `----------------------------------------' `----------------------------------------' | ||
45 | ``` | ||
46 | |||
47 | ### LOWER | ||
48 | ```c | ||
49 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
50 | // , , KC_BRIU, Play, Mute, K_CSCN, PgUp, Home, Up, End, , K_MDSH | ||
51 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
52 | // , , KC_BRID, Next, VolUp, , PgDn, Left, Down, Right, K_LOCK, | ||
53 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
54 | // , , , Prev, VolDn, [, ], , , M_CODE, M_XXX1, M_PYNV, | ||
55 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
56 | // | ||
57 | // `----------------------------------------' `----------------------------------------' | ||
58 | ``` | ||
59 | |||
60 | ### RAISE | ||
61 | ```c | ||
62 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
63 | // `, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - | ||
64 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
65 | // ~, !, @, #, $, %, ^, &, *, (, ), _ | ||
66 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
67 | // F11, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F12 | ||
68 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
69 | // | ||
70 | // `----------------------------------------' `----------------------------------------' | ||
71 | ``` | ||
72 | |||
73 | ### ADJUST | ||
74 | ```c | ||
75 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
76 | // M_MAKE, EEP_RST, , , , , RGB_TOG, , , COLEMAK, DVORAK, QWERTY, | ||
77 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
78 | // M_VRSN, M_MALL, , RGB_SAI, RGB_HUI,RGB_VAI, | ||
79 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
80 | // M_FLSH, , , RGB_SAD, RGB_HUD,RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, , , , | ||
81 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
82 | // | ||
83 | // `----------------------------------------' `----------------------------------------' | ||
84 | |||
85 | ``` | ||
86 | |||
87 | ### NUMPAD | ||
88 | ```c | ||
89 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
90 | // , , , , , , , 7, 8, 9, +, /, | ||
91 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
92 | // , , , , , , , 4, 5, 6, -, *, | ||
93 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
94 | // , , , , , , , , , , 0, 1, 2, 3, ., :, | ||
95 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
96 | // | ||
97 | // `----------------------------------------' `----------------------------------------' | ||
98 | ``` | ||
99 | |||
100 | <!-- | ||
101 | ### TEMPLATE | ||
102 | ```c | ||
103 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
104 | // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
105 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
106 | // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
107 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
108 | // XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
109 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
110 | // XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX | ||
111 | // `----------------------------------------' `----------------------------------------' | ||
112 | ``` | ||
113 | --> \ No newline at end of file | ||
diff --git a/keyboards/kyria/keymaps/ninjonas/config.h b/keyboards/kyria/keymaps/ninjonas/config.h index 5673e6c3d..dd919e382 100644 --- a/keyboards/kyria/keymaps/ninjonas/config.h +++ b/keyboards/kyria/keymaps/ninjonas/config.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | #define TAPPING_TERM 200 | 19 | #define TAPPING_TERM 300 |
20 | 20 | ||
21 | #ifdef OLED_DRIVER_ENABLE | 21 | #ifdef OLED_DRIVER_ENABLE |
22 | #define OLED_DISPLAY_128X64 | 22 | #define OLED_DISPLAY_128X64 |
diff --git a/keyboards/kyria/keymaps/ninjonas/keymap.c b/keyboards/kyria/keymaps/ninjonas/keymap.c index e6cde72d5..df492a466 100644 --- a/keyboards/kyria/keymaps/ninjonas/keymap.c +++ b/keyboards/kyria/keymaps/ninjonas/keymap.c | |||
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
24 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | 24 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| |
25 | _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, | 25 | _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, |
26 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | 26 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| |
27 | _____________________QWERTY_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________QWERTY_R3______________________, | 27 | _____________________QWERTY_L3______________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________QWERTY_R3______________________, |
28 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | 28 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' |
29 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE | 29 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE |
30 | // `----------------------------------------' `----------------------------------------' | 30 | // `----------------------------------------' `----------------------------------------' |
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
36 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | 36 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| |
37 | _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, | 37 | _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, |
38 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | 38 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| |
39 | _____________________DVORAK_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________DVORAK_R3______________________, | 39 | _____________________DVORAK_L3______________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________DVORAK_R3______________________, |
40 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | 40 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' |
41 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE | 41 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE |
42 | // `----------------------------------------' `----------------------------------------' | 42 | // `----------------------------------------' `----------------------------------------' |
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
48 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | 48 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| |
49 | _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, | 49 | _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, |
50 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | 50 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| |
51 | _____________________COLEMAK_L3_____________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________COLEMAK_R3_____________________, | 51 | _____________________COLEMAK_L3_____________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________COLEMAK_R3_____________________, |
52 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | 52 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' |
53 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE | 53 | _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE |
54 | // `----------------------------------------' `----------------------------------------' | 54 | // `----------------------------------------' `----------------------------------------' |
@@ -89,6 +89,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
89 | _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ | 89 | _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ |
90 | // `----------------------------------------' `----------------------------------------' | 90 | // `----------------------------------------' `----------------------------------------' |
91 | ), | 91 | ), |
92 | |||
93 | [_NUMPAD] = LAYOUT_wrapper( | ||
94 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | ||
95 | _______, _______, _______, _______, _______,_______, _____________________NUMPAD_1_______________________, | ||
96 | // |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------| | ||
97 | _______, _______, _______, _______, _______,_______, _____________________NUMPAD_2_______________________, | ||
98 | // |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------| | ||
99 | _______, _______, _______, _______,_______,_______,_______,_______, _______,_______,_____________________NUMPAD_3_______________________, | ||
100 | // `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------' | ||
101 | _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ | ||
102 | // `----------------------------------------' `----------------------------------------' | ||
103 | ), | ||
104 | |||
92 | /* | 105 | /* |
93 | [_TEMPLATE] = LAYOUT_wrapper( | 106 | [_TEMPLATE] = LAYOUT_wrapper( |
94 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. | 107 | // ,------—————————-------------------------------------. ,--------—————————-----------------------------------. |
diff --git a/keyboards/kyria/keymaps/ninjonas/oled.c b/keyboards/kyria/keymaps/ninjonas/oled.c index ff21b4885..419c1b727 100644 --- a/keyboards/kyria/keymaps/ninjonas/oled.c +++ b/keyboards/kyria/keymaps/ninjonas/oled.c | |||
@@ -127,6 +127,7 @@ static void render_layer_state(void) { | |||
127 | bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST); | 127 | bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST); |
128 | bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST); | 128 | bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST); |
129 | bool adjust = layer_state_is(_ADJUST); | 129 | bool adjust = layer_state_is(_ADJUST); |
130 | bool numpad = layer_state_is(_NUMPAD); | ||
130 | 131 | ||
131 | if(lower){ | 132 | if(lower){ |
132 | oled_write_P(PSTR(" Lower "), true); | 133 | oled_write_P(PSTR(" Lower "), true); |
@@ -134,6 +135,8 @@ static void render_layer_state(void) { | |||
134 | oled_write_P(PSTR(" Raise "), true); | 135 | oled_write_P(PSTR(" Raise "), true); |
135 | } else if(adjust){ | 136 | } else if(adjust){ |
136 | oled_write_P(PSTR(" Adjust "), true); | 137 | oled_write_P(PSTR(" Adjust "), true); |
138 | } else if(numpad) { | ||
139 | oled_write_P(PSTR(" Numpad "), true); | ||
137 | } else { | 140 | } else { |
138 | oled_write_P(PSTR(" Default"), false); | 141 | oled_write_P(PSTR(" Default"), false); |
139 | } | 142 | } |
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md index 862252840..6ef9361f6 100644 --- a/keyboards/lily58/keymaps/ninjonas/README.md +++ b/keyboards/lily58/keymaps/ninjonas/README.md | |||
@@ -17,7 +17,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi | |||
17 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 17 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
18 | * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | | 18 | * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | |
19 | * `-----------------------------------------/ / \ \-----------------------------------------' | 19 | * `-----------------------------------------/ / \ \-----------------------------------------' |
20 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 20 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
21 | * | | | |/ / \ \ | | | | | 21 | * | | | |/ / \ \ | | | | |
22 | * `----------------------------' '------''--------------------' | 22 | * `----------------------------' '------''--------------------' |
23 | */ | 23 | */ |
@@ -35,7 +35,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi | |||
35 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 35 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
36 | * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | | 36 | * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | |
37 | * `-----------------------------------------/ / \ \-----------------------------------------' | 37 | * `-----------------------------------------/ / \ \-----------------------------------------' |
38 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 38 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
39 | * | | | |/ / \ \ | | | | | 39 | * | | | |/ / \ \ | | | | |
40 | * `----------------------------' '------''--------------------' | 40 | * `----------------------------' '------''--------------------' |
41 | */ | 41 | */ |
@@ -53,7 +53,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi | |||
53 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 53 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
54 | * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | | 54 | * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | |
55 | * `-----------------------------------------/ / \ \-----------------------------------------' | 55 | * `-----------------------------------------/ / \ \-----------------------------------------' |
56 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 56 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
57 | * | | | |/ / \ \ | | | | | 57 | * | | | |/ / \ \ | | | | |
58 | * `----------------------------' '------''--------------------' | 58 | * `----------------------------' '------''--------------------' |
59 | */ | 59 | */ |
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 0bd330a76..2976f9eaf 100644 --- a/keyboards/lily58/keymaps/ninjonas/keymap.c +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c | |||
@@ -28,16 +28,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
28 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 28 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
29 | * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | | 29 | * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | |
30 | * `-----------------------------------------/ / \ \-----------------------------------------' | 30 | * `-----------------------------------------/ / \ \-----------------------------------------' |
31 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 31 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
32 | * | | | |/ / \ \ | | | | | 32 | * | | | |/ / \ \ | | | | |
33 | * `----------------------------' '------''--------------------' | 33 | * `----------------------------' '------''--------------------' |
34 | */ | 34 | */ |
35 | [_QWERTY] = LAYOUT_wrapper( | 35 | [_QWERTY] = LAYOUT_wrapper( |
36 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ | 36 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, |
37 | _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, \ | 37 | _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, |
38 | _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, \ | 38 | _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, |
39 | _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, \ | 39 | _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, |
40 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ | 40 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ |
41 | ), | 41 | ), |
42 | 42 | ||
43 | /* DVORAK | 43 | /* DVORAK |
@@ -50,16 +50,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 50 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
51 | * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | | 51 | * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | |
52 | * `-----------------------------------------/ / \ \-----------------------------------------' | 52 | * `-----------------------------------------/ / \ \-----------------------------------------' |
53 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 53 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
54 | * | | | |/ / \ \ | | | | | 54 | * | | | |/ / \ \ | | | | |
55 | * `----------------------------' '------''--------------------' | 55 | * `----------------------------' '------''--------------------' |
56 | */ | 56 | */ |
57 | [_DVORAK] = LAYOUT_wrapper( | 57 | [_DVORAK] = LAYOUT_wrapper( |
58 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ | 58 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, |
59 | _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, \ | 59 | _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, |
60 | _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, \ | 60 | _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, |
61 | _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, \ | 61 | _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, |
62 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ | 62 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ |
63 | ), | 63 | ), |
64 | 64 | ||
65 | /* COLEMAK | 65 | /* COLEMAK |
@@ -72,16 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
72 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| | 72 | * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| |
73 | * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | | 73 | * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | |
74 | * `-----------------------------------------/ / \ \-----------------------------------------' | 74 | * `-----------------------------------------/ / \ \-----------------------------------------' |
75 | * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | | 75 | * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | |
76 | * | | | |/ / \ \ | | | | | 76 | * | | | |/ / \ \ | | | | |
77 | * `----------------------------' '------''--------------------' | 77 | * `----------------------------' '------''--------------------' |
78 | */ | 78 | */ |
79 | [_COLEMAK] = LAYOUT_wrapper( | 79 | [_COLEMAK] = LAYOUT_wrapper( |
80 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ | 80 | _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, |
81 | _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, \ | 81 | _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, |
82 | _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, \ | 82 | _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, |
83 | _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, \ | 83 | _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, |
84 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ | 84 | _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ |
85 | ), | 85 | ), |
86 | 86 | ||
87 | /* LOWER | 87 | /* LOWER |
@@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
99 | * `----------------------------' '------''--------------------' | 99 | * `----------------------------' '------''--------------------' |
100 | */ | 100 | */ |
101 | [_LOWER] = LAYOUT_wrapper( \ | 101 | [_LOWER] = LAYOUT_wrapper( \ |
102 | _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ | 102 | _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, |
103 | _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, \ | 103 | _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, |
104 | _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, \ | 104 | _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, |
105 | _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, \ | 105 | _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, |
106 | __________________________________, _______, _______, M_CODE, _______ \ | 106 | __________________________________, _______, _______, M_CODE, _______ |
107 | ), | 107 | ), |
108 | 108 | ||
109 | /* RAISE | 109 | /* RAISE |
@@ -121,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
121 | * `----------------------------' '------''--------------------' | 121 | * `----------------------------' '------''--------------------' |
122 | */ | 122 | */ |
123 | [_RAISE] = LAYOUT_wrapper( \ | 123 | [_RAISE] = LAYOUT_wrapper( \ |
124 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 124 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
125 | XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 125 | XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
126 | XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 126 | XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
127 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ | 127 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
128 | __________________________________, __________________________________ \ | 128 | __________________________________, __________________________________ |
129 | ), | 129 | ), |
130 | 130 | ||
131 | /* ADJUST | 131 | /* ADJUST |
@@ -143,10 +143,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
143 | * `----------------------------' '------''--------------------' | 143 | * `----------------------------' '------''--------------------' |
144 | */ | 144 | */ |
145 | [_ADJUST] = LAYOUT_wrapper( \ | 145 | [_ADJUST] = LAYOUT_wrapper( \ |
146 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 146 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
147 | _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, \ | 147 | _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, |
148 | _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, \ | 148 | _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, |
149 | _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,\ | 149 | _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________, |
150 | __________________________________, __________________________________ \ | 150 | __________________________________, __________________________________ |
151 | ), | 151 | ), |
152 | }; \ No newline at end of file | 152 | /* TEMPLATE |
153 | * ,-----------------------------------------. ,-----------------------------------------. | ||
154 | * | | | | | | | | | | | | | | | ||
155 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | ||
156 | * | | | | | | | | | | | | | | | ||
157 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | ||
158 | * | | | | | | |-------. ,-------| | | | | | | | ||
159 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| | ||
160 | * | | | | | | |-------| |-------| | | | | | | | ||
161 | * `-----------------------------------------/ / \ \-----------------------------------------' | ||
162 | * | | | | / / \ \ | | | | | ||
163 | * | | | |/ / \ \ | | | | | ||
164 | * `----------------------------' '------''--------------------' | ||
165 | */ | ||
166 | [_NUMPAD] = LAYOUT_wrapper( \ | ||
167 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
168 | _______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________, | ||
169 | _______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________, | ||
170 | _______, _______, _______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________, | ||
171 | __________________________________, __________________________________ | ||
172 | ), | ||
173 | }; | ||
174 | |||
175 | /* TEMPLATE | ||
176 | * ,-----------------------------------------. ,-----------------------------------------. | ||
177 | * | | | | | | | | | | | | | | | ||
178 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | ||
179 | * | | | | | | | | | | | | | | | ||
180 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | ||
181 | * | | | | | | |-------. ,-------| | | | | | | | ||
182 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| | ||
183 | * | | | | | | |-------| |-------| | | | | | | | ||
184 | * `-----------------------------------------/ / \ \-----------------------------------------' | ||
185 | * | | | | / / \ \ | | | | | ||
186 | * | | | |/ / \ \ | | | | | ||
187 | * `----------------------------' '------''--------------------' | ||
188 | * | ||
189 | [_TEMPLATE] = LAYOUT_wrapper( \ | ||
190 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
191 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
192 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
193 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||
194 | __________________________________, __________________________________ | ||
195 | ), | ||
196 | */ \ No newline at end of file | ||
diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md index d47fdd995..67314fa71 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/README.md +++ b/keyboards/pinky/3/keymaps/ninjonas/README.md | |||
@@ -15,7 +15,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co | |||
15 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | 15 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| |
16 | | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| N| M| ,| .| /| =| | 16 | | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| N| M| ,| .| /| =| |
17 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' | 17 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' |
18 | | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| | 18 | | ALT| Cmd| CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| |
19 | `---------------------------------------' `---------------------------------------' | 19 | `---------------------------------------' `---------------------------------------' |
20 | */ | 20 | */ |
21 | ``` | 21 | ``` |
@@ -30,7 +30,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co | |||
30 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | 30 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| |
31 | | Shift| ;| Q| J| K| X| Spc/RAI| | Ent/LOW| B| M| W| V| Z| =| | 31 | | Shift| ;| Q| J| K| X| Spc/RAI| | Ent/LOW| B| M| W| V| Z| =| |
32 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' | 32 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' |
33 | | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| | 33 | | ALT| Cmd| CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| |
34 | `---------------------------------------' `---------------------------------------' | 34 | `---------------------------------------' `---------------------------------------' |
35 | */ | 35 | */ |
36 | ``` | 36 | ``` |
@@ -45,7 +45,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co | |||
45 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | 45 | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| |
46 | | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| K| M| ,| .| /| =| | 46 | | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| K| M| ,| .| /| =| |
47 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' | 47 | `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' |
48 | | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| | 48 | | ALT| Cmd| CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| |
49 | `---------------------------------------' `---------------------------------------' | 49 | `---------------------------------------' `---------------------------------------' |
50 | */ | 50 | */ |
51 | ``` | 51 | ``` |
diff --git a/keyboards/pinky/3/keymaps/ninjonas/config.h b/keyboards/pinky/3/keymaps/ninjonas/config.h index 585bd8cb5..ff8cd8bb0 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/config.h +++ b/keyboards/pinky/3/keymaps/ninjonas/config.h | |||
@@ -27,5 +27,5 @@ | |||
27 | #define USE_SERIAL_PD2 | 27 | #define USE_SERIAL_PD2 |
28 | 28 | ||
29 | #define TAPPING_FORCE_HOLD | 29 | #define TAPPING_FORCE_HOLD |
30 | #define TAPPING_TERM 200 | 30 | #define TAPPING_TERM 300 |
31 | #define RETRO_TAPPPING \ No newline at end of file | 31 | #define RETRO_TAPPPING \ No newline at end of file |
diff --git a/users/ninjonas/README.md b/users/ninjonas/README.md index 39d92cff3..f537373bc 100644 --- a/users/ninjonas/README.md +++ b/users/ninjonas/README.md | |||
@@ -17,17 +17,17 @@ See: https://docs.qmk.fm/#/feature_userspace | |||
17 | - [Kyria](../../keyboards/kyria/keymaps/ninjonas) | 17 | - [Kyria](../../keyboards/kyria/keymaps/ninjonas) |
18 | 18 | ||
19 | ## Features | 19 | ## Features |
20 | ### [Keys](ninjonas.h#L37) | 20 | ### [Keys](ninjonas.h) |
21 | |Code | Description | | 21 | |Code | Description | |
22 | |---|---| | 22 | |---|---| |
23 | |K_LOCK | MacOS shortcut to execute lock command + CTRL + Q | | 23 | |K_LOCK | MacOS shortcut to execute lock command Cmd + CTRL + Q | |
24 | |K_CSCN | MacOS shortcut to copy a portion of the screen to the clipboard | | 24 | |K_CSCN | MacOS shortcut to copy a portion of the screen to the clipboard | |
25 | |K_MDSH | MacOS shortcut to get em-dash `–` | | 25 | |K_MDSH | MacOS shortcut to get em-dash `–` | |
26 | |K_RAPP | MacOS shortcut to switch apps to the right | | 26 | |K_RAPP | MacOS shortcut to switch apps to the right | |
27 | |K_LAPP | MacOS shortcut to switch apps to the left | | 27 | |K_LAPP | MacOS shortcut to switch apps to the left | |
28 | |K_CPRF | + Shift + M. Used for switching Google Chrome profiles | | 28 | |K_CPRF | Cmd + Shift + M. Used for switching Google Chrome profiles | |
29 | 29 | ||
30 | ### [Layers](ninjonas.h#L44) | 30 | ### [Layers](ninjonas.h) |
31 | |Code | Description | | 31 | |Code | Description | |
32 | |---|---| | 32 | |---|---| |
33 | |LT_LOW | Tap for ENTER, hold for RAISE | | 33 | |LT_LOW | Tap for ENTER, hold for RAISE | |
@@ -38,13 +38,13 @@ See: https://docs.qmk.fm/#/feature_userspace | |||
38 | |LG_LOW | Press to toggle LOWER layer | | 38 | |LG_LOW | Press to toggle LOWER layer | |
39 | |LG_RAI | Press to toggle RAISE layer | | 39 | |LG_RAI | Press to toggle RAISE layer | |
40 | 40 | ||
41 | ### [Mod-Taps](ninjonas.h#L50) | 41 | ### [Mod-Taps](ninjonas.h) |
42 | |Code | Description | | 42 | |Code | Description | |
43 | |---|---| | 43 | |---|---| |
44 | |MT_DEL | Tap for Delete, hold for + ALT + SHIFT | | 44 | |MT_DEL | Tap for Delete, hold for Cmd + ALT + SHIFT | |
45 | |MT_EQL | Tap for =, hold for ALT + SHIFT | | 45 | |MT_EQL | Tap for =, hold for ALT + SHIFT | |
46 | 46 | ||
47 | ### [Layout Blocks](ninjonas.h#L54) | 47 | ### [Layout Blocks](ninjonas.h) |
48 | Predefined keyboard layout templates to speed up configuring split keyboards | 48 | Predefined keyboard layout templates to speed up configuring split keyboards |
49 | 49 | ||
50 | |Code | Description | | 50 | |Code | Description | |
@@ -59,6 +59,7 @@ Predefined keyboard layout templates to speed up configuring split keyboards | |||
59 | |MOUSE | Mouse Cluster | | 59 | |MOUSE | Mouse Cluster | |
60 | |MEDIA | Media Cluster | | 60 | |MEDIA | Media Cluster | |
61 | |MOD | Modifier Cluster | | 61 | |MOD | Modifier Cluster | |
62 | |NUMPAD | Numpad Cluster | | ||
62 | 63 | ||
63 | ### [Macros](process_records.c) | 64 | ### [Macros](process_records.c) |
64 | |Code | Description | | 65 | |Code | Description | |
@@ -68,7 +69,7 @@ Predefined keyboard layout templates to speed up configuring split keyboards | |||
68 | |M_MALL | Macro to send QMK make command to all [ninjonas](#Supported%20Keyboards) keyboards | | 69 | |M_MALL | Macro to send QMK make command to all [ninjonas](#Supported%20Keyboards) keyboards | |
69 | |M_FLSH | Macro to send QMK make command to compile keyboard with the correct bootloader | | 70 | |M_FLSH | Macro to send QMK make command to compile keyboard with the correct bootloader | |
70 | |M_VRSN | Macro to send QMK version | | 71 | |M_VRSN | Macro to send QMK version | |
71 | |M_SHFT | Sends + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) | | 72 | |M_SHFT | Sends Cmd + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) | |
72 | |M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory | | 73 | |M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory | |
73 | |M_TERM | Launches Spotlight and calls Terminal | | 74 | |M_TERM | Launches Spotlight and calls Terminal | |
74 | |M_COPA | Single key copy/paste | | 75 | |M_COPA | Single key copy/paste | |
@@ -81,10 +82,12 @@ Predefined keyboard layout templates to speed up configuring split keyboards | |||
81 | |T_LBRC | Tap once for [, double for back browser | | 82 | |T_LBRC | Tap once for [, double for back browser | |
82 | |T_RBRC | Tap once for ], double for forward browser | | 83 | |T_RBRC | Tap once for ], double for forward browser | |
83 | |T_TAB | Tap once for TAB, double for CTRL + TAB | | 84 | |T_TAB | Tap once for TAB, double for CTRL + TAB | |
84 | |T_GRV | Tap once for GRV, double for + GRV | | 85 | |T_GRV | Tap once for GRV, double for Cmd + GRV | |
85 | |T_GUI | Tap once for , double to open spotlight | | 86 | |T_GUI | Tap once for Cmd, double to open spotlight | |
86 | |T_W | Tap for W, double tap for + W | | 87 | |T_W | Tap for W, double tap for Cmd + W | |
87 | |T_Q | Tap for Q, double tap for + Q | | 88 | |T_Q | Tap for Q, double tap for Cmd + Q | |
89 | |T_CPNU | Tap for Cmd + V, hold for Cmd + C, double tap for NUMPAD layer | | ||
90 | |T_Y | Tap for Y, double tap for NUMPAD layer | | ||
88 | 91 | ||
89 | ### Secrets | 92 | ### Secrets |
90 | There's times where you have macros you don't want to share like emails, an address you need but you always forget, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used. | 93 | There's times where you have macros you don't want to share like emails, an address you need but you always forget, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used. |
diff --git a/users/ninjonas/config.h b/users/ninjonas/config.h index 1166939c6..ae2370c5a 100644 --- a/users/ninjonas/config.h +++ b/users/ninjonas/config.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifdef TAPPING_TERM | 1 | #ifdef TAPPING_TERM |
2 | #undef TAPPING_TERM | 2 | #undef TAPPING_TERM |
3 | #define TAPPING_TERM 200 | 3 | #define TAPPING_TERM 300 |
4 | #endif | 4 | #endif |
5 | 5 | ||
6 | // Mouse Settings: Smoothing out mouse movement on keypress | 6 | // Mouse Settings: Smoothing out mouse movement on keypress |
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h index 6f79b262f..6772957e2 100644 --- a/users/ninjonas/ninjonas.h +++ b/users/ninjonas/ninjonas.h | |||
@@ -33,20 +33,22 @@ | |||
33 | #define _LOWER 3 | 33 | #define _LOWER 3 |
34 | #define _RAISE 4 | 34 | #define _RAISE 4 |
35 | #define _ADJUST 5 | 35 | #define _ADJUST 5 |
36 | #define _NUMPAD 6 | ||
36 | 37 | ||
37 | // Shortcut Keys | 38 | // Shortcut Keys |
38 | #define K_LOCK LGUI(LCTL(KC_Q)) // Locks screen on MacOS | 39 | #define K_LOCK LGUI(LCTL(KC_Q)) // Locks screen on MacOS |
39 | #define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard | 40 | #define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard |
40 | #define K_CPRF LGUI(LSFT(KC_M)) // + Shift + M. Used for switching Google Chrome profiles | 41 | #define K_CPRF LGUI(LSFT(KC_M)) // Cmd + Shift + M. Used for switching Google Chrome profiles |
41 | #define K_MDSH LSFT(LALT(KC_MINS)) | 42 | #define K_MDSH LSFT(LALT(KC_MINS)) |
42 | #define K_LAPP SGUI(KC_TAB) // + Shift + Tab | 43 | #define K_LAPP SGUI(KC_TAB) // Cmd + Shift + Tab |
43 | #define K_RAPP LGUI(KC_TAB) // + Tab | 44 | #define K_RAPP LGUI(KC_TAB) // Cmd + Tab |
44 | 45 | ||
45 | // Layer Keys | 46 | // Layer Keys |
46 | #define LM_LOW MO(_LOWER) | 47 | #define LM_LOW MO(_LOWER) |
47 | #define LM_RAI MO(_RAISE) | 48 | #define LM_RAI MO(_RAISE) |
48 | #define LG_LOW TG(_LOWER) | 49 | #define LG_LOW TG(_LOWER) |
49 | #define LG_RAI TG(_RAISE) | 50 | #define LG_RAI TG(_RAISE) |
51 | #define LG_NUM TG(_NUMPAD) | ||
50 | #define LT_LOW LT(_LOWER, KC_ENT) | 52 | #define LT_LOW LT(_LOWER, KC_ENT) |
51 | #define LT_RAI LT(_RAISE, KC_SPC) | 53 | #define LT_RAI LT(_RAISE, KC_SPC) |
52 | 54 | ||
@@ -59,7 +61,7 @@ | |||
59 | #define _____________________QWERTY_L2______________________ T_ESC, KC_A, KC_S, KC_D, KC_F, KC_G | 61 | #define _____________________QWERTY_L2______________________ T_ESC, KC_A, KC_S, KC_D, KC_F, KC_G |
60 | #define _____________________QWERTY_L3______________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B | 62 | #define _____________________QWERTY_L3______________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B |
61 | 63 | ||
62 | #define _____________________QWERTY_R1______________________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS | 64 | #define _____________________QWERTY_R1______________________ T_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS |
63 | #define _____________________QWERTY_R2______________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT | 65 | #define _____________________QWERTY_R2______________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT |
64 | #define _____________________QWERTY_R3______________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_EQL | 66 | #define _____________________QWERTY_R3______________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_EQL |
65 | 67 | ||
@@ -115,6 +117,10 @@ | |||
115 | #endif | 117 | #endif |
116 | #define _____________________ADJUST_R2______________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | 118 | #define _____________________ADJUST_R2______________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX |
117 | 119 | ||
120 | #define _____________________NUMPAD_1_______________________ T_Y, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_PAST | ||
121 | #define _____________________NUMPAD_2_______________________ XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PSLS | ||
122 | #define _____________________NUMPAD_3_______________________ KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_COLN | ||
123 | |||
118 | #define _______________NAV_1______________ KC_PGUP, KC_HOME, KC_UP, KC_END | 124 | #define _______________NAV_1______________ KC_PGUP, KC_HOME, KC_UP, KC_END |
119 | #define _______________NAV_2______________ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT | 125 | #define _______________NAV_2______________ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT |
120 | 126 | ||
@@ -124,7 +130,7 @@ | |||
124 | #define __________________________________ _______, _______, _______, _______ | 130 | #define __________________________________ _______, _______, _______, _______ |
125 | 131 | ||
126 | #define _____________MOD_LEFT_____________ KC_LALT, T_GUI, KC_LCTL, LT_RAI | 132 | #define _____________MOD_LEFT_____________ KC_LALT, T_GUI, KC_LCTL, LT_RAI |
127 | #define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, LM_LOW | 133 | #define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, T_CPNU |
128 | 134 | ||
129 | #define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE | 135 | #define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE |
130 | #define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP | 136 | #define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP |
@@ -135,7 +141,7 @@ | |||
135 | #define ________MOD_RIGHT________ LT_LOW, KC_BSPC, MT_DEL | 141 | #define ________MOD_RIGHT________ LT_LOW, KC_BSPC, MT_DEL |
136 | #else | 142 | #else |
137 | #define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL | 143 | #define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL |
138 | #define ________MOD_RIGHT________ KC_BSPC, MT_DEL, LM_LOW | 144 | #define ________MOD_RIGHT________ KC_BSPC, MT_DEL, T_CPNU |
139 | #endif | 145 | #endif |
140 | 146 | ||
141 | // Layout wrappers | 147 | // Layout wrappers |
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c index 285b0364e..ffb9eecbc 100644 --- a/users/ninjonas/oled.c +++ b/users/ninjonas/oled.c | |||
@@ -47,13 +47,16 @@ void render_layer_state(void) { | |||
47 | bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST); | 47 | bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST); |
48 | bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST); | 48 | bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST); |
49 | bool adjust = layer_state_is(_ADJUST); | 49 | bool adjust = layer_state_is(_ADJUST); |
50 | bool numpad = layer_state_is(_NUMPAD); | ||
50 | 51 | ||
51 | if(lower){ | 52 | if(lower){ |
52 | oled_write_P(PSTR(" Lower "), true); | 53 | oled_write_P(PSTR(" Lower "), true); |
53 | } else if(raise){ | 54 | } else if(raise){ |
54 | oled_write_P(PSTR(" Raise "), true); | 55 | oled_write_P(PSTR(" Raise "), true); |
55 | } else if(adjust){ | 56 | } else if(adjust){ |
56 | oled_write_P(PSTR(" Adjust "), true); | 57 | oled_write_P(PSTR(" Adjust "), true); |
58 | } else if(numpad) { | ||
59 | oled_write_P(PSTR(" Numpad "), true); | ||
57 | } else { | 60 | } else { |
58 | oled_write_P(PSTR(" Default"), false); | 61 | oled_write_P(PSTR(" Default"), false); |
59 | } | 62 | } |
diff --git a/users/ninjonas/process_records.c b/users/ninjonas/process_records.c index 5c6d98ec8..b4a5e35d1 100644 --- a/users/ninjonas/process_records.c +++ b/users/ninjonas/process_records.c | |||
@@ -23,7 +23,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
23 | } | 23 | } |
24 | break; | 24 | break; |
25 | 25 | ||
26 | // Sends + alt + shift to a keycode to activate shiftit. See: https://github.com/fikovnik/ShiftIt | 26 | // Sends Cmd + alt + shift to a keycode to activate shiftit. See: https://github.com/fikovnik/ShiftIt |
27 | case M_SHFT: | 27 | case M_SHFT: |
28 | if (record->event.pressed) { | 28 | if (record->event.pressed) { |
29 | register_code(KC_LGUI); | 29 | register_code(KC_LGUI); |
@@ -98,9 +98,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
98 | copy_paste_timer = timer_read(); | 98 | copy_paste_timer = timer_read(); |
99 | } else { | 99 | } else { |
100 | if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { | 100 | if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { |
101 | tap_code16(LGUI(KC_C)); // Hold + C | 101 | tap_code16(LGUI(KC_C)); // Hold Cmd + C |
102 | } else { | 102 | } else { |
103 | tap_code16(LGUI(KC_V)); // Tap + V | 103 | tap_code16(LGUI(KC_V)); // Tap Cmd + V |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
diff --git a/users/ninjonas/tap_dances.c b/users/ninjonas/tap_dances.c index 0665a1607..ece95887a 100644 --- a/users/ninjonas/tap_dances.c +++ b/users/ninjonas/tap_dances.c | |||
@@ -1,5 +1,87 @@ | |||
1 | #include "ninjonas.h" | 1 | #include "ninjonas.h" |
2 | 2 | ||
3 | //// BEGIN: Advanced Tap Dances | ||
4 | int cur_dance (qk_tap_dance_state_t *state) { | ||
5 | if (state->count == 1) { | ||
6 | if (!state->pressed) { | ||
7 | return SINGLE_TAP; | ||
8 | } else { | ||
9 | return SINGLE_HOLD; | ||
10 | } | ||
11 | } else if (state->count == 2) { | ||
12 | return DOUBLE_TAP; | ||
13 | } | ||
14 | else return 8; | ||
15 | } | ||
16 | |||
17 | // BEGIN: Copy, Paste, NUMPAD | ||
18 | // https://beta.docs.qmk.fm/features/feature_tap_dance#example-6-using-tap-dance-for-momentary-layer-switch-and-layer-toggle-keys | ||
19 | static tap copy_paste_numpad_tap_state = { | ||
20 | .is_press_action = true, | ||
21 | .state = 0 | ||
22 | }; | ||
23 | |||
24 | void copy_paste_numpad_finished (qk_tap_dance_state_t *state, void *user_data) { | ||
25 | copy_paste_numpad_tap_state.state = cur_dance(state); | ||
26 | switch (copy_paste_numpad_tap_state.state) { | ||
27 | case SINGLE_TAP: | ||
28 | tap_code16(LGUI(KC_V)); // Tap Cmd + V | ||
29 | break; | ||
30 | case SINGLE_HOLD: | ||
31 | tap_code16(LGUI(KC_C)); // Hold Cmd + C | ||
32 | break; | ||
33 | case DOUBLE_TAP: | ||
34 | if (layer_state_is(_NUMPAD)) { | ||
35 | layer_off(_NUMPAD); | ||
36 | } else { | ||
37 | layer_on(_NUMPAD); | ||
38 | } | ||
39 | break; | ||
40 | } | ||
41 | } | ||
42 | |||
43 | void copy_paste_numpad_reset (qk_tap_dance_state_t *state, void *user_data) { | ||
44 | copy_paste_numpad_tap_state.state = 0; | ||
45 | } | ||
46 | // END: Copy, Paste, NUMPAD | ||
47 | |||
48 | // BEGIN: Y, NUMPAD | ||
49 | static tap y_numpad_tap_state = { | ||
50 | .is_press_action = true, | ||
51 | .state = 0 | ||
52 | }; | ||
53 | |||
54 | void y_numpad_finished (qk_tap_dance_state_t *state, void *user_data) { | ||
55 | y_numpad_tap_state.state = cur_dance(state); | ||
56 | switch (y_numpad_tap_state.state) { | ||
57 | case SINGLE_TAP: | ||
58 | tap_code(KC_Y); | ||
59 | break; | ||
60 | case SINGLE_HOLD: | ||
61 | register_code16(KC_Y); | ||
62 | break; | ||
63 | case DOUBLE_TAP: | ||
64 | if (layer_state_is(_NUMPAD)) { | ||
65 | layer_off(_NUMPAD); | ||
66 | } else { | ||
67 | layer_on(_NUMPAD); | ||
68 | } | ||
69 | break; | ||
70 | } | ||
71 | } | ||
72 | |||
73 | void y_numpad_reset (qk_tap_dance_state_t *state, void *user_data) { | ||
74 | switch (y_numpad_tap_state.state) { | ||
75 | case SINGLE_HOLD: | ||
76 | unregister_code16(KC_Y); | ||
77 | break; | ||
78 | } | ||
79 | y_numpad_tap_state.state = 0; | ||
80 | } | ||
81 | // END: Y, NUMPAD | ||
82 | |||
83 | //// END: Advanced Tap Dances | ||
84 | |||
3 | qk_tap_dance_action_t tap_dance_actions[] = { | 85 | qk_tap_dance_action_t tap_dance_actions[] = { |
4 | [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), | 86 | [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), |
5 | [TD_LBRC_BACK] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, LGUI(KC_LBRC)), | 87 | [TD_LBRC_BACK] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, LGUI(KC_LBRC)), |
@@ -9,4 +91,8 @@ qk_tap_dance_action_t tap_dance_actions[] = { | |||
9 | [TD_GUI_GUISPC] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, LGUI(KC_SPC)), | 91 | [TD_GUI_GUISPC] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, LGUI(KC_SPC)), |
10 | [TD_W_CTRLW] = ACTION_TAP_DANCE_DOUBLE(KC_W, LGUI(KC_W)), | 92 | [TD_W_CTRLW] = ACTION_TAP_DANCE_DOUBLE(KC_W, LGUI(KC_W)), |
11 | [TD_Q_GUIQ] = ACTION_TAP_DANCE_DOUBLE(KC_Q, LGUI(KC_Q)), | 93 | [TD_Q_GUIQ] = ACTION_TAP_DANCE_DOUBLE(KC_Q, LGUI(KC_Q)), |
94 | |||
95 | // Advanced Tap Dances | ||
96 | [TD_COPY_PASTE_NUMPAD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, copy_paste_numpad_finished, copy_paste_numpad_reset), | ||
97 | [TD_Y_NUMPAD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, y_numpad_finished, y_numpad_reset), | ||
12 | }; \ No newline at end of file | 98 | }; \ No newline at end of file |
diff --git a/users/ninjonas/tap_dances.h b/users/ninjonas/tap_dances.h index 0a781ce4e..f2f39108d 100644 --- a/users/ninjonas/tap_dances.h +++ b/users/ninjonas/tap_dances.h | |||
@@ -1,6 +1,17 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | #include "ninjonas.h" | 2 | #include "ninjonas.h" |
3 | 3 | ||
4 | typedef struct { | ||
5 | bool is_press_action; | ||
6 | int state; | ||
7 | } tap; | ||
8 | |||
9 | enum tapdance_types{ | ||
10 | SINGLE_TAP = 1, | ||
11 | SINGLE_HOLD = 2, | ||
12 | DOUBLE_TAP = 3 | ||
13 | }; | ||
14 | |||
4 | enum custom_tapdances{ | 15 | enum custom_tapdances{ |
5 | TD_ESC_CAPS = 0, | 16 | TD_ESC_CAPS = 0, |
6 | TD_LBRC_BACK, | 17 | TD_LBRC_BACK, |
@@ -10,13 +21,17 @@ enum custom_tapdances{ | |||
10 | TD_GUI_GUISPC, | 21 | TD_GUI_GUISPC, |
11 | TD_W_CTRLW, | 22 | TD_W_CTRLW, |
12 | TD_Q_GUIQ, | 23 | TD_Q_GUIQ, |
24 | TD_COPY_PASTE_NUMPAD, | ||
25 | TD_Y_NUMPAD, | ||
13 | }; | 26 | }; |
14 | 27 | ||
15 | #define T_ESC TD(TD_ESC_CAPS) // Tap for ESC, double tap for CAPSLOCK | 28 | #define T_ESC TD(TD_ESC_CAPS) // Tap for ESC, double tap for CAPSLOCK |
16 | #define T_LBRC TD(TD_LBRC_BACK) // Tap for [, double tap for back browser | 29 | #define T_LBRC TD(TD_LBRC_BACK) // Tap for [, double tap for back browser |
17 | #define T_RBRC TD(TD_RBRC_FWD) // Tap for ], double tap for forward browser | 30 | #define T_RBRC TD(TD_RBRC_FWD) // Tap for ], double tap for forward browser |
18 | #define T_TAB TD(TD_TAB_CTRLTAB) // Tap for TAB, double tap for CTRL + TAB | 31 | #define T_TAB TD(TD_TAB_CTRLTAB) // Tap for TAB, double tap for CTRL + TAB |
19 | #define T_GRV TD(TD_GRV_CTRLGRV) // Tap for GRV, double tap for + GRV | 32 | #define T_GRV TD(TD_GRV_CTRLGRV) // Tap for GRV, double tap for Cmd + GRV |
20 | #define T_GUI TD(TD_GUI_GUISPC) // Tap for , double tap for + Space | 33 | #define T_GUI TD(TD_GUI_GUISPC) // Tap for Cmd, double tap for Cmd + Space |
21 | #define T_W TD(TD_W_CTRLW) // Tap for W, double tap for + W | 34 | #define T_W TD(TD_W_CTRLW) // Tap for W, double tap for Cmd + W |
22 | #define T_Q TD(TD_Q_GUIQ) // Tap for Q, double tap for + Q \ No newline at end of file | 35 | #define T_Q TD(TD_Q_GUIQ) // Tap for Q, double tap for Cmd + Q |
36 | #define T_CPNU TD(TD_COPY_PASTE_NUMPAD) // Tap for paste, hold for copy, double tap for NUMPAD | ||
37 | #define T_Y TD(TD_Y_NUMPAD) // Tap for Y, double tap for NUMPAD \ No newline at end of file | ||