aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/README.md99
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/config.h48
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/keymap.c89
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/rgb.c27
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/rules.mk11
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/keymap.c2
-rw-r--r--keyboards/lily58/keymaps/ninjonas/README.md6
-rw-r--r--keyboards/lily58/keymaps/ninjonas/config.h6
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c26
-rw-r--r--keyboards/lily58/keymaps/ninjonas/layer_state_reader.c37
-rw-r--r--keyboards/lily58/keymaps/ninjonas/rules.mk6
-rw-r--r--keyboards/pinky/3/keymaps/ninjonas/README.md43
-rw-r--r--keyboards/pinky/3/keymaps/ninjonas/keymap.c90
-rw-r--r--keyboards/pinky/3/keymaps/ninjonas/rules.mk2
-rw-r--r--users/ninjonas/README.md24
-rw-r--r--users/ninjonas/ninjonas.c50
-rw-r--r--users/ninjonas/ninjonas.h16
-rw-r--r--users/ninjonas/oled.c82
-rw-r--r--users/ninjonas/process_records.c16
-rw-r--r--users/ninjonas/process_records.h1
-rw-r--r--users/ninjonas/rules.mk9
21 files changed, 460 insertions, 230 deletions
diff --git a/keyboards/crkbd/keymaps/ninjonas/README.md b/keyboards/crkbd/keymaps/ninjonas/README.md
new file mode 100644
index 000000000..24889a221
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ninjonas/README.md
@@ -0,0 +1,99 @@
1# ninjonas Keymap for [Corne Keyboard (crkbd)](https://github.com/foostan/crkbd)
2
3## Keymap
4This 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
6More information about the crkbd keyboard can be found [here](https://thomasbaart.nl/2018/11/26/corne-keyboard-helidox-build-log/)
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, N, M, ,, ., /, =
16 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
17 // , Ctrl, Space, Enter, BackSP, Del
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, B, M, W, V, Z, =
29 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
30 // , Ctrl, Space, Enter, BackSP, Del
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, K, M, ,, ., /, =
42 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
43 // , Ctrl, Space, Enter, BackSP, Del
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_ZOOM, 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### TEMPLATE
88```c
89 //,----------------------------------------------------. ,----------------------------------------------------.
90 // , , , , , , , , , , ,
91 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
92 // , , , , , , , , , , ,
93 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
94 // , , , , , , , , , , ,
95 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
96 // , , , , ,
97 //`---------------------' `---------------------'
98```
99--> \ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h
new file mode 100644
index 000000000..ef7ff6c55
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ninjonas/config.h
@@ -0,0 +1,48 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6
7This program is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 2 of the License, or
10(at your option) any later version.
11
12This program is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/
20
21#pragma once
22
23//#define USE_MATRIX_I2C
24
25/* Select hand configuration */
26
27#define MASTER_LEFT
28// #define MASTER_RIGHT
29// #define EE_HANDS
30
31#define USE_SERIAL_PD2
32
33#define TAPPING_FORCE_HOLD
34
35#ifdef RGBLIGHT_ENABLE
36 #undef RGBLED_NUM
37 #undef RGBLIGHT_ANIMATIONS // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
38 #define RGBLIGHT_EFFECT_BREATHING
39 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
40 #define RGBLED_NUM 27
41 #define RGBLIGHT_LIMIT_VAL 120
42 #define RGBLIGHT_HUE_STEP 10
43 #define RGBLIGHT_SAT_STEP 17
44 #define RGBLIGHT_VAL_STEP 17
45#endif
46
47#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
48#define OLED_DISABLE_TIMEOUT \ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c
new file mode 100644
index 000000000..6d19345c4
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c
@@ -0,0 +1,89 @@
1#include QMK_KEYBOARD_H
2#include "ninjonas.h"
3
4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5 [_QWERTY] = LAYOUT_wrapper(
6 //,----------------------------------------------------. ,----------------------------------------------------.
7 _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
8 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
9 _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
10 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
11 _____________________QWERTY_L3______________________, _____________________QWERTY_R3______________________,
12 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
13 T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL
14 //`---------------------' `---------------------'
15 ),
16
17 [_DVORAK] = LAYOUT_wrapper(
18 //,----------------------------------------------------. ,----------------------------------------------------.
19 _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
20 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
21 _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
22 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
23 _____________________DVORAK_L3______________________, _____________________DVORAK_R3______________________,
24 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
25 T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL
26 //`---------------------' `---------------------'
27 ),
28
29 [_COLEMAK] = LAYOUT_wrapper(
30 //,----------------------------------------------------. ,----------------------------------------------------.
31 _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
32 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
33 _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
34 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
35 _____________________COLEMAK_L3_____________________, _____________________COLEMAK_R3_____________________,
36 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
37 T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL
38 //`---------------------' `---------------------'
39 ),
40
41 [_LOWER] = LAYOUT_wrapper(
42 //,----------------------------------------------------. ,----------------------------------------------------.
43 XXXXXXX, XXXXXXX, _________MEDIA_1_________, K_CSCN, _______________NAV_1______________, XXXXXXX, K_MDSH,
44 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
45 XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,
46 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
47 _______, M_SHFT, _________MEDIA_3_________, T_LBRC, T_RBRC, _______, XXXXXXX, M_CODE, M_ZOOM, M_PYNV,
48 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
49 _______,_______,_______, _______,_______,_______
50 //`---------------------' `---------------------'
51 ),
52
53 [_RAISE] = LAYOUT_wrapper( \
54 //,----------------------------------------------------. ,----------------------------------------------------.
55 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
56 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
57 _____________________SYM_LEFT_______________________, _____________________SYM_RIGHT______________________,
58 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
59 _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________,
60 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
61 _______,_______,_______, _______,_______,_______
62 //`---------------------' `---------------------'
63 ),
64
65 [_ADJUST] = LAYOUT_wrapper( \
66 //,----------------------------------------------------. ,----------------------------------------------------.
67 M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,
68 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
69 M_VRSN, M_MALL, XXXXXXX, RGB_SAI, RGB_HUI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
70 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
71 M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX,
72 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
73 _______,_______,_______, _______,_______,_______
74 //`---------------------' `---------------------'
75 ),
76/*
77 [_TEMPLATE] = LAYOUT_wrapper( \
78 //,----------------------------------------------------. ,----------------------------------------------------.
79 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
80 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
81 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
82 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
83 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
84 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
85 _______,_______,_______, _______,_______,_______
86 //`---------------------' `---------------------'
87 ),
88*/
89}; \ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/ninjonas/rgb.c b/keyboards/crkbd/keymaps/ninjonas/rgb.c
new file mode 100644
index 000000000..f9ac3a861
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ninjonas/rgb.c
@@ -0,0 +1,27 @@
1#include QMK_KEYBOARD_H
2
3extern keymap_config_t keymap_config;
4
5#ifdef RGBLIGHT_ENABLE
6//Following line allows macro to read current RGB settings
7extern rgblight_config_t rgblight_config;
8#endif
9
10extern uint8_t is_master;
11
12int RGB_current_mode;
13
14// Setting ADJUST layer RGB back to default
15void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
16 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
17 layer_on(layer3);
18 } else {
19 layer_off(layer3);
20 }
21}
22
23void keyboard_post_init_user(void) {
24 #ifdef RGBLIGHT_ENABLE
25 RGB_current_mode = rgblight_config.mode;
26 #endif
27} \ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk
new file mode 100644
index 000000000..92e18ed6e
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -0,0 +1,11 @@
1RGBLIGHT_ENABLE = yes
2MOUSEKEY_ENABLE = no
3OLED_DRIVER_ENABLE = yes
4LINK_TIME_OPTIMIZATION_ENABLE = yes
5
6# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
7SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
8
9# If you want to change the display of OLED, you need to change here
10SRC += ./lib/rgb_state_reader.c \
11 rgb.c
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
index 603cc4c11..248a4320a 100644
--- a/keyboards/hotdox/keymaps/ninjonas/keymap.c
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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 M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
280 M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 280 M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
281 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 281 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
282 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 282 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
283 // LEFT THUMB 283 // LEFT THUMB
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index 73f7f9d94..ef6322db4 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -67,11 +67,11 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
67 * ,------------------------------------------. ,------------------------------------------. 67 * ,------------------------------------------. ,------------------------------------------.
68 * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | 68 * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 |
69 * |------+------+------+-------+------+------| |------+------+------+------+-------+------| 69 * |------+------+------+-------+------+------| |------+------+------+------+-------+------|
70 * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | 70 * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH|
71 * |------+------+------+-------+------+------| |------+------+------+------+-------+------| 71 * |------+------+------+-------+------+------| |------+------+------+------+-------+------|
72 * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | 72 * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | |
73 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| 73 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------|
74 * | |M_SHFT| | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| 74 * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV|
75 * `------------------------------------------/ / \ \------------------------------------------' 75 * `------------------------------------------/ / \ \------------------------------------------'
76 * | | | | / / \ \ | |M_CODE| | 76 * | | | | / / \ \ | |M_CODE| |
77 * | | | |/ / \ \ | | | | 77 * | | | |/ / \ \ | | | |
diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h
index 7a5587d56..19fb5cd92 100644
--- a/keyboards/lily58/keymaps/ninjonas/config.h
+++ b/keyboards/lily58/keymaps/ninjonas/config.h
@@ -26,6 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26// #define MASTER_RIGHT 26// #define MASTER_RIGHT
27// #define EE_HANDS 27// #define EE_HANDS
28 28
29#define SSD1306OLED
30#define USE_SERIAL_PD2 29#define USE_SERIAL_PD2
31#define TAPPING_FORCE_HOLD \ No newline at end of file 30#define TAPPING_FORCE_HOLD
31
32#define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c"
33#define OLED_DISABLE_TIMEOUT \ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 81436aee3..5ef607564 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 * ,------------------------------------------. ,------------------------------------------. 88 * ,------------------------------------------. ,------------------------------------------.
89 * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | 89 * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 |
90 * |------+------+------+-------+------+------| |------+------+------+------+-------+------| 90 * |------+------+------+-------+------+------| |------+------+------+------+-------+------|
91 * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | 91 * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH|
92 * |------+------+------+-------+------+------| |------+------+------+------+-------+------| 92 * |------+------+------+-------+------+------| |------+------+------+------+-------+------|
93 * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | 93 * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | |
94 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| 94 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------|
95 * |M_SHFT| | | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| 95 * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV|
96 * `------------------------------------------/ / \ \------------------------------------------' 96 * `------------------------------------------/ / \ \------------------------------------------'
97 * | | | | / / \ \ | |M_CODE| | 97 * | | | | / / \ \ | |M_CODE| |
98 * | | | |/ / \ \ | | | | 98 * | | | |/ / \ \ | | | |
@@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
100 */ 100 */
101[_LOWER] = LAYOUT_wrapper( \ 101[_LOWER] = LAYOUT_wrapper( \
102 _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ 102 _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \
103 _______, _______, _______, _________MEDIA_1_________, _______________NAV_1______________, _______, _______, \ 103 _______, _______, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \
104 _______, _______, _______, _________MEDIA_2_________, _______________NAV_2______________, K_LOCK, _______, \ 104 _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \
105 M_SHFT, _______, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ 105 M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \
106 __________________________________, _______, _______, M_CODE, _______ \ 106 __________________________________, _______, _______, M_CODE, _______ \
107 ), 107 ),
108 108
@@ -132,20 +132,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
132 * ,------------------------------------------. ,-----------------------------------------. 132 * ,------------------------------------------. ,-----------------------------------------.
133 * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| 133 * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY|
134 * |-------+------+------+------+------+------| |------+------+------+------+------+------| 134 * |-------+------+------+------+------+------| |------+------+------+------+------+------|
135 * | M_MAKE| | | | | | | | | | | | | 135 * |M_MAKE | | | | | | | | | | | | |
136 * |-------+------+------+------+------+------| |------+------+------+------+------+------| 136 * |-------+------+------+------+------+------| |------+------+------+------+------+------|
137 * | M_VRSN| | | | | |-------. ,-------| | | | | | | 137 * |M_VRSN |M_MALL| | | | |-------. ,-------| | | | | | |
138 * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| 138 * |-------+------+------+------+------+------| | | |------+------+------+------+------+------|
139 * | M_FLSH| | | | | |-------| |-------| | | | | | | 139 * |M_FLSH | | | | | |-------| |-------| | | | | | |
140 * `------------------------------------------/ / \ \-----------------------------------------' 140 * `------------------------------------------/ / \ \-----------------------------------------'
141 * | | | | / / \ \ | | | | 141 * | | | | / / \ \ | | | |
142 * | | | |/ / \ \ | | | | 142 * | | | |/ / \ \ | | | |
143 * `----------------------------' '------''--------------------' 143 * `----------------------------' '------''--------------------'
144 */ 144 */
145[_ADJUST] = LAYOUT_wrapper( \ 145[_ADJUST] = LAYOUT_wrapper( \
146 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ 146 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \
147 M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 147 M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
148 M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 148 M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
149 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ 149 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
150 __________________________________, __________________________________ \ 150 __________________________________, __________________________________ \
151 ), 151 ),
diff --git a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c b/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c
deleted file mode 100644
index 883eaca03..000000000
--- a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c
+++ /dev/null
@@ -1,37 +0,0 @@
1#include QMK_KEYBOARD_H
2#include <stdio.h>
3#include "lily58.h"
4#include "ninjonas.h"
5
6char layer_state_str[24];
7
8const char *read_layer_state(void) {
9 switch (biton32(layer_state))
10 {
11 case _RAISE:
12 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
13 break;
14 case _LOWER:
15 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower");
16 break;
17 case _ADJUST:
18 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
19 break;
20 default:
21 switch (biton32(default_layer_state)) {
22 case _COLEMAK:
23 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak");
24 break;
25 case _DVORAK:
26 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak");
27 break;
28 case _QWERTY:
29 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty");
30 break;
31 default:
32 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
33 }
34 }
35
36 return layer_state_str;
37} \ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk
index 4ea023572..c58266213 100644
--- a/keyboards/lily58/keymaps/ninjonas/rules.mk
+++ b/keyboards/lily58/keymaps/ninjonas/rules.mk
@@ -1,5 +1 @@
1# If you want to change the display of OLED, you need to change here OLED_DRIVER_ENABLE = yes
2SRC += ./lib/glcdfont.c \
3 layer_state_reader.c \
4 ./lib/logo_reader.c \
5 ./lib/keylogger.c \
diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md
index 8db995d4e..4546b164c 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| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| 18 | ALT| | 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| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| 33 | ALT| | 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| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| 48 | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER|
49 `---------------------------------------' `---------------------------------------' 49 `---------------------------------------' `---------------------------------------'
50*/ 50*/
51``` 51```
@@ -54,7 +54,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
54```c 54```c
55/* 55/*
56,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 56,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
57| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | | 57| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | K_MDSH|
58|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 58|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
59| | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| | 59| | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| |
60|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 60|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
@@ -69,11 +69,11 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
69```c 69```c
70/* 70/*
71,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 71,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
72| | | MS_1| MS_U| MS_2| WH_U| | | | | | | | | | 72| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -|
73|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 73|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
74| | | MS_L| MS_D| MS_R| WH_D| | | | | | | | | | 74| ~| !| @| #| $| %| | | | ^| &| *| (| )| _|
75|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 75|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
76| | | | | | | | | | | | | | | | 76| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12|
77`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' 77`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------'
78 | | | | | | | | | | 78 | | | | | | | | | |
79 `---------------------------------------' `---------------------------------------' 79 `---------------------------------------' `---------------------------------------'
@@ -95,35 +95,6 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
95*/ 95*/
96``` 96```
97 97
98### NUMBERS
99```c
100/*
101,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
102| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -|
103|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
104| ~| !| @| #| $| %| | | | ^| &| *| (| )| _|
105|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
106| | | | | | | | | | | | | | | |
107`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------'
108 | | | | | | | | | |
109 `---------------------------------------' `---------------------------------------'
110*/
111```
112
113### FUNCTIONS
114```c
115/*
116,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
117| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12|
118|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
119| | | | | | | | | | | | | | | |
120|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
121| | | | | | | | | | | | | | | |
122`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------'
123 | | | | | | | | | |
124 `---------------------------------------' `---------------------------------------'
125*/
126```
127<!-- 98<!--
128### TEMPLATE 99### TEMPLATE
129```c 100```c
diff --git a/keyboards/pinky/3/keymaps/ninjonas/keymap.c b/keyboards/pinky/3/keymaps/ninjonas/keymap.c
index 4d2412fbf..d2cca1665 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/keymap.c
+++ b/keyboards/pinky/3/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
19// Each layer gets a name for readability, which is then used in the keymap matrix below. 19// Each layer gets a name for readability, which is then used in the keymap matrix below.
20// The underscores don't mean anything - you can have a layer called STUFF or any other name. 20// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -25,110 +25,86 @@
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [_QWERTY] = LAYOUT_wrapper( 26 [_QWERTY] = LAYOUT_wrapper(
27 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 27 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
28 _____________________QWERTY_L1______________________, KC_MPLY, KC_MUTE, _____________________QWERTY_R1______________________,\ 28 _____________________QWERTY_L1______________________, KC_MPLY, KC_MUTE, _____________________QWERTY_R1______________________,
29 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 29 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
30 _____________________QWERTY_L2______________________, T_LBRC, T_RBRC, _____________________QWERTY_R2______________________,\ 30 _____________________QWERTY_L2______________________, T_LBRC, T_RBRC, _____________________QWERTY_R2______________________,
31 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 31 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
32 _____________________QWERTY_L3______________________, LT_RAI, LT_LOW, _____________________QWERTY_R3______________________,\ 32 _____________________QWERTY_L3______________________, LT_RAI, LT_LOW, _____________________QWERTY_R3______________________,
33 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 33 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
34 ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ 34 ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________
35 //`---------------------------------------' `---------------------------------------' 35 //`---------------------------------------' `---------------------------------------'
36 ), 36 ),
37 37
38 [_DVORAK] = LAYOUT_wrapper( 38 [_DVORAK] = LAYOUT_wrapper(
39 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 39 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
40 _____________________DVORAK_L1______________________, KC_MPLY, KC_MUTE, _____________________DVORAK_R1______________________,\ 40 _____________________DVORAK_L1______________________, KC_MPLY, KC_MUTE, _____________________DVORAK_R1______________________,
41 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 41 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
42 _____________________DVORAK_L2______________________, T_LBRC, T_RBRC, _____________________DVORAK_R2______________________,\ 42 _____________________DVORAK_L2______________________, T_LBRC, T_RBRC, _____________________DVORAK_R2______________________,
43 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 43 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
44 _____________________DVORAK_L3______________________, LT_RAI, LT_LOW, _____________________DVORAK_R3______________________,\ 44 _____________________DVORAK_L3______________________, LT_RAI, LT_LOW, _____________________DVORAK_R3______________________,
45 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 45 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
46 ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ 46 ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________
47 //`---------------------------------------' `---------------------------------------' 47 //`---------------------------------------' `---------------------------------------'
48 ), 48 ),
49 49
50 [_COLEMAK] = LAYOUT_wrapper( 50 [_COLEMAK] = LAYOUT_wrapper(
51 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 51 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
52 _____________________COLEMAK_L1_____________________, KC_MPLY, KC_MUTE, _____________________COLEMAK_R1_____________________,\ 52 _____________________COLEMAK_L1_____________________, KC_MPLY, KC_MUTE, _____________________COLEMAK_R1_____________________,
53 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 53 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
54 _____________________COLEMAK_L2_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R2_____________________,\ 54 _____________________COLEMAK_L2_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R2_____________________,
55 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 55 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
56 _____________________COLEMAK_L3_____________________, LT_RAI, LT_LOW, _____________________COLEMAK_R3_____________________,\ 56 _____________________COLEMAK_L3_____________________, LT_RAI, LT_LOW, _____________________COLEMAK_R3_____________________,
57 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 57 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
58 ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ 58 ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________
59 //`---------------------------------------' `---------------------------------------' 59 //`---------------------------------------' `---------------------------------------'
60 ), 60 ),
61 61
62 [_LOWER] = LAYOUT_wrapper( \ 62 [_LOWER] = LAYOUT_wrapper(
63 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 63 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
64 XXXXXXX, XXXXXXX, XXXXXXX, _________MEDIA_1_________, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, XXXXXXX,\ 64 XXXXXXX, XXXXXXX, _________MEDIA_1_________, XXXXXXX, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, K_MDSH,
65 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 65 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
66 XXXXXXX, XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,\ 66 XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,
67 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 67 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
68 M_SHFT, XXXXXXX, XXXXXXX, _________MEDIA_3_________, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, M_ZOOM, M_PYNV,\ 68 M_SHFT, XXXXXXX, _________MEDIA_3_________, XXXXXXX, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, M_ZOOM, M_PYNV,
69 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 69 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
70 __________________________________, _______, _______, M_CODE, _______ \ 70 __________________________________, _______, _______, M_CODE, _______
71 //`---------------------------------------' `---------------------------------------' 71 //`---------------------------------------' `---------------------------------------'
72 ), 72 ),
73 73
74 [_RAISE] = LAYOUT_wrapper( \ 74 [_RAISE] = LAYOUT_wrapper(
75 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 75 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
76 XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\ 76 _____________________NUM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________NUM_RIGHT______________________,
77 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 77 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
78 XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\ 78 _____________________SYM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________SYM_RIGHT______________________,
79 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 79 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
80 _____________________XXXXXXX________________________, _______, _______, _____________________XXXXXXX________________________,\ 80 _____________________FUNC_LEFT______________________, _______, _______, _____________________FUNC_RIGHT_____________________,
81 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 81 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
82 __________________________________, __________________________________ \ 82 __________________________________, __________________________________
83 //`---------------------------------------' `---------------------------------------' 83 //`---------------------------------------' `---------------------------------------'
84 ), 84 ),
85 85
86 [_ADJUST] = LAYOUT_wrapper( \ 86 [_ADJUST] = LAYOUT_wrapper(
87 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 87 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
88 M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,\ 88 M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,
89 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 89 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
90 M_VRSN, _____________________XXXXXXX________________________, XXXXXXX, _____________________XXXXXXX________________________,\ 90 M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,
91 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 91 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
92 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _____________________XXXXXXX________________________,\ 92 M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _____________________XXXXXXX________________________,
93 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 93 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
94 __________________________________, __________________________________ \ 94 __________________________________, __________________________________
95 //`---------------------------------------' `---------------------------------------'
96 ),
97
98 [_NUMBERS] = LAYOUT_wrapper( \
99 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
100 _____________________NUM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________NUM_RIGHT______________________,\
101 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
102 _____________________SYM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________SYM_RIGHT______________________,\
103 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
104 ____________________________________________________, _______, _______, ____________________________________________________,\
105 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
106 __________________________________, __________________________________ \
107 //`---------------------------------------' `---------------------------------------'
108 ),
109
110 [_FUNCTIONS] = LAYOUT_wrapper( \
111 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
112 _____________________FUNC_LEFT______________________, XXXXXXX, XXXXXXX, _____________________FUNC_RIGHT_____________________,\
113 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
114 _____________________XXXXXXX________________________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\
115 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
116 _____________________XXXXXXX________________________, _______, _______, _____________________XXXXXXX________________________,\
117 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
118 __________________________________, __________________________________ \
119 //`---------------------------------------' `---------------------------------------' 95 //`---------------------------------------' `---------------------------------------'
120 ), 96 ),
121 97
122 /* 98 /*
123 [_TEMPLATE] = LAYOUT( \ 99 [_TEMPLATE] = LAYOUT(
124 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 100 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
125 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ 101 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
126 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 102 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
127 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ 103 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
128 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 104 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
129 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ 105 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
130 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 106 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
131 _______, _______, _______, _______, _______, _______, _______, _______ \ 107 _______, _______, _______, _______, _______, _______, _______, _______
132 //`---------------------------------------' `---------------------------------------' 108 //`---------------------------------------' `---------------------------------------'
133 ) 109 )
134 */ 110 */
diff --git a/keyboards/pinky/3/keymaps/ninjonas/rules.mk b/keyboards/pinky/3/keymaps/ninjonas/rules.mk
new file mode 100644
index 000000000..155f56ef9
--- /dev/null
+++ b/keyboards/pinky/3/keymaps/ninjonas/rules.mk
@@ -0,0 +1,2 @@
1MOUSEKEY_ENABLE = no
2LINK_TIME_OPTIMIZATION_ENABLE = yes \ No newline at end of file
diff --git a/users/ninjonas/README.md b/users/ninjonas/README.md
index 82bd5f09a..fb14bfe6c 100644
--- a/users/ninjonas/README.md
+++ b/users/ninjonas/README.md
@@ -6,27 +6,35 @@ See: https://docs.qmk.fm/#/feature_userspace
6- ninjonas [QMK user configuration](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_userspace.md) 6- ninjonas [QMK user configuration](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_userspace.md)
7- On `keymap.c` include `ninjonas.h` 7- On `keymap.c` include `ninjonas.h`
8 ```c 8 ```c
9 #include "ninjonas.h" 9 #include "ninjonas.h"
10 ``` 10 ```
11 11
12## Supported Keyboards
13- [Crkbd ](../../keyboards/crkbd/keymaps/ninjonas)
14- [Hotdox](../../keyboards/hotdox/keymaps/ninjonas)
15- [Pinky3](../../keyboards/pinky/3/keymaps/ninjonas)
16- [Lily58](../../keyboards/lily58/keymaps/ninjonas)
17
12## Features 18## Features
13### [Keys](ninjonas.h#L44) 19### [Keys](ninjonas.h#L40)
14|Code | Description | 20|Code | Description |
15|---|---| 21|---|---|
16|K_LOCK | MacOS shortcut to execute lock command  + ctrl + Q | 22|K_LOCK | MacOS shortcut to execute lock command  + ctrl + Q |
17|K_CSCN | MacOS shortcut to copy a portion of the screen to the clipboard | 23|K_CSCN | MacOS shortcut to copy a portion of the screen to the clipboard |
24|K_MDSH | MacOS shortcut to get em-dash `–` |
25|K_RAPP | MacOS shortcut to switch apps to the right |
26|K_LAPP | MacOS shortcut to switch apps to the left |
18 27
19### [Layers](ninjonas.h#L48) 28### [Layers](ninjonas.h#L47)
20|Code | Description | 29|Code | Description |
21|---|---| 30|---|---|
22|LT_LOW | Tap for ENTER, hold for RAISE | 31|LT_LOW | Tap for ENTER, hold for RAISE |
23|LT_FUNC | Tap for ENTER, hold for FUNCTIONS |
24|LT_RAI | Tap for SPACE, hold for LOWER | 32|LT_RAI | Tap for SPACE, hold for LOWER |
25|LT_NUM | Tap for SPACE, hold for NUMBERS |
26|LT_LOW + LT_RAI | Hold for ADJUST | 33|LT_LOW + LT_RAI | Hold for ADJUST |
27|L_LOWER | Dedicated key to momentarily toggle to use LOWER layer | 34|LM_LOW | Dedicated key to momentarily toggle to use LOWER layer |
35|LM_RAI | Dedicated key to momentarily toggle to use RAISE layer |
28 36
29### [Layout Blocks](ninjonas.h#L57) 37### [Layout Blocks](ninjonas.h#L53)
30Predefined keyboard layout templates to speed up configuring split keyboards 38Predefined keyboard layout templates to speed up configuring split keyboards
31 39
32|Code | Description | 40|Code | Description |
@@ -69,7 +77,7 @@ There's times where you have macros you don't want to share like emails, passwor
69 77
70```c 78```c
71// secrets.c 79// secrets.c
72#include "ninjonas.h" 80#include "ninjonas.h"
73 81
74bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { 82bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
75 switch (keycode) { 83 switch (keycode) {
diff --git a/users/ninjonas/ninjonas.c b/users/ninjonas/ninjonas.c
index 6a77ecf8b..49e12e482 100644
--- a/users/ninjonas/ninjonas.c
+++ b/users/ninjonas/ninjonas.c
@@ -17,52 +17,4 @@
17 17
18layer_state_t layer_state_set_user (layer_state_t state) { 18layer_state_t layer_state_set_user (layer_state_t state) {
19 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); 19 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
20} 20} \ No newline at end of file
21
22// BEGIN: SSD1306OLED
23// SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
24#if defined(KEYBOARD_lily58_rev1) & defined(PROTOCOL_LUFA)
25extern uint8_t is_master;
26
27void matrix_init_user(void) {
28 //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
29 iota_gfx_init(!has_usb()); // turns on the display
30}
31
32// When add source files to SRC in rules.mk, you can use functions.
33const char *read_layer_state(void);
34const char *read_logo(void);
35//void set_keylog(uint16_t keycode, keyrecord_t *record); // Moved to process_records.h
36const char *read_keylog(void);
37const char *read_keylogs(void);
38
39void matrix_scan_user(void) {
40 iota_gfx_task();
41}
42
43void matrix_render_user(struct CharacterMatrix *matrix) {
44 if (is_master) {
45 // If you want to change the display of OLED, you need to change here
46 matrix_write_ln(matrix, read_layer_state());
47 matrix_write_ln(matrix, read_keylog());
48 matrix_write_ln(matrix, read_keylogs());
49 } else {
50 matrix_write(matrix, read_logo());
51 }
52}
53
54void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
55 if (memcmp(dest->display, source->display, sizeof(dest->display))) {
56 memcpy(dest->display, source->display, sizeof(dest->display));
57 dest->dirty = true;
58 }
59}
60
61void iota_gfx_task_user(void) {
62 struct CharacterMatrix matrix;
63 matrix_clear(&matrix);
64 matrix_render_user(&matrix);
65 matrix_update(&display, &matrix);
66}
67#endif
68// END: SSD1306OLED \ No newline at end of file
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h
index 50d7c3680..227534c25 100644
--- a/users/ninjonas/ninjonas.h
+++ b/users/ninjonas/ninjonas.h
@@ -36,23 +36,19 @@
36#define _LOWER 3 36#define _LOWER 3
37#define _RAISE 4 37#define _RAISE 4
38#define _ADJUST 5 38#define _ADJUST 5
39#ifdef KEYBOARD_pinky_3
40 #define _NUMBERS 6
41 #define _FUNCTIONS 7
42#endif
43 39
44// Shortcut Keys 40// Shortcut Keys
45#define K_LOCK LGUI(LCTL(KC_Q)) // Locks screen on MacOS 41#define K_LOCK LGUI(LCTL(KC_Q)) // Locks screen on MacOS
46#define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard 42#define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard
43#define K_MDSH LSFT(LALT(KC_MINS))
44#define K_LAPP SGUI(KC_TAB) //  + Shift + Tab
45#define K_RAPP LGUI(KC_TAB) //  + Tab
47 46
48// Layer Keys 47// Layer Keys
49#define L_LOWER MO(_LOWER) 48#define LM_LOW MO(_LOWER)
49#define LM_RAI MO(_RAISE)
50#define LT_LOW LT(_LOWER, KC_ENT) 50#define LT_LOW LT(_LOWER, KC_ENT)
51#define LT_RAI LT(_RAISE, KC_SPC) 51#define LT_RAI LT(_RAISE, KC_SPC)
52#ifdef KEYBOARD_pinky_3
53 #define LT_NUM LT(_NUMBERS, KC_SPC)
54 #define LT_FUNC LT(_FUNCTIONS, KC_ENT)
55#endif
56 52
57// Layout blocks 53// Layout blocks
58#define _____________________QWERTY_L1______________________ T_TAB, T_Q, T_W, KC_E, KC_R, KC_T 54#define _____________________QWERTY_L1______________________ T_TAB, T_Q, T_W, KC_E, KC_R, KC_T
@@ -105,7 +101,7 @@
105#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN 101#define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN
106 102
107#define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL 103#define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL
108#define ________MOD_RIGHT________ KC_BSPC, KC_DEL, L_LOWER 104#define ________MOD_RIGHT________ KC_BSPC, KC_DEL, LM_LOW
109 105
110// Layout wrappers 106// Layout wrappers
111#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) 107#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
new file mode 100644
index 000000000..837d497ab
--- /dev/null
+++ b/users/ninjonas/oled.c
@@ -0,0 +1,82 @@
1#include QMK_KEYBOARD_H
2#include <stdio.h>
3#include "ninjonas.h"
4
5#ifdef OLED_DRIVER_ENABLE
6
7static uint16_t oled_timer = 0;
8extern uint8_t is_master;
9
10bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
11 if (record->event.pressed) {
12 oled_timer = timer_read();
13 }
14 return true;
15}
16
17void render_default_layer_state(void) {
18 oled_write_P(PSTR("Layout: "), false);
19 switch (biton32(default_layer_state)) {
20 case _COLEMAK:
21 oled_write_P(PSTR("Colemak"), false);
22 break;
23 case _DVORAK:
24 oled_write_P(PSTR("Dvorak"), false);
25 break;
26 case _QWERTY:
27 oled_write_P(PSTR("Qwerty"), false);
28 break;
29 default:
30 oled_write_ln_P(PSTR("Undefined"), false);
31 }
32}
33
34void render_layer_state(void) {
35 oled_write_P(PSTR("\nLayer:"), false);
36 oled_write_P(PSTR(" LOW"), layer_state_is(_LOWER));
37 oled_write_P(PSTR(" RAI"), layer_state_is(_RAISE));
38 oled_write_P(PSTR(" ADJ"), layer_state_is(_ADJUST));
39}
40
41void render_mod_status(uint8_t modifiers) {
42 oled_write_P(PSTR("\nMods: "), false);
43 oled_write_P(PSTR("SHF "), (modifiers & MOD_MASK_SHIFT));
44 oled_write_P(PSTR("CTL "), (modifiers & MOD_MASK_CTRL));
45 oled_write_P(PSTR("ALT "), (modifiers & MOD_MASK_ALT));
46 oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
47}
48
49void render_status(void){
50 render_default_layer_state();
51 render_layer_state();
52 render_mod_status(get_mods()|get_oneshot_mods());
53}
54
55static void render_logo(void) {
56 static const char PROGMEM qmk_logo[] = {
57 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
58 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
59 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
60 0};
61
62 oled_write_P(qmk_logo, false);
63}
64
65void oled_task_user(void) {
66 if (timer_elapsed(oled_timer) > 30000) {
67 oled_off();
68 return;
69 }
70 #ifndef SPLIT_KEYBOARD
71 else { oled_on(); }
72 #endif
73
74 if (is_master) {
75 render_status();
76 } else {
77 render_logo();
78 oled_scroll_left();
79 }
80}
81
82#endif \ No newline at end of file
diff --git a/users/ninjonas/process_records.c b/users/ninjonas/process_records.c
index 1b7958abc..e1960aaa3 100644
--- a/users/ninjonas/process_records.c
+++ b/users/ninjonas/process_records.c
@@ -6,10 +6,15 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true;
6__attribute__((weak)) 6__attribute__((weak))
7bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; } 7bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
8 8
9#ifdef OLED_DRIVER_ENABLE
10__attribute__((weak))
11bool process_record_oled(uint16_t keycode, keyrecord_t *record) { return true; }
12#endif
13
9bool process_record_user(uint16_t keycode, keyrecord_t *record) { 14bool process_record_user(uint16_t keycode, keyrecord_t *record) {
10 if (record->event.pressed) { 15 if (record->event.pressed) {
11 #ifdef SSD1306OLED 16 #ifdef OLED_DRIVER_ENABLE
12 set_keylog(keycode, record); 17 process_record_oled(keycode, record);
13 #endif 18 #endif
14 } 19 }
15 20
@@ -42,6 +47,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
42 } 47 }
43 break; 48 break;
44 49
50 // Sends QMK make command to compile all keyboards
51 case M_MALL:
52 if (record->event.pressed) {
53 SEND_STRING("rm -f *.hex && rm -rf .build/ && make crkbd:ninjonas lily58:ninjonas hotdox:ninjonas pinky/3:ninjonas\n");
54 }
55 break;
56
45 // Sends QMK make command with the correct bootloader 57 // Sends QMK make command with the correct bootloader
46 case M_FLSH: 58 case M_FLSH:
47 if (!record->event.pressed) { 59 if (!record->event.pressed) {
diff --git a/users/ninjonas/process_records.h b/users/ninjonas/process_records.h
index 6db1d91fb..37d88d0ca 100644
--- a/users/ninjonas/process_records.h
+++ b/users/ninjonas/process_records.h
@@ -11,6 +11,7 @@ enum custom_keycodes {
11 M_PYNV, 11 M_PYNV,
12 M_SHFT, 12 M_SHFT,
13 M_MAKE, 13 M_MAKE,
14 M_MALL,
14 M_FLSH, 15 M_FLSH,
15 M_VRSN, 16 M_VRSN,
16 M_CODE, 17 M_CODE,
diff --git a/users/ninjonas/rules.mk b/users/ninjonas/rules.mk
index 1f2697a0e..7b77e153d 100644
--- a/users/ninjonas/rules.mk
+++ b/users/ninjonas/rules.mk
@@ -3,15 +3,10 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
3EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 3EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
4TAP_DANCE_ENABLE = yes # Enable Tap Dance. 4TAP_DANCE_ENABLE = yes # Enable Tap Dance.
5 5
6Link_Time_Optimization = no # if firmware size over limit, try this option
7
8ifeq ($(strip $(Link_Time_Optimization)),yes)
9 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
10endif
11
12SRC += ninjonas.c \ 6SRC += ninjonas.c \
13 process_records.c \ 7 process_records.c \
14 tap_dances.c 8 tap_dances.c \
9 oled.c
15 10
16ifneq ("$(wildcard $(USER_PATH)/secrets.c)","") 11ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
17 SRC += secrets.c 12 SRC += secrets.c
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-19 10:01:25 +0000