aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/README.md2
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/config.h64
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/keymap.c10
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/rgb.c27
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/rules.mk6
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/README.md2
-rw-r--r--keyboards/hotdox/keymaps/ninjonas/keymap.c12
-rw-r--r--keyboards/lily58/keymaps/ninjonas/README.md4
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c8
-rw-r--r--keyboards/pinky/3/keymaps/ninjonas/README.md2
-rw-r--r--keyboards/pinky/3/keymaps/ninjonas/keymap.c6
-rw-r--r--users/ninjonas/README.md25
-rw-r--r--users/ninjonas/ninjonas.h3
-rw-r--r--users/ninjonas/oled.c14
-rw-r--r--users/ninjonas/process_records.c10
-rw-r--r--users/ninjonas/process_records.h14
16 files changed, 115 insertions, 94 deletions
diff --git a/keyboards/crkbd/keymaps/ninjonas/README.md b/keyboards/crkbd/keymaps/ninjonas/README.md
index 24889a221..4d7434fa7 100644
--- a/keyboards/crkbd/keymaps/ninjonas/README.md
+++ b/keyboards/crkbd/keymaps/ninjonas/README.md
@@ -51,7 +51,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
51 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 51 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
52 // , , KC_BRID, Next, VolUp, , PgDn, Left, Down, Right, K_LOCK, 52 // , , KC_BRID, Next, VolUp, , PgDn, Left, Down, Right, K_LOCK,
53 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 53 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
54 // , , , Prev, VolDn, [, ], , , M_CODE, M_ZOOM, M_PYNV, 54 // , , , Prev, VolDn, [, ], , , M_CODE, M_XXX1, M_PYNV,
55 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 55 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
56 // , , , , , 56 // , , , , ,
57 //`---------------------' `---------------------' 57 //`---------------------' `---------------------'
diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h
index ef7ff6c55..5d2144662 100644
--- a/keyboards/crkbd/keymaps/ninjonas/config.h
+++ b/keyboards/crkbd/keymaps/ninjonas/config.h
@@ -32,16 +32,60 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
32 32
33#define TAPPING_FORCE_HOLD 33#define TAPPING_FORCE_HOLD
34 34
35#ifdef RGBLIGHT_ENABLE 35#ifdef RGB_MATRIX_ENABLE
36 #undef RGBLED_NUM 36 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
37 #undef RGBLIGHT_ANIMATIONS // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles 37 #define RGB_MATRIX_HUE_STEP 10
38 #define RGBLIGHT_EFFECT_BREATHING 38 #define RGB_MATRIX_SAT_STEP 10
39 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL 39 #define RGB_MATRIX_VAL_STEP 10
40 #define RGBLED_NUM 27 40 #define RGB_MATRIX_SPD_STEP 10
41 #define RGBLIGHT_LIMIT_VAL 120 41 // #define RGB_MATRIX_KEYPRESSES
42 #define RGBLIGHT_HUE_STEP 10 42 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
43 #define RGBLIGHT_SAT_STEP 17 43
44 #define RGBLIGHT_VAL_STEP 17 44 // BEGIN: Disable RGB Effects
45 //#define DISABLE_RGB_MATRIX_SOLID_COLOR
46 //#define DISABLE_RGB_MATRIX_ALPHAS_MODS
47 //#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
48 #define DISABLE_RGB_MATRIX_BREATHING
49 #define DISABLE_RGB_MATRIX_BAND_SAT
50 #define DISABLE_RGB_MATRIX_BAND_VAL
51 // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
52 #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
53 #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
54 #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
55 #define DISABLE_RGB_MATRIX_CYCLE_ALL
56 #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
57 #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
58 #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
59 #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
60 #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
61 #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
62 #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
63 #define DISABLE_RGB_MATRIX_DUAL_BEACON
64 #define DISABLE_RGB_MATRIX_RAINBOW_BEACON
65 #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
66 #define DISABLE_RGB_MATRIX_RAINDROPS
67 #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
68
69 // BEGIN: RGB_MATRIX_FRAMEBUFFER_EFFECTS
70 #define DISABLE_RGB_MATRIX_TYPING_HEATMAP
71 // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
72 // END: RGB_MATRIX_FRAMEBUFFER_EFFECTS
73
74 // BEGIN: RGB_MATRIX_KEYPRESSES
75 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
76 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE
77 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
78 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
79 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
80 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
81 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
82 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
83 #define DISABLE_RGB_MATRIX_SPLASH
84 #define DISABLE_RGB_MATRIX_MULTISPLASH
85 #define DISABLE_RGB_MATRIX_SOLID_SPLASH
86 #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
87 // END: RGB_MATRIX_KEYPRESSES
88 // END: Disable RGB Effects
45#endif 89#endif
46 90
47#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" 91#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c
index 6d19345c4..21f83cc78 100644
--- a/keyboards/crkbd/keymaps/ninjonas/keymap.c
+++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 40
41 [_LOWER] = LAYOUT_wrapper( 41 [_LOWER] = LAYOUT_wrapper(
42 //,----------------------------------------------------. ,----------------------------------------------------. 42 //,----------------------------------------------------. ,----------------------------------------------------.
43 XXXXXXX, XXXXXXX, _________MEDIA_1_________, K_CSCN, _______________NAV_1______________, XXXXXXX, K_MDSH, 43 M_XXX2, M_XXX3, _________MEDIA_1_________, K_CSCN, _______________NAV_1______________, XXXXXXX, K_MDSH,
44 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 44 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
45 XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX, 45 M_XXX4, M_XXX5, _________MEDIA_2_________, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,
46 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 46 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
47 _______, M_SHFT, _________MEDIA_3_________, T_LBRC, T_RBRC, _______, XXXXXXX, M_CODE, M_ZOOM, M_PYNV, 47 KC_LSFT, M_SHFT, _________MEDIA_3_________, T_LBRC, T_RBRC, KC_M, XXXXXXX, M_CODE, M_XXX1, M_PYNV,
48 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 48 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
49 _______,_______,_______, _______,_______,_______ 49 _______,_______,_______, _______,_______,_______
50 //`---------------------' `---------------------' 50 //`---------------------' `---------------------'
@@ -66,9 +66,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 //,----------------------------------------------------. ,----------------------------------------------------. 66 //,----------------------------------------------------. ,----------------------------------------------------.
67 M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, 67 M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,
68 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 68 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
69 M_VRSN, M_MALL, XXXXXXX, RGB_SAI, RGB_HUI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 69 M_VRSN, M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
70 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 70 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
71 M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX, 71 M_FLSH, XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
72 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| 72 //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
73 _______,_______,_______, _______,_______,_______ 73 _______,_______,_______, _______,_______,_______
74 //`---------------------' `---------------------' 74 //`---------------------' `---------------------'
diff --git a/keyboards/crkbd/keymaps/ninjonas/rgb.c b/keyboards/crkbd/keymaps/ninjonas/rgb.c
deleted file mode 100644
index f9ac3a861..000000000
--- a/keyboards/crkbd/keymaps/ninjonas/rgb.c
+++ /dev/null
@@ -1,27 +0,0 @@
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
index 92e18ed6e..95cc3fed3 100644
--- a/keyboards/crkbd/keymaps/ninjonas/rules.mk
+++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -1,11 +1,7 @@
1RGBLIGHT_ENABLE = yes 1RGB_MATRIX_ENABLE = WS2812
2MOUSEKEY_ENABLE = no 2MOUSEKEY_ENABLE = no
3OLED_DRIVER_ENABLE = yes 3OLED_DRIVER_ENABLE = yes
4LINK_TIME_OPTIMIZATION_ENABLE = yes 4LINK_TIME_OPTIMIZATION_ENABLE = yes
5 5
6# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 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 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/README.md b/keyboards/hotdox/keymaps/ninjonas/README.md
index b289651a8..5cbfacf9f 100644
--- a/keyboards/hotdox/keymaps/ninjonas/README.md
+++ b/keyboards/hotdox/keymaps/ninjonas/README.md
@@ -43,7 +43,7 @@ This keymap is designed based off my typing habits and is subject to change. Inf
43 * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| 43 * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
44 * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | 44 * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = |
45 * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' 45 * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
46 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_ZOOM|M_PYNV| 46 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
47 * `----------------------------------' `----------------------------------' 47 * `----------------------------------' `----------------------------------'
48 * ,-------------. ,-------------. 48 * ,-------------. ,-------------.
49 * | Up | Down | | Left | Right| 49 * | Up | Down | | Left | Right|
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
index 248a4320a..7a505b4e1 100644
--- a/keyboards/hotdox/keymaps/ninjonas/keymap.c
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28 * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------| 28 * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
29 * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = | 29 * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = |
30 * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------' 30 * `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
31 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_ZOOM|M_PYNV| 31 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
32 * `----------------------------------' `----------------------------------' 32 * `----------------------------------' `----------------------------------'
33 * ,-------------. ,-------------. 33 * ,-------------. ,-------------.
34 * | Up | Down | | Left | Right| 34 * | Up | Down | | Left | Right|
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
56 KC_NO, _____________________QWERTY_R1______________________, 56 KC_NO, _____________________QWERTY_R1______________________,
57 _____________________QWERTY_R2______________________, 57 _____________________QWERTY_R2______________________,
58 T_RBRC, _____________________QWERTY_R3______________________, 58 T_RBRC, _____________________QWERTY_R3______________________,
59 ________MOD_RIGHT________, M_ZOOM, M_PYNV, 59 ________MOD_RIGHT________, M_XXX1, M_PYNV,
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_ZOOM|M_PYNV| 78 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
79 * `----------------------------------' `----------------------------------' 79 * `----------------------------------' `----------------------------------'
80 * ,-------------. ,-------------. 80 * ,-------------. ,-------------.
81 * | Up | Down | | Left | Right| 81 * | Up | Down | | Left | Right|
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
103 KC_NO, _____________________DVORAK_R1______________________, 103 KC_NO, _____________________DVORAK_R1______________________,
104 _____________________DVORAK_R2______________________, 104 _____________________DVORAK_R2______________________,
105 T_RBRC, _____________________DVORAK_R3______________________, 105 T_RBRC, _____________________DVORAK_R3______________________,
106 ________MOD_RIGHT________, M_ZOOM, M_PYNV, 106 ________MOD_RIGHT________, M_XXX1, M_PYNV,
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_ZOOM|M_PYNV| 125 * |M_SHFT| | Alt |  | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
126 * `----------------------------------' `----------------------------------' 126 * `----------------------------------' `----------------------------------'
127 * ,-------------. ,-------------. 127 * ,-------------. ,-------------.
128 * | Up | Down | | Left | Right| 128 * | Up | Down | | Left | Right|
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
150 KC_NO, _____________________COLEMAK_R1_____________________, 150 KC_NO, _____________________COLEMAK_R1_____________________,
151 _____________________COLEMAK_R2_____________________, 151 _____________________COLEMAK_R2_____________________,
152 T_RBRC, _____________________COLEMAK_R3_____________________, 152 T_RBRC, _____________________COLEMAK_R3_____________________,
153 ________MOD_RIGHT________, M_ZOOM, M_PYNV, 153 ________MOD_RIGHT________, M_XXX1, M_PYNV,
154 // RIGHT THUMB 154 // RIGHT THUMB
155 KC_LEFT, KC_RGHT, 155 KC_LEFT, KC_RGHT,
156 KC_PGUP, 156 KC_PGUP,
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index ef6322db4..862252840 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -3,8 +3,6 @@
3## Keymap 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). 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 5
6> Make sure you update QMK's lily58 config.h TAPPING_TERM to 200ms or this won't compile
7
8More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342) 6More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342)
9 7
10### QWERTY 8### QWERTY
@@ -71,7 +69,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
71 * |------+------+------+-------+------+------| |------+------+------+------+-------+------| 69 * |------+------+------+-------+------+------| |------+------+------+------+-------+------|
72 * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | 70 * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | |
73 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| 71 * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------|
74 * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| 72 * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | | |M_PYNV|
75 * `------------------------------------------/ / \ \------------------------------------------' 73 * `------------------------------------------/ / \ \------------------------------------------'
76 * | | | | / / \ \ | |M_CODE| | 74 * | | | | / / \ \ | |M_CODE| |
77 * | | | |/ / \ \ | | | | 75 * | | | |/ / \ \ | | | |
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 5ef607564..6c6a41b3b 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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 | | | |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______________, _______, K_MDSH, \ 103 M_XXX2, M_XXX3, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \
104 _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ 104 M_XXX4, M_XXX5, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \
105 M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ 105 _______, M_SHFT, _________MEDIA_3_________, _______, _______, _______, _______, KC_M, _______, _______, M_XXX1, M_PYNV, \
106 __________________________________, _______, _______, M_CODE, _______ \ 106 __________________________________, _______, _______, M_CODE, _______ \
107 ), 107 ),
108 108
diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md
index 4546b164c..d47fdd995 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/README.md
+++ b/keyboards/pinky/3/keymaps/ninjonas/README.md
@@ -58,7 +58,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
58|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 58|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
59| | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| | 59| | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| |
60|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 60|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
61| M_SHFT| | | | Prev| VolDn| | | | | | | | M_ZOOM| M_PYNV| 61| M_SHFT| | | | Prev| VolDn| | | | | | | | | M_PYNV|
62`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' 62`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------'
63 | | | | | | | | M_CODE| | 63 | | | | | | | | M_CODE| |
64 `---------------------------------------' `---------------------------------------' 64 `---------------------------------------' `---------------------------------------'
diff --git a/keyboards/pinky/3/keymaps/ninjonas/keymap.c b/keyboards/pinky/3/keymaps/ninjonas/keymap.c
index d2cca1665..b7d9f2fa7 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/keymap.c
+++ b/keyboards/pinky/3/keymaps/ninjonas/keymap.c
@@ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
61 61
62 [_LOWER] = LAYOUT_wrapper( 62 [_LOWER] = LAYOUT_wrapper(
63 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. 63 //,---------------------------------------------------------------------. ,---------------------------------------------------------------------.
64 XXXXXXX, XXXXXXX, _________MEDIA_1_________, XXXXXXX, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, K_MDSH, 64 M_XXX2, M_XXX3, _________MEDIA_1_________, XXXXXXX, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, K_MDSH,
65 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 65 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
66 XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX, 66 M_XXX4, M_XXX5, _________MEDIA_2_________, XXXXXXX, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,
67 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 67 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
68 M_SHFT, XXXXXXX, _________MEDIA_3_________, XXXXXXX, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, M_ZOOM, M_PYNV, 68 XXXXXXX, M_SHFT, _________MEDIA_3_________, XXXXXXX, _______, _______, XXXXXXX, KC_M, XXXXXXX, XXXXXXX, M_XXX1, M_PYNV,
69 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| 69 //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
70 __________________________________, _______, _______, M_CODE, _______ 70 __________________________________, _______, _______, M_CODE, _______
71 //`---------------------------------------' `---------------------------------------' 71 //`---------------------------------------' `---------------------------------------'
diff --git a/users/ninjonas/README.md b/users/ninjonas/README.md
index fb14bfe6c..32ccdc699 100644
--- a/users/ninjonas/README.md
+++ b/users/ninjonas/README.md
@@ -16,7 +16,7 @@ See: https://docs.qmk.fm/#/feature_userspace
16- [Lily58](../../keyboards/lily58/keymaps/ninjonas) 16- [Lily58](../../keyboards/lily58/keymaps/ninjonas)
17 17
18## Features 18## Features
19### [Keys](ninjonas.h#L40) 19### [Keys](ninjonas.h#L37)
20|Code | Description | 20|Code | Description |
21|---|---| 21|---|---|
22|K_LOCK | MacOS shortcut to execute lock command  + ctrl + Q | 22|K_LOCK | MacOS shortcut to execute lock command  + ctrl + Q |
@@ -25,7 +25,7 @@ See: https://docs.qmk.fm/#/feature_userspace
25|K_RAPP | MacOS shortcut to switch apps to the right | 25|K_RAPP | MacOS shortcut to switch apps to the right |
26|K_LAPP | MacOS shortcut to switch apps to the left | 26|K_LAPP | MacOS shortcut to switch apps to the left |
27 27
28### [Layers](ninjonas.h#L47) 28### [Layers](ninjonas.h#L44)
29|Code | Description | 29|Code | Description |
30|---|---| 30|---|---|
31|LT_LOW | Tap for ENTER, hold for RAISE | 31|LT_LOW | Tap for ENTER, hold for RAISE |
@@ -34,7 +34,7 @@ See: https://docs.qmk.fm/#/feature_userspace
34|LM_LOW | 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 | 35|LM_RAI | Dedicated key to momentarily toggle to use RAISE layer |
36 36
37### [Layout Blocks](ninjonas.h#L53) 37### [Layout Blocks](ninjonas.h#L50)
38Predefined keyboard layout templates to speed up configuring split keyboards 38Predefined keyboard layout templates to speed up configuring split keyboards
39 39
40|Code | Description | 40|Code | Description |
@@ -59,6 +59,7 @@ Predefined keyboard layout templates to speed up configuring split keyboards
59|M_VRSN | macro to send QMK version | 59|M_VRSN | macro to send QMK version |
60|M_SHFT | Sends  + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) | 60|M_SHFT | Sends  + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) |
61|M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory | 61|M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory |
62|M_XXX1 to M_XXX5 | Reserved for secret macros see [Secrets](#secrets) |
62 63
63### [Tap-Dance](tap_dances.h) 64### [Tap-Dance](tap_dances.h)
64|Code | Description | 65|Code | Description |
@@ -73,21 +74,29 @@ Predefined keyboard layout templates to speed up configuring split keyboards
73|T_Q | Tap for Q, double tap for  + Q | 74|T_Q | Tap for Q, double tap for  + Q |
74 75
75### Secrets 76### Secrets
76There's times where you have macros you don't want to share like emails, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used. 77There's times where you have macros you don't want to share like emails, an address you need but you always forget, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used.
77 78
78```c 79```c
79// secrets.c 80// secrets.c
80#include "ninjonas.h" 81#include "ninjonas.h"
82
83static const char * const secret[] = {
84 "BLANK1",
85 "BLANK2",
86 "BLANK3",
87 "BLANK4",
88 "BLANK5"
89};
81 90
82bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { 91bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
83 switch (keycode) { 92 switch (keycode) {
84 // Sends zoom URL 93 case M_XXX1...M_XXX5:
85 case M_ZOOM:
86 if (record->event.pressed) { 94 if (record->event.pressed) {
87 SEND_STRING("SECRET_STRING_HERE" SS_TAP(X_ENTER)); 95 send_string(secret[keycode - M_XXX1]);
88 } 96 }
89 break; 97 break;
90 } 98 }
91 return true; 99 return true;
92} 100}
101
93``` \ No newline at end of file 102``` \ No newline at end of file
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h
index 227534c25..fdba68370 100644
--- a/users/ninjonas/ninjonas.h
+++ b/users/ninjonas/ninjonas.h
@@ -26,9 +26,6 @@
26 #include "lufa.h" 26 #include "lufa.h"
27 #include "split_util.h" 27 #include "split_util.h"
28#endif 28#endif
29#ifdef SSD1306OLED
30 #include "ssd1306.h"
31#endif
32 29
33#define _QWERTY 0 30#define _QWERTY 0
34#define _DVORAK 1 31#define _DVORAK 1
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index 837d497ab..8a9c99593 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -7,10 +7,10 @@
7static uint16_t oled_timer = 0; 7static uint16_t oled_timer = 0;
8extern uint8_t is_master; 8extern uint8_t is_master;
9 9
10bool process_record_oled(uint16_t keycode, keyrecord_t *record) { 10bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
11 if (record->event.pressed) { 11 if (record->event.pressed) {
12 oled_timer = timer_read(); 12 oled_timer = timer_read();
13 } 13 }
14 return true; 14 return true;
15} 15}
16 16
@@ -48,6 +48,7 @@ void render_mod_status(uint8_t modifiers) {
48 48
49void render_status(void){ 49void render_status(void){
50 render_default_layer_state(); 50 render_default_layer_state();
51 oled_write_P(PSTR("\n"), false);
51 render_layer_state(); 52 render_layer_state();
52 render_mod_status(get_mods()|get_oneshot_mods()); 53 render_mod_status(get_mods()|get_oneshot_mods());
53} 54}
@@ -70,12 +71,13 @@ void oled_task_user(void) {
70 #ifndef SPLIT_KEYBOARD 71 #ifndef SPLIT_KEYBOARD
71 else { oled_on(); } 72 else { oled_on(); }
72 #endif 73 #endif
73 74
74 if (is_master) { 75 if (is_master) {
75 render_status(); 76 render_status();
76 } else { 77 } else {
77 render_logo(); 78 oled_write_P(PSTR("\n"), false);
78 oled_scroll_left(); 79 render_logo();
80 oled_scroll_left();
79 } 81 }
80} 82}
81 83
diff --git a/users/ninjonas/process_records.c b/users/ninjonas/process_records.c
index e1960aaa3..6ec5be597 100644
--- a/users/ninjonas/process_records.c
+++ b/users/ninjonas/process_records.c
@@ -12,18 +12,16 @@ bool process_record_oled(uint16_t keycode, keyrecord_t *record) { return true; }
12#endif 12#endif
13 13
14bool process_record_user(uint16_t keycode, keyrecord_t *record) { 14bool process_record_user(uint16_t keycode, keyrecord_t *record) {
15 if (record->event.pressed) { 15 #ifdef OLED_DRIVER_ENABLE
16 #ifdef OLED_DRIVER_ENABLE 16 process_record_oled(keycode, record);
17 process_record_oled(keycode, record); 17 #endif
18 #endif
19 }
20 18
21 switch (keycode) { 19 switch (keycode) {
22 20
23 // Sends pyenv to activate 'jira' environment 21 // Sends pyenv to activate 'jira' environment
24 case M_PYNV: 22 case M_PYNV:
25 if (record->event.pressed) { 23 if (record->event.pressed) {
26 SEND_STRING("pyenv activate jira" SS_TAP(X_ENTER)); 24 SEND_STRING("pyenv activate jira\n");
27 } 25 }
28 break; 26 break;
29 27
diff --git a/users/ninjonas/process_records.h b/users/ninjonas/process_records.h
index 37d88d0ca..07babdd58 100644
--- a/users/ninjonas/process_records.h
+++ b/users/ninjonas/process_records.h
@@ -7,7 +7,6 @@ enum custom_keycodes {
7 DVORAK, 7 DVORAK,
8 COLEMAK, 8 COLEMAK,
9 // Custom Macros 9 // Custom Macros
10 M_ZOOM,
11 M_PYNV, 10 M_PYNV,
12 M_SHFT, 11 M_SHFT,
13 M_MAKE, 12 M_MAKE,
@@ -15,11 +14,16 @@ enum custom_keycodes {
15 M_FLSH, 14 M_FLSH,
16 M_VRSN, 15 M_VRSN,
17 M_CODE, 16 M_CODE,
17 // Secret Macros
18 M_XXX1,
19 M_XXX2,
20 M_XXX3,
21 M_XXX4,
22 M_XXX5,
18}; 23};
19 24
20#ifdef SSD1306OLED
21void set_keylog(uint16_t keycode, keyrecord_t *record);
22#endif
23
24bool process_record_secrets(uint16_t keycode, keyrecord_t *record); 25bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
25bool process_record_keymap(uint16_t keycode, keyrecord_t *record); 26bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
27#ifdef OLED_DRIVER_ENABLE
28bool process_record_oled(uint16_t keycode, keyrecord_t *record);
29#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 19:41:39 +0000