diff options
author | Jonas Avellana <[email protected]> | 2019-09-25 22:28:06 -0600 |
---|---|---|
committer | Drashna Jaelre <[email protected]> | 2019-09-25 21:28:06 -0700 |
commit | ff854565ce012a325ad04b09a7bcb7c8bb9d43c5 (patch) | |
tree | 69d4970d4ea40d49483f232bf404d16f383957ba /keyboards/lily58/keymaps/ninjonas/keymap.c | |
parent | 2a948e77715f0bd11d4b80315cf84c68890014d4 (diff) | |
download | qmk_firmware-ff854565ce012a325ad04b09a7bcb7c8bb9d43c5.tar.gz qmk_firmware-ff854565ce012a325ad04b09a7bcb7c8bb9d43c5.zip |
[Keymap] ninjonas keymap for crkbd & ninjonas userspace updates (#6797)
* [keymap(crkbd)] introducing crkbd keymap on ninjonas profile
* [keymap(crkbd)] introducing crkbd keymap on ninjonas profile
* [refactor(crkbd)] reducing file size by selecting RGB animations
* [refactor(crkbd)] added shiftit key
* [refactor(crkbd)] added shiftit key
* [chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk
* [refactor(crkbd)] added keylog & removed static rainbow RGB
* [feat(crkbd)] introduced em-dash '—' keymap
* [feat(crkbd)] added screenshot functionality
* [refactor(lily58,pinky3)] moving media keys
* [refactor(lily58)] Added emdash key
* [chore] removing NUMBERS & FUNCTIONS layers as they're useless
* [chore] removing NUMBERS & FUNCTIONS layers as they're useless
* [chore(crkbd,lily48)] Updating README.md
* [feat] added K_LAPP & K_RAPP to mimic command + tab
* [feat] added K_LAPP & K_RAPP to mimic command + tab
* [fix(#6797)] resolving changes requested by @drashna
* [fix(#6797)] first cut on using QMK OLED Driver
* [fix(#6797)] cleaning up rules.mk
* [fix(#6797)] making scrolling logo work
* [fix(#6797)] Using OLED Driver for Lily58
* [fix(#6797)] Moved OLED driver implementation to ninjonas userspace
* [fix(#6797)] Bringing back crkbd & lily58 logos
* [fix(#6797)] Turning off OLED based off @drashna's workaround in #5982
* [fix(#6797)] whoops! forgot to checkin crkbd/config.h
* [fix(#6797)] fixing issue with OLED randomly turning on
* [fix(#6797)] using default glcdfont.c for lily58 & crkbd
* [fix(#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLAGS as per code review
* [fix(#6797)] updating M_MALL macro as per code review by @fauxpark
Diffstat (limited to 'keyboards/lily58/keymaps/ninjonas/keymap.c')
-rw-r--r-- | keyboards/lily58/keymaps/ninjonas/keymap.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 81436aee3e..5ef607564e 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] = { * ,------------------------------------------. ,------------------------------------------. * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH| * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * |M_SHFT| | | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_wrapper( \ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ - _______, _______, _______, _________MEDIA_1_________, _______________NAV_1______________, _______, _______, \ - _______, _______, _______, _________MEDIA_2_________, _______________NAV_2______________, K_LOCK, _______, \ - M_SHFT, _______, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ + _______, _______, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ + _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ + M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ __________________________________, _______, _______, M_CODE, _______ \ ), @@ -132,20 +132,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------. ,-----------------------------------------. * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_MAKE| | | | | | | | | | | | | + * |M_MAKE | | | | | | | | | | | | | * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_VRSN| | | | | |-------. ,-------| | | | | | | + * |M_VRSN |M_MALL| | | | |-------. ,-------| | | | | | | * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| - * | M_FLSH| | | | | |-------| |-------| | | | | | | + * |M_FLSH | | | | | |-------| |-------| | | | | | | * `------------------------------------------/ / \ \-----------------------------------------' - * | | | | / / \ \ | | | | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' */ [_ADJUST] = LAYOUT_wrapper( \ EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ __________________________________, __________________________________ \ ), |