aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Avellana <14019120+ninjonas@users.noreply.github.com>2020-01-31 23:38:05 -0700
committerGitHub <noreply@github.com>2020-01-31 22:38:05 -0800
commit1aee492c0f88b1a96fabdf750a03ed128d9d844a (patch)
treefc785cfa639fc3b66720be08e682c3cfaeace41f
parentfdabf524f2c0047ec920b88ace07096009cdd759 (diff)
downloadqmk_firmware-1aee492c0f88b1a96fabdf750a03ed128d9d844a.tar.gz
qmk_firmware-1aee492c0f88b1a96fabdf750a03ed128d9d844a.zip
[keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace (#8053)
* [keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace and keyboards * [fix(#8053)] removed redundant code based off Duckle29's code review * [fix(#8053)] fixing typos * [refactor(#8053)] updating oled timeout * [fix(8053) resolved code review issues identified by noroadsleft
Diffstat
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/README.md22
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/keymap.c72
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/rules.mk1
-rw-r--r--keyboards/kyria/keymaps/ninjonas/config.h41
-rw-r--r--keyboards/kyria/keymaps/ninjonas/keymap.c315
-rw-r--r--keyboards/kyria/keymaps/ninjonas/rules.mk4
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c6
-rw-r--r--users/ninjonas/README.md13
-rw-r--r--users/ninjonas/ninjonas.h20
-rw-r--r--users/ninjonas/oled.c29
-rw-r--r--users/ninjonas/process_records.c16
-rw-r--r--users/ninjonas/process_records.h1
12 files changed, 468 insertions, 72 deletions
diff --git a/keyboards/hotdox/keymaps/ninjonas/README.md b/keyboards/hotdox/keymaps/ninjonas/README.md
index 5cbfacf9f..d761bf9c9 100644
--- a/keyboards/hotdox/keymaps/ninjonas/README.md
+++ b/keyboards/hotdox/keymaps/ninjonas/README.md
@@ -32,7 +32,7 @@ This keymap is designed based off my typing habits and is subject to change. Inf
32 32
33### QWERTY 33### QWERTY
34```c 34```c
35/* Keymap 0: QWERTY 35/* QWERTY
36 * 36 *
37 * ,--------------------------------------------------. ,--------------------------------------------------. 37 * ,--------------------------------------------------. ,--------------------------------------------------.
38 * | ` | 1 | 2 | 3 | 4 | 5 | Play | |K_LOCK | 6 | 7 | 8 | 9 | 0 | - | 38 * | ` | 1 | 2 | 3 | 4 | 5 | Play | |K_LOCK | 6 | 7 | 8 | 9 | 0 | - |
@@ -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 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV| 46 * | | | Alt |  | Ctl | | BkSP | Del |LOWER | | |
47 * `----------------------------------' `----------------------------------' 47 * `----------------------------------' `----------------------------------'
48 * ,-------------. ,-------------. 48 * ,-------------. ,-------------.
49 * | Up | Down | | Left | Right| 49 * | Up | Down | | Left | Right|
@@ -57,16 +57,16 @@ This keymap is designed based off my typing habits and is subject to change. Inf
57 57
58### LOWER 58### LOWER
59```c 59```c
60/* Keymap 1: LOWER 60/* LOWER
61 * 61 *
62 * ,--------------------------------------------------. ,----------------------------------------------------. 62 * ,--------------------------------------------------. ,----------------------------------------------------.
63 * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | 63 * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 |
64 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| 64 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
65 * | | | |KC_BRU| Play | Mute | | | | PgUp | Home | Up | End | | | 65 * | | |KC_BRU| Play | Mute | | | | | PgUp | Home | Up | End | | |
66 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 66 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
67 * | | | |KC_BRD| Next |VolUp |------| |-------| PgDn | Left | Down |Right |K_LOCK | | 67 * | | |KC_BRD| Next |VolUp | |------| |-------| PgDn | Left | Down |Right |K_LOCK | |
68 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 68 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
69 * | | | | | Prev |VolDn | | | | | | | | | | 69 * | | | | Prev |VolDn | | | | | | | | | | |
70 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------' 70 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
71 * | | | | | | | | | |M_CODE | | 71 * | | | | | | | | | |M_CODE | |
72 * `----------------------------------' `-----------------------------------' 72 * `----------------------------------' `-----------------------------------'
@@ -82,16 +82,16 @@ This keymap is designed based off my typing habits and is subject to change. Inf
82 82
83### RAISE 83### RAISE
84```c 84```c
85/* Keymap 2: RAISE 85/* RAISE
86 * 86 *
87 * ,--------------------------------------------------. ,----------------------------------------------------. 87 * ,--------------------------------------------------. ,----------------------------------------------------.
88 * | | | | |K_CSCN| | | | | | | | | | | 88 * | | | | | | | | | | | | | | | |
89 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| 89 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
90 * | M_MAKE | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | | | 90 * | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | | |
91 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 91 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
92 * | M_VRSN | | MS_L | MS_D | MS_R | WH_D |------| |-------| | | | | | | 92 * | | | MS_L | MS_D | MS_R | WH_D |------| |-------| | | | | | |
93 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 93 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
94 * | M_FLSH | | | | | | | | | | | | | | | 94 * | | | | | | | | | | | | | | | |
95 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------' 95 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
96 * | | | | | | | | | | | | 96 * | | | | | | | | | | | |
97 * `----------------------------------' `-----------------------------------' 97 * `----------------------------------' `-----------------------------------'
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
index eea86200c..6637eb3b3 100644
--- a/keyboards/hotdox/keymaps/ninjonas/keymap.c
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17#include "ninjonas.h" 17#include "ninjonas.h"
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20/* QWERTY 20/* QWERTY
@@ -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 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV| 31 * | | | Alt |  | Ctl | | BkSP | Del |LOWER | | |
32 * `----------------------------------' `----------------------------------' 32 * `----------------------------------' `----------------------------------'
33 * ,-------------. ,-------------. 33 * ,-------------. ,-------------.
34 * | Up | Down | | Left | Right| 34 * | Up | Down | | Left | Right|
@@ -41,10 +41,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 [_QWERTY] = LAYOUT_ergodox_wrapper( 41 [_QWERTY] = LAYOUT_ergodox_wrapper(
42 // LEFT HAND 42 // LEFT HAND
43 _____________________NUM_LEFT_______________________, KC_MPLY, 43 _____________________NUM_LEFT_______________________, KC_MPLY,
44 _____________________QWERTY_L1______________________, KC_NO, 44 _____________________QWERTY_L1______________________, XXXXXXX,
45 _____________________QWERTY_L2______________________, 45 _____________________QWERTY_L2______________________,
46 _____________________QWERTY_L3______________________, T_LBRC, 46 _____________________QWERTY_L3______________________, T_LBRC,
47 M_SHFT, KC_NO, ________MOD_LEFT_________, 47 XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
48 // LEFT THUMB 48 // LEFT THUMB
49 KC_UP, KC_DOWN, 49 KC_UP, KC_DOWN,
50 KC_HOME, 50 KC_HOME,
@@ -53,10 +53,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53 53
54 //RIGHT HAND 54 //RIGHT HAND
55 K_LOCK, _____________________NUM_RIGHT______________________, 55 K_LOCK, _____________________NUM_RIGHT______________________,
56 KC_NO, _____________________QWERTY_R1______________________, 56 XXXXXXX,_____________________QWERTY_R1______________________,
57 _____________________QWERTY_R2______________________, 57 _____________________QWERTY_R2______________________,
58 T_RBRC, _____________________QWERTY_R3______________________, 58 T_RBRC, _____________________QWERTY_R3______________________,
59 ________MOD_RIGHT________, M_XXX1, M_PYNV, 59 ________MOD_RIGHT________, XXXXXXX, XXXXXXX,
60 // RIGHT THUMB 60 // RIGHT THUMB
61 KC_LEFT, KC_RGHT, 61 KC_LEFT, KC_RGHT,
62 KC_PGUP, 62 KC_PGUP,
@@ -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 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV| 78 * | | | Alt |  | Ctl | | BkSP | Del |LOWER | | |
79 * `----------------------------------' `----------------------------------' 79 * `----------------------------------' `----------------------------------'
80 * ,-------------. ,-------------. 80 * ,-------------. ,-------------.
81 * | Up | Down | | Left | Right| 81 * | Up | Down | | Left | Right|
@@ -88,10 +88,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 [_DVORAK] = LAYOUT_ergodox_wrapper( 88 [_DVORAK] = LAYOUT_ergodox_wrapper(
89 // LEFT HAND 89 // LEFT HAND
90 _____________________NUM_LEFT_______________________, KC_MPLY, 90 _____________________NUM_LEFT_______________________, KC_MPLY,
91 _____________________DVORAK_L1______________________, KC_NO, 91 _____________________DVORAK_L1______________________, XXXXXXX,
92 _____________________DVORAK_L2______________________, 92 _____________________DVORAK_L2______________________,
93 _____________________DVORAK_L3______________________, T_LBRC, 93 _____________________DVORAK_L3______________________, T_LBRC,
94 M_SHFT, KC_NO, ________MOD_LEFT_________, 94 XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
95 // LEFT THUMB 95 // LEFT THUMB
96 KC_UP, KC_DOWN, 96 KC_UP, KC_DOWN,
97 KC_HOME, 97 KC_HOME,
@@ -100,10 +100,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
100 100
101 //RIGHT HAND 101 //RIGHT HAND
102 K_LOCK, _____________________NUM_RIGHT______________________, 102 K_LOCK, _____________________NUM_RIGHT______________________,
103 KC_NO, _____________________DVORAK_R1______________________, 103 XXXXXXX,_____________________DVORAK_R1______________________,
104 _____________________DVORAK_R2______________________, 104 _____________________DVORAK_R2______________________,
105 T_RBRC, _____________________DVORAK_R3______________________, 105 T_RBRC, _____________________DVORAK_R3______________________,
106 ________MOD_RIGHT________, M_XXX1, M_PYNV, 106 ________MOD_RIGHT________, XXXXXXX, XXXXXXX,
107 // RIGHT THUMB 107 // RIGHT THUMB
108 KC_LEFT, KC_RGHT, 108 KC_LEFT, KC_RGHT,
109 KC_PGUP, 109 KC_PGUP,
@@ -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 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV| 125 * | | | Alt |  | Ctl | | BkSP | Del |LOWER | | |
126 * `----------------------------------' `----------------------------------' 126 * `----------------------------------' `----------------------------------'
127 * ,-------------. ,-------------. 127 * ,-------------. ,-------------.
128 * | Up | Down | | Left | Right| 128 * | Up | Down | | Left | Right|
@@ -135,10 +135,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
135 [_COLEMAK] = LAYOUT_ergodox_wrapper( 135 [_COLEMAK] = LAYOUT_ergodox_wrapper(
136 // LEFT HAND 136 // LEFT HAND
137 _____________________NUM_LEFT_______________________, KC_MPLY, 137 _____________________NUM_LEFT_______________________, KC_MPLY,
138 _____________________COLEMAK_L1_____________________, KC_NO, 138 _____________________COLEMAK_L1_____________________, XXXXXXX,
139 _____________________COLEMAK_L2_____________________, 139 _____________________COLEMAK_L2_____________________,
140 _____________________COLEMAK_L3_____________________, T_LBRC, 140 _____________________COLEMAK_L3_____________________, T_LBRC,
141 M_SHFT, KC_NO, ________MOD_LEFT_________, 141 XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
142 // LEFT THUMB 142 // LEFT THUMB
143 KC_UP, KC_DOWN, 143 KC_UP, KC_DOWN,
144 KC_HOME, 144 KC_HOME,
@@ -147,10 +147,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
147 147
148 //RIGHT HAND 148 //RIGHT HAND
149 K_LOCK, _____________________NUM_RIGHT______________________, 149 K_LOCK, _____________________NUM_RIGHT______________________,
150 KC_NO, _____________________COLEMAK_R1_____________________, 150 XXXXXXX,_____________________COLEMAK_R1_____________________,
151 _____________________COLEMAK_R2_____________________, 151 _____________________COLEMAK_R2_____________________,
152 T_RBRC, _____________________COLEMAK_R3_____________________, 152 T_RBRC, _____________________COLEMAK_R3_____________________,
153 ________MOD_RIGHT________, M_XXX1, M_PYNV, 153 ________MOD_RIGHT________, XXXXXXX, XXXXXXX,
154 // RIGHT THUMB 154 // RIGHT THUMB
155 KC_LEFT, KC_RGHT, 155 KC_LEFT, KC_RGHT,
156 KC_PGUP, 156 KC_PGUP,
@@ -163,11 +163,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
163 * ,--------------------------------------------------. ,----------------------------------------------------. 163 * ,--------------------------------------------------. ,----------------------------------------------------.
164 * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 | 164 * | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 |
165 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| 165 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
166 * | | | |KC_BRU| Play | Mute | | | | PgUp | Home | Up | End | | | 166 * | | |KC_BRU| Play | Mute | | | | | PgUp | Home | Up | End | | |
167 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 167 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
168 * | | | |KC_BRD| Next |VolUp |------| |-------| PgDn | Left | Down |Right |K_LOCK | | 168 * | | |KC_BRD| Next |VolUp | |------| |-------| PgDn | Left | Down |Right |K_LOCK | |
169 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 169 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
170 * | | | | | Prev |VolDn | | | | | | | | | | 170 * | | | | Prev |VolDn | | | | | | | | | | |
171 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------' 171 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
172 * | | | | | | | | | |M_CODE | | 172 * | | | | | | | | | |M_CODE | |
173 * `----------------------------------' `-----------------------------------' 173 * `----------------------------------' `-----------------------------------'
@@ -182,9 +182,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
182 [_LOWER] = LAYOUT_ergodox_wrapper( 182 [_LOWER] = LAYOUT_ergodox_wrapper(
183 //LEFT HAND 183 //LEFT HAND
184 _____________________FUNC_LEFT______________________, _______, 184 _____________________FUNC_LEFT______________________, _______,
185 _______, _______, _______, _________MEDIA_1_________, _______, 185 _____________________LOWER_L1_______________________, _______,
186 _______, _______, _______, _________MEDIA_2_________, 186 _____________________LOWER_L2_______________________,
187 _______, _______, _______, _________MEDIA_3_________, _______, 187 _____________________LOWER_L3_______________________, _______,
188 _______, _______, _______, _______, _______, 188 _______, _______, _______, _______, _______,
189 // LEFT THUMB 189 // LEFT THUMB
190 _______, _______, 190 _______, _______,
@@ -194,9 +194,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
194 194
195 //RIGHT HAND 195 //RIGHT HAND
196 _______, _____________________FUNC_RIGHT_____________________, 196 _______, _____________________FUNC_RIGHT_____________________,
197 _______, _______________NAV_1______________, _______, _______, 197 _______, _____________________LOWER_R1_______________________,
198 _______________NAV_2______________, K_LOCK, _______, 198 _____________________LOWER_R2_______________________,
199 _______, _______, _______, _______, _______, _______, _______, 199 _______, _____________________LOWER_R3_______________________,
200 _______, _______, _______, M_CODE, _______, 200 _______, _______, _______, M_CODE, _______,
201 // RIGHT THUMB 201 // RIGHT THUMB
202 _______, _______, 202 _______, _______,
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
208/* RAISE 208/* RAISE
209 * 209 *
210 * ,--------------------------------------------------. ,----------------------------------------------------. 210 * ,--------------------------------------------------. ,----------------------------------------------------.
211 * | | | | |K_CSCN| | | | | | | | | | | 211 * | | | | | | | | | | | | | | | |
212 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| 212 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
213 * | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | | | 213 * | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | | |
214 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 214 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
@@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
228 */ 228 */
229 [_RAISE] = LAYOUT_ergodox_wrapper( 229 [_RAISE] = LAYOUT_ergodox_wrapper(
230 //LEFT HAND 230 //LEFT HAND
231 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_CSCN, XXXXXXX, XXXXXXX, 231 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
232 XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, 232 XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX,
233 XXXXXXX, XXXXXXX, _____________MOUSE_2______________, 233 XXXXXXX, XXXXXXX, _____________MOUSE_2______________,
234 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 234 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -255,11 +255,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
255/* ADJUST 255/* ADJUST
256 * 256 *
257 * ,--------------------------------------------------. ,----------------------------------------------------. 257 * ,--------------------------------------------------. ,----------------------------------------------------.
258 * | | | | | | | | | | | | |COLMAK|DVORAK |QWERTY | 258 * | | | | | | | | | | | | | | | |
259 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| 259 * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
260 * | M_MAKE | | | | | | | | | | | | | | | 260 * | M_MAKE |RESET | | | | | | | | | | |COLMAK|DVORAK |QWERTY |
261 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 261 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
262 * | M_VRSN | | | | | |------| |-------| | | | | | | 262 * | M_VRSN |M_MALL| | | | |------| |-------| | | | | | |
263 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| 263 * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
264 * | M_FLSH | | | | | | | | | | | | | | | 264 * | M_FLSH | | | | | | | | | | | | | | |
265 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------' 265 * `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
@@ -276,9 +276,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
276 [_ADJUST] = LAYOUT_ergodox_wrapper( 276 [_ADJUST] = LAYOUT_ergodox_wrapper(
277 //LEFT HAND 277 //LEFT HAND
278 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 278 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
279 M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 279 _____________________ADJUST_L1______________________, XXXXXXX,
280 M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 280 _____________________ADJUST_L1______________________,
281 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 281 _____________________ADJUST_L1______________________, XXXXXXX,
282 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 282 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
283 // LEFT THUMB 283 // LEFT THUMB
284 _______, _______, 284 _______, _______,
@@ -287,10 +287,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
287 _______, 287 _______,
288 288
289 //RIGHT HAND 289 //RIGHT HAND
290 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,
291 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
292 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
293 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 290 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
291 XXXXXXX, _____________________ADJUST_R1______________________,
292 _____________________ADJUST_R1______________________,
293 XXXXXXX, _____________________ADJUST_R1______________________,
294 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 294 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
295 // RIGHT THUMB 295 // RIGHT THUMB
296 _______, _______, 296 _______, _______,
diff --git a/keyboards/hotdox/keymaps/ninjonas/rules.mk b/keyboards/hotdox/keymaps/ninjonas/rules.mk
new file mode 100644
index 000000000..3ec5fb062
--- /dev/null
+++ b/keyboards/hotdox/keymaps/ninjonas/rules.mk
@@ -0,0 +1 @@
LINK_TIME_OPTIMIZATION_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/kyria/keymaps/ninjonas/config.h b/keyboards/kyria/keymaps/ninjonas/config.h
new file mode 100644
index 000000000..409058ad7
--- /dev/null
+++ b/keyboards/kyria/keymaps/ninjonas/config.h
@@ -0,0 +1,41 @@
1/* Copyright 2020 ninjonas
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#define TAPPING_TERM 200
20
21#ifdef OLED_DRIVER_ENABLE
22 #define OLED_DISPLAY_128X64
23 #define OLED_TIMEOUT 30000
24#endif
25
26#ifdef RGBLIGHT_ENABLE
27# define RGBLIGHT_SLEEP
28# define RGBLIGHT_LIMIT_VAL 200
29# define RGBLIGHT_HUE_STEP 8
30# define RGBLIGHT_SAT_STEP 8
31# define RGBLIGHT_VAL_STEP 8
32# define RGBLIGHT_SPLIT
33#endif
34
35// Allows to use either side as the master. Look at the documentation for info:
36// https://docs.qmk.fm/#/config_options?id=setting-handedness
37#define EE_HANDS
38
39// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
40#define SPLIT_USB_DETECT
41#define SPLIT_USB_TIMEOUT 1000
diff --git a/keyboards/kyria/keymaps/ninjonas/keymap.c b/keyboards/kyria/keymaps/ninjonas/keymap.c
new file mode 100644
index 000000000..1337c4427
--- /dev/null
+++ b/keyboards/kyria/keymaps/ninjonas/keymap.c
@@ -0,0 +1,315 @@
1/* Copyright 2020 ninjonas
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17#include "ninjonas.h"
18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20
21 [_QWERTY] = LAYOUT_wrapper(
22// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
23 _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
24// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
25 _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
26// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
27 _____________________QWERTY_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________QWERTY_R3______________________,
28// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
29 _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
30// `----------------------------------------' `----------------------------------------'
31 ),
32
33 [_DVORAK] = LAYOUT_wrapper(
34// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
35 _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
36// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
37 _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
38// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
39 _____________________DVORAK_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________DVORAK_R3______________________,
40// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
41 _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
42// `----------------------------------------' `----------------------------------------'
43 ),
44
45 [_COLEMAK] = LAYOUT_wrapper(
46// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
47 _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
48// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
49 _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
50// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
51 _____________________COLEMAK_L3_____________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________COLEMAK_R3_____________________,
52// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
53 _____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
54// `----------------------------------------' `----------------------------------------'
55 ),
56
57 [_LOWER] = LAYOUT_wrapper(
58// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
59 _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________,
60// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
61 _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________,
62// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
63 _____________________LOWER_L3_______________________,_______,_______, _______,_______,_____________________LOWER_R3_______________________,
64// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
65 _______,_______,_______,_______,_______, _______,_______,_______,_______,_______
66// `----------------------------------------' `----------------------------------------'
67 ),
68
69 [_RAISE] = LAYOUT_wrapper(
70// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
71 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
72// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
73 _____________________SYM_LEFT_______________________, _____________________SYM_RIGHT______________________,
74// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
75 _____________________FUNC_LEFT______________________,_______,_______, _______,_______,_____________________FUNC_RIGHT_____________________,
76// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
77 _______,_______,_______,_______,_______, _______,_______,_______,_______,_______
78// `----------------------------------------' `----------------------------------------'
79 ),
80
81 [_ADJUST] = LAYOUT_wrapper(
82// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
83 _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________,
84// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
85 _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________,
86// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
87 _____________________ADJUST_L3______________________,_______,_______, _______,_______,_____________________ADJUST_R3______________________,
88// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
89 _______,_______,_______,_______,_______, _______,_______,_______,_______,_______
90// `----------------------------------------' `----------------------------------------'
91 ),
92/*
93 [_TEMPLATE] = LAYOUT_wrapper(
94// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
95 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
96// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
97 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
98// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
99 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
100// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
101 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX
102// `----------------------------------------' `----------------------------------------'
103 ),
104*/
105};
106
107#ifdef OLED_DRIVER_ENABLE
108oled_rotation_t oled_init_user(oled_rotation_t rotation) {
109 return OLED_ROTATION_180;
110}
111
112static void render_logo(void) {
113 static const char PROGMEM logo[] = {
114 // Converter: https://javl.github.io/image2cpp/
115 // Image Dimensions: 128x64
116 // Code Output Format: Plain Bytes
117 // Draw Mode: Vertical, 1 bit per pixel
1180x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0xe0,
1190xe0, 0xe0, 0xe0, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0xe0, 0xe0, 0xe0,
1200xe0, 0x00, 0x60, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00,
1210xc0, 0xe0, 0xe0, 0xe0, 0x20, 0x60, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0,
1220xe0, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00,
1230x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0xe0, 0xe0, 0xfc, 0xfe,
1240xfe, 0xfe, 0xee, 0xee, 0x0e, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80,
1250x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00,
1260x00, 0x00, 0x79, 0xfd, 0xfd, 0xfd, 0xec, 0xee, 0x76, 0x7f, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00,
1270x07, 0x3f, 0xff, 0xfc, 0xf8, 0xff, 0x7f, 0x07, 0x0f, 0x7f, 0xff, 0xf8, 0xfc, 0xff, 0x3f, 0x07,
1280x00, 0x00, 0x00, 0x03, 0x1f, 0xff, 0xfe, 0xf0, 0xff, 0x7f, 0x0f, 0x07, 0x3f, 0xff, 0xfc, 0xf8,
1290xff, 0x7f, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x0f, 0x3f, 0xff, 0xfe, 0xf8, 0xff, 0xff, 0x1f, 0x03,
1300x00, 0x00, 0x1f, 0x7f, 0x7f, 0xff, 0xf6, 0xe6, 0xe6, 0xf7, 0xf7, 0x77, 0x37, 0x17, 0x00, 0x30,
1310x79, 0xfd, 0xfd, 0xfd, 0xee, 0xee, 0x76, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
1320xff, 0xff, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0x7f, 0xff, 0xf1, 0xe0, 0xe0, 0xff, 0xff, 0x7f, 0x3f,
1330x0e, 0x00, 0x0e, 0x3f, 0x7f, 0xff, 0xff, 0xe0, 0xe0, 0xe1, 0xff, 0x7f, 0x7f, 0x3f, 0x04, 0x00,
1340x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1350x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1360x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
1370xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00,
1380x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1390x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1420x00, 0x0c, 0x3c, 0xfc, 0xfc, 0xfc, 0xc0, 0x00, 0xe0, 0xfc, 0xfc, 0x7c, 0x1c, 0x00, 0xf0, 0xf8,
1430xf8, 0xfc, 0xdc, 0xdc, 0xdc, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0x00, 0x00, 0x30, 0xb8, 0xbc, 0xbc,
1440xdc, 0xdc, 0xdc, 0xfc, 0xfc, 0xf8, 0xf0, 0x00, 0x1c, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x1d, 0x1d,
1450x00, 0xf0, 0xf8, 0xf8, 0xfc, 0x3c, 0x1c, 0x1c, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0xe0, 0xf0,
1460xf8, 0xfc, 0x3c, 0x1c, 0x1c, 0x3c, 0xfc, 0xf8, 0xf8, 0xe0, 0x00, 0x00, 0x20, 0xb8, 0xbc, 0xbc,
1470xbc, 0xdc, 0xdc, 0xfc, 0xfc, 0xfc, 0xf8, 0xe0, 0x00, 0x0c, 0x7c, 0xfc, 0xfc, 0xc0, 0x00, 0xe0,
1480xfc, 0xfc, 0xfc, 0xfc, 0xf0, 0x80, 0x00, 0xf8, 0xfc, 0xfc, 0x3c, 0x04, 0x0c, 0x7c, 0xfc, 0xfc,
1490xf0, 0x00, 0xc0, 0xfc, 0xfc, 0x7c, 0xfc, 0xf8, 0xc0, 0x00, 0xf0, 0xfc, 0xfc, 0x7c, 0x0c, 0x00,
1500x00, 0x00, 0xc0, 0xc1, 0xc7, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x07, 0x0f,
1510x1f, 0x1f, 0x1e, 0x1c, 0x1c, 0x1e, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x06, 0x0f, 0x1f, 0x1f, 0x1f,
1520x1d, 0x1d, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00,
1530x00, 0x07, 0x0f, 0x0f, 0x1f, 0x1e, 0x1c, 0x1c, 0x1f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x03, 0x07,
1540x0f, 0x1f, 0x1e, 0x1c, 0x1c, 0x1e, 0x1f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x0f, 0x1f, 0x1f, 0x1f,
1550x1d, 0x1d, 0x0c, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x1f, 0x1e, 0x1f,
1560x0f, 0x01, 0x00, 0x07, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f,
1570x1f, 0x1e, 0x1f, 0x1f, 0x03, 0x00, 0x03, 0x1f, 0x1f, 0x1e, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00,
1580x00, 0x80, 0xc1, 0xf1, 0xf9, 0xf9, 0xf9, 0xb8, 0xb8, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
1590x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
1600x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
1610x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
1620x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
1630x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
1640x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
1650x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
1660x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x7c, 0xfe, 0xff, 0xff, 0xc7, 0x83, 0x83,
1670xc7, 0xff, 0xff, 0xff, 0x7c, 0x00, 0x00, 0x7c, 0xff, 0xff, 0xff, 0xc7, 0x83, 0x83, 0xc7, 0xff,
1680xff, 0xfe, 0x7c, 0x00, 0xc0, 0xe6, 0xf7, 0xf7, 0xf7, 0xbb, 0xbb, 0xdb, 0xff, 0xff, 0xff, 0xfe,
1690x00, 0x00, 0x03, 0x1f, 0xff, 0xff, 0xf0, 0xe0, 0xfe, 0xff, 0x1f, 0x3f, 0xff, 0xfe, 0xe0, 0xf0,
1700xff, 0xff, 0x1f, 0x03, 0x00, 0x01, 0x0f, 0x7f, 0xff, 0xf8, 0xc0, 0xfc, 0xff, 0x3f, 0x1f, 0xff,
1710xfe, 0xf0, 0xe0, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x01, 0x07, 0x3f, 0xff, 0xff, 0xf8, 0xe0, 0xfc,
1720xff, 0x7f, 0x0f, 0x03, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xdb, 0x9b, 0x9b, 0xdf, 0xdf, 0xdf, 0xde,
1730x1c, 0x00, 0xc0, 0xe6, 0xf7, 0xf7, 0xf7, 0xbb, 0xbb, 0xdb, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
1740x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03,
1750x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
1760x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x03, 0x03, 0x03, 0x03,
1770x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03,
1780x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00,
1790x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x1f, 0x0f,
1800x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00,
1810x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00
182 };
183 oled_write_raw_P(logo, sizeof(logo));
184}
185
186static void render_qmk_logo(void) {
187 static const char PROGMEM qmk_logo[] = {
188 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
189 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
190 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
191
192 oled_write_P(qmk_logo, false);
193}
194
195void oled_white_space(void){
196 oled_write_P(PSTR(" "), false);
197}
198
199static void render_status(void) {
200 oled_write_P(PSTR("\nLayer: "), false);
201 oled_write_P(PSTR("LOW"), (layer_state_is(_LOWER) & !layer_state_is(_ADJUST)));
202 oled_white_space();
203 oled_write_P(PSTR("RAI"), (layer_state_is(_RAISE) & !layer_state_is(_ADJUST)));
204 oled_white_space();
205 oled_write_P(PSTR("ADJ"), layer_state_is(_ADJUST));
206}
207
208void render_default_layer_state(void) {
209 oled_write_P(PSTR("\nLayout: "), false);
210 switch (biton32(default_layer_state)) {
211 case _COLEMAK:
212 oled_write_P(PSTR("Colemak"), false);
213 break;
214 case _DVORAK:
215 oled_write_P(PSTR("Dvorak"), false);
216 break;
217 case _QWERTY:
218 oled_write_P(PSTR("Qwerty"), false);
219 break;
220 default:
221 oled_write_ln_P(PSTR("Undefined"), false);
222 }
223}
224
225void render_mod_status(uint8_t modifiers) {
226 oled_write_P(PSTR("\nMods: "), false);
227 oled_write_P(PSTR("SHF"), (modifiers & MOD_MASK_SHIFT));
228 oled_white_space();
229 oled_write_P(PSTR("CTL"), (modifiers & MOD_MASK_CTRL));
230 oled_white_space();
231 oled_write_P(PSTR("ALT"), (modifiers & MOD_MASK_ALT));
232 oled_white_space();
233 oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
234}
235
236void oled_task_user(void) {
237 if (is_keyboard_master()) {
238 render_qmk_logo();
239 render_default_layer_state();
240 render_status();
241 render_mod_status(get_mods()|get_oneshot_mods());
242 } else {
243 render_logo();
244 oled_scroll_left();
245 }
246}
247#endif
248
249#ifdef ENCODER_ENABLE
250void encoder_update_user(uint8_t index, bool clockwise) {
251 if (index == 0) {
252 switch (biton32(layer_state)) {
253 case _LOWER:
254 if (clockwise) {
255 tap_code16(SGUI(KC_TAB));
256 } else {
257 tap_code16(LGUI(KC_TAB));
258 }
259 break;
260 case _RAISE:
261 if (clockwise) {
262 tap_code(KC_PGUP);
263 } else {
264 tap_code(KC_PGDN);
265 }
266 break;
267 case _ADJUST:
268 if (clockwise) {
269 rgblight_increase_hue();
270 } else {
271 rgblight_decrease_hue();
272 }
273 break;
274 default:
275 if (clockwise) {
276 tap_code(KC_BRIU);
277 } else {
278 tap_code(KC_BRID);
279 }
280 break;
281 }
282 } else if (index == 1) {
283 switch (biton32(layer_state)) {
284 case _LOWER:
285 if (!clockwise) {
286 tap_code(KC_UP);
287 } else {
288 tap_code(KC_DOWN);
289 }
290 break;
291 case _RAISE:
292 if (!clockwise) {
293 tap_code16(LCTL(KC_TAB));
294 } else {
295 tap_code16(LCTL(LSFT(KC_TAB)));
296 }
297 break;
298 case _ADJUST:
299 if (!clockwise) {
300 rgblight_increase_val();
301 } else {
302 rgblight_decrease_val();
303 }
304 break;
305 default:
306 if (!clockwise) {
307 tap_code(KC_VOLU);
308 } else {
309 tap_code(KC_VOLD);
310 }
311 break;
312 }
313 }
314}
315#endif \ No newline at end of file
diff --git a/keyboards/kyria/keymaps/ninjonas/rules.mk b/keyboards/kyria/keymaps/ninjonas/rules.mk
new file mode 100644
index 000000000..13bc4cf97
--- /dev/null
+++ b/keyboards/kyria/keymaps/ninjonas/rules.mk
@@ -0,0 +1,4 @@
1OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays
2ENCODER_ENABLE = yes # Enables the use of one or more encoders
3RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
4LINK_TIME_OPTIMIZATION_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 0ed197c14..0bd330a76 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ 40 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
41 ), 41 ),
42 42
43/* DVORAK 43/* DVORAK
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ 62 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
63 ), 63 ),
64 64
65/* COLEMAK 65/* COLEMAK
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ 84 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
85 ), 85 ),
86 86
87/* LOWER 87/* LOWER
diff --git a/users/ninjonas/README.md b/users/ninjonas/README.md
index 1e3fe9c31..301b350e7 100644
--- a/users/ninjonas/README.md
+++ b/users/ninjonas/README.md
@@ -14,6 +14,7 @@ See: https://docs.qmk.fm/#/feature_userspace
14- [Hotdox](../../keyboards/hotdox/keymaps/ninjonas) 14- [Hotdox](../../keyboards/hotdox/keymaps/ninjonas)
15- [Pinky3](../../keyboards/pinky/3/keymaps/ninjonas) 15- [Pinky3](../../keyboards/pinky/3/keymaps/ninjonas)
16- [Lily58](../../keyboards/lily58/keymaps/ninjonas) 16- [Lily58](../../keyboards/lily58/keymaps/ninjonas)
17- [Kyria](../../keyboards/kyria/keymaps/ninjonas)
17 18
18## Features 19## Features
19### [Keys](ninjonas.h#L37) 20### [Keys](ninjonas.h#L37)
@@ -33,6 +34,8 @@ See: https://docs.qmk.fm/#/feature_userspace
33|LT_LOW + LT_RAI | Hold for ADJUST | 34|LT_LOW + LT_RAI | Hold for ADJUST |
34|LM_LOW | Dedicated key to momentarily toggle to use LOWER layer | 35|LM_LOW | Dedicated key to momentarily toggle to use LOWER layer |
35|LM_RAI | Dedicated key to momentarily toggle to use RAISE layer | 36|LM_RAI | Dedicated key to momentarily toggle to use RAISE layer |
37|LG_LOW | Press to toggle LOWER layer |
38|LG_RAI | Press to toggle RAISE layer |
36 39
37### [Mod-Taps](ninjonas.h#L50) 40### [Mod-Taps](ninjonas.h#L50)
38|Code | Description | 41|Code | Description |
@@ -59,13 +62,15 @@ Predefined keyboard layout templates to speed up configuring split keyboards
59### [Macros](process_records.c) 62### [Macros](process_records.c)
60|Code | Description | 63|Code | Description |
61|---|---| 64|---|---|
62|M_PYNV | macro to activate pyenv with the name `jira` | 65|M_PYNV | Macro to activate pyenv with the name `jira` |
63|M_MAKE | macro to send QMK make command to compile keyboard | 66|M_MAKE | Macro to send QMK make command to compile keyboard |
64|M_FLSH | macro to send QMK make command to compile keyboard with the correct bootloader | 67|M_MALL | Macro to send QMK make command to all [ninjonas](#Supported%20Keyboards) keyboards |
65|M_VRSN | macro to send QMK version | 68|M_FLSH | Macro to send QMK make command to compile keyboard with the correct bootloader |
69|M_VRSN | Macro to send QMK version |
66|M_SHFT | Sends  + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) | 70|M_SHFT | Sends  + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) |
67|M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory | 71|M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory |
68|M_TERM | Launches Spotlight and calls Terminal | 72|M_TERM | Launches Spotlight and calls Terminal |
73|M_COPA | Single key copy/paste |
69|M_XXX1 to M_XXX5 | Reserved for secret macros see [Secrets](#secrets) | 74|M_XXX1 to M_XXX5 | Reserved for secret macros see [Secrets](#secrets) |
70 75
71### [Tap-Dance](tap_dances.h) 76### [Tap-Dance](tap_dances.h)
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h
index b86ccc733..ba94c8ea8 100644
--- a/users/ninjonas/ninjonas.h
+++ b/users/ninjonas/ninjonas.h
@@ -44,6 +44,8 @@
44// Layer Keys 44// Layer Keys
45#define LM_LOW MO(_LOWER) 45#define LM_LOW MO(_LOWER)
46#define LM_RAI MO(_RAISE) 46#define LM_RAI MO(_RAISE)
47#define LG_LOW TG(_LOWER)
48#define LG_RAI TG(_RAISE)
47#define LT_LOW LT(_LOWER, KC_ENT) 49#define LT_LOW LT(_LOWER, KC_ENT)
48#define LT_RAI LT(_RAISE, KC_SPC) 50#define LT_RAI LT(_RAISE, KC_SPC)
49 51
@@ -52,7 +54,7 @@
52#define MT_EQL MT(MOD_LALT | MOD_LSFT, KC_EQL) 54#define MT_EQL MT(MOD_LALT | MOD_LSFT, KC_EQL)
53 55
54// Layout blocks 56// Layout blocks
55#define _____________________QWERTY_L1______________________ T_TAB, T_Q, T_W, KC_E, KC_R, KC_T 57#define _____________________QWERTY_L1______________________ T_TAB, T_Q, KC_W, KC_E, KC_R, KC_T
56#define _____________________QWERTY_L2______________________ T_ESC, KC_A, KC_S, KC_D, KC_F, KC_G 58#define _____________________QWERTY_L2______________________ T_ESC, KC_A, KC_S, KC_D, KC_F, KC_G
57#define _____________________QWERTY_L3______________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B 59#define _____________________QWERTY_L3______________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B
58 60
@@ -62,13 +64,13 @@
62 64
63#define _____________________DVORAK_L1______________________ T_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y 65#define _____________________DVORAK_L1______________________ T_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
64#define _____________________DVORAK_L2______________________ T_ESC, KC_A, KC_O, KC_E, KC_U, KC_I 66#define _____________________DVORAK_L2______________________ T_ESC, KC_A, KC_O, KC_E, KC_U, KC_I
65#define _____________________DVORAK_L3______________________ KC_LSFT, KC_SCLN, T_Q, KC_J, KC_K, KC_X 67#define _____________________DVORAK_L3______________________ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X
66 68
67#define _____________________DVORAK_R1______________________ KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS 69#define _____________________DVORAK_R1______________________ KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS
68#define _____________________DVORAK_R2______________________ KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH 70#define _____________________DVORAK_R2______________________ KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH
69#define _____________________DVORAK_R3______________________ KC_B, KC_M, T_W, KC_V, KC_Z, MT_EQL 71#define _____________________DVORAK_R3______________________ KC_B, KC_M, KC_W, KC_V, KC_Z, MT_EQL
70 72
71#define _____________________COLEMAK_L1_____________________ T_TAB, T_Q, T_W, KC_F, KC_P, KC_G 73#define _____________________COLEMAK_L1_____________________ T_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G
72#define _____________________COLEMAK_L2_____________________ T_ESC, KC_A, KC_R, KC_S, KC_T, KC_D 74#define _____________________COLEMAK_L2_____________________ T_ESC, KC_A, KC_R, KC_S, KC_T, KC_D
73#define _____________________COLEMAK_L3_____________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B 75#define _____________________COLEMAK_L3_____________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B
74 76
@@ -94,7 +96,8 @@
94#define _____________________LOWER_R3_______________________ T_RBRC, KC_M, M_TERM, M_CODE, M_XXX1, M_PYNV 96#define _____________________LOWER_R3_______________________ T_RBRC, KC_M, M_TERM, M_CODE, M_XXX1, M_PYNV
95 97
96#define _____________________ADJUST_L1______________________ M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 98#define _____________________ADJUST_L1______________________ M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
97#ifdef RGB_MATRIX_ENABLE 99
100#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
98 #define _____________________ADJUST_L2______________________ M_VRSN, M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI 101 #define _____________________ADJUST_L2______________________ M_VRSN, M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI
99 #define _____________________ADJUST_L3______________________ M_FLSH, XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD 102 #define _____________________ADJUST_L3______________________ M_FLSH, XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD
100#else 103#else
@@ -102,7 +105,7 @@
102 #define _____________________ADJUST_L3______________________ M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 105 #define _____________________ADJUST_L3______________________ M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
103#endif 106#endif
104 107
105#ifdef RGB_MATRIX_ENABLE 108#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
106 #define _____________________ADJUST_R1______________________ RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY 109 #define _____________________ADJUST_R1______________________ RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY
107 #define _____________________ADJUST_R3______________________ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 110 #define _____________________ADJUST_R3______________________ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
108#else 111#else
@@ -119,11 +122,14 @@
119 122
120#define __________________________________ _______, _______, _______, _______ 123#define __________________________________ _______, _______, _______, _______
121 124
125#define _____________MOD_LEFT_____________ KC_LALT, T_GUI, KC_LCTL, LT_RAI
126#define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, LM_LOW
127
122#define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE 128#define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE
123#define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP 129#define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP
124#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN 130#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN
125 131
126#ifdef KEYBOARD_crkbd_rev1 132#if defined(KEYBOARD_crkbd_rev1) || defined(KEYBOARD_kyria_rev1)
127 #define ________MOD_LEFT_________ T_GUI, KC_LCTL, LT_RAI 133 #define ________MOD_LEFT_________ T_GUI, KC_LCTL, LT_RAI
128 #define ________MOD_RIGHT________ LT_LOW, KC_BSPC, MT_DEL 134 #define ________MOD_RIGHT________ LT_LOW, KC_BSPC, MT_DEL
129#else 135#else
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index 721038e15..ac98133bc 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -2,7 +2,7 @@
2#include <stdio.h> 2#include <stdio.h>
3#include "ninjonas.h" 3#include "ninjonas.h"
4 4
5#ifdef OLED_DRIVER_ENABLE 5#if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1)
6 6
7static uint32_t oled_timer = 0; 7static uint32_t oled_timer = 0;
8extern uint8_t is_master; 8extern uint8_t is_master;
@@ -38,19 +38,28 @@ void render_default_layer_state(void) {
38 } 38 }
39} 39}
40 40
41void oled_white_space(void){
42 oled_write_P(PSTR(" "), false);
43}
44
41void render_layer_state(void) { 45void render_layer_state(void) {
42 oled_write_P(PSTR("\nLayer:"), false); 46 oled_write_P(PSTR("\nLayer: "), false);
43 oled_write_P(PSTR(" LOW"), layer_state_is(_LOWER)); 47 oled_write_P(PSTR("LOW"), (layer_state_is(_LOWER) & !layer_state_is(_ADJUST)));
44 oled_write_P(PSTR(" RAI"), layer_state_is(_RAISE)); 48 oled_white_space();
45 oled_write_P(PSTR(" ADJ"), layer_state_is(_ADJUST)); 49 oled_write_P(PSTR("RAI"), (layer_state_is(_RAISE) & !layer_state_is(_ADJUST)));
50 oled_white_space();
51 oled_write_P(PSTR("ADJ"), layer_state_is(_ADJUST));
46} 52}
47 53
48void render_mod_status(uint8_t modifiers) { 54void render_mod_status(uint8_t modifiers) {
49 oled_write_P(PSTR("\nMods: "), false); 55 oled_write_P(PSTR("\nMods: "), false);
50 oled_write_P(PSTR("SHF "), (modifiers & MOD_MASK_SHIFT)); 56 oled_write_P(PSTR("SHF"), (modifiers & MOD_MASK_SHIFT));
51 oled_write_P(PSTR("CTL "), (modifiers & MOD_MASK_CTRL)); 57 oled_white_space();
52 oled_write_P(PSTR("ALT "), (modifiers & MOD_MASK_ALT)); 58 oled_write_P(PSTR("CTL"), (modifiers & MOD_MASK_CTRL));
53 oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI)); 59 oled_white_space();
60 oled_write_P(PSTR("ALT"), (modifiers & MOD_MASK_ALT));
61 oled_white_space();
62 oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
54} 63}
55 64
56void render_status(void){ 65void render_status(void){
diff --git a/users/ninjonas/process_records.c b/users/ninjonas/process_records.c
index 8044b49f1..5c6d98ec8 100644
--- a/users/ninjonas/process_records.c
+++ b/users/ninjonas/process_records.c
@@ -1,5 +1,7 @@
1#include "ninjonas.h" 1#include "ninjonas.h"
2 2
3uint16_t copy_paste_timer;
4
3__attribute__((weak)) 5__attribute__((weak))
4bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } 6bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
5 7
@@ -44,7 +46,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
44 // Sends QMK make command to compile all keyboards 46 // Sends QMK make command to compile all keyboards
45 case M_MALL: 47 case M_MALL:
46 if (record->event.pressed) { 48 if (record->event.pressed) {
47 SEND_STRING("rm -f *.hex && rm -rf .build/ && make crkbd:ninjonas lily58:ninjonas hotdox:ninjonas pinky/3:ninjonas\n"); 49 SEND_STRING("rm -f *.hex && rm -rf .build/ && make crkbd:ninjonas lily58:ninjonas hotdox:ninjonas pinky/3:ninjonas kyria:ninjonas\n");
48 } 50 }
49 break; 51 break;
50 52
@@ -90,6 +92,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
90 } 92 }
91 break; 93 break;
92 94
95 // Single key copy/paste
96 case M_COPA:
97 if (record->event.pressed) {
98 copy_paste_timer = timer_read();
99 } else {
100 if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {
101 tap_code16(LGUI(KC_C)); // Hold  + C
102 } else {
103 tap_code16(LGUI(KC_V)); // Tap  + V
104 }
105 }
106
93 // BEGIN: Layer macros 107 // BEGIN: Layer macros
94 case QWERTY: 108 case QWERTY:
95 if (record->event.pressed) { 109 if (record->event.pressed) {
diff --git a/users/ninjonas/process_records.h b/users/ninjonas/process_records.h
index 2e69ca216..34886531a 100644
--- a/users/ninjonas/process_records.h
+++ b/users/ninjonas/process_records.h
@@ -15,6 +15,7 @@ enum custom_keycodes {
15 M_VRSN, 15 M_VRSN,
16 M_CODE, 16 M_CODE,
17 M_TERM, 17 M_TERM,
18 M_COPA,
18 // Secret Macros 19 // Secret Macros
19 M_XXX1, 20 M_XXX1,
20 M_XXX2, 21 M_XXX2,
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 09:33:18 +0000