diff options
author | Jonas Avellana <14019120+ninjonas@users.noreply.github.com> | 2019-09-25 22:28:06 -0600 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-09-25 21:28:06 -0700 |
commit | ff854565ce012a325ad04b09a7bcb7c8bb9d43c5 (patch) | |
tree | 69d4970d4ea40d49483f232bf404d16f383957ba /keyboards/pinky | |
parent | 2a948e77715f0bd11d4b80315cf84c68890014d4 (diff) |
[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/pinky')
-rw-r--r-- | keyboards/pinky/3/keymaps/ninjonas/README.md | 43 | ||||
-rw-r--r-- | keyboards/pinky/3/keymaps/ninjonas/keymap.c | 90 | ||||
-rw-r--r-- | keyboards/pinky/3/keymaps/ninjonas/rules.mk | 2 |
3 files changed, 42 insertions, 93 deletions
diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md index 8db995d4eb..4546b164c7 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 |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| N| M| ,| .| /| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -30,7 +30,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| ;| Q| J| K| X| Spc/RAI| | Ent/LOW| B| M| W| V| Z| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -45,7 +45,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| K| M| ,| .| /| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -54,7 +54,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co ```c /* ,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | | +| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | K_MDSH| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| @@ -69,11 +69,11 @@ More information about the Pinky3 keyboard can be found [here](https://github.co ```c /* ,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| | | MS_1| MS_U| MS_2| WH_U| | | | | | | | | | +| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | MS_L| MS_D| MS_R| WH_D| | | | | | | | | | +| ~| !| @| #| $| %| | | | ^| &| *| (| )| _| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | +| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' | | | | | | | | | | `---------------------------------------' `---------------------------------------' @@ -95,35 +95,6 @@ More information about the Pinky3 keyboard can be found [here](https://github.co */ ``` -### NUMBERS -```c -/* -,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| ~| !| @| #| $| %| | | | ^| &| *| (| )| _| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | | | | | | | | | | - `---------------------------------------' `---------------------------------------' -*/ -``` - -### FUNCTIONS -```c -/* -,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | | | | | | | | | | - `---------------------------------------' `---------------------------------------' -*/ -``` <!-- ### TEMPLATE ```c diff --git a/keyboards/pinky/3/keymaps/ninjonas/keymap.c b/keyboards/pinky/3/keymaps/ninjonas/keymap.c index 4d2412fbf3..d2cca16657 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/keymap.c +++ b/keyboards/pinky/3/keymaps/ninjonas/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H -#include "ninjonas.h" +#include "ninjonas.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -25,110 +25,86 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _____________________QWERTY_L1______________________, KC_MPLY, KC_MUTE, _____________________QWERTY_R1______________________,\ + _____________________QWERTY_L1______________________, KC_MPLY, KC_MUTE, _____________________QWERTY_R1______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________QWERTY_L2______________________, T_LBRC, T_RBRC, _____________________QWERTY_R2______________________,\ + _____________________QWERTY_L2______________________, T_LBRC, T_RBRC, _____________________QWERTY_R2______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________QWERTY_L3______________________, LT_RAI, LT_LOW, _____________________QWERTY_R3______________________,\ + _____________________QWERTY_L3______________________, LT_RAI, LT_LOW, _____________________QWERTY_R3______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ + ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________ //`---------------------------------------' `---------------------------------------' ), [_DVORAK] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _____________________DVORAK_L1______________________, KC_MPLY, KC_MUTE, _____________________DVORAK_R1______________________,\ + _____________________DVORAK_L1______________________, KC_MPLY, KC_MUTE, _____________________DVORAK_R1______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________DVORAK_L2______________________, T_LBRC, T_RBRC, _____________________DVORAK_R2______________________,\ + _____________________DVORAK_L2______________________, T_LBRC, T_RBRC, _____________________DVORAK_R2______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________DVORAK_L3______________________, LT_RAI, LT_LOW, _____________________DVORAK_R3______________________,\ + _____________________DVORAK_L3______________________, LT_RAI, LT_LOW, _____________________DVORAK_R3______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ + ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________ //`---------------------------------------' `---------------------------------------' ), [_COLEMAK] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _____________________COLEMAK_L1_____________________, KC_MPLY, KC_MUTE, _____________________COLEMAK_R1_____________________,\ + _____________________COLEMAK_L1_____________________, KC_MPLY, KC_MUTE, _____________________COLEMAK_R1_____________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________COLEMAK_L2_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R2_____________________,\ + _____________________COLEMAK_L2_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R2_____________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________COLEMAK_L3_____________________, LT_RAI, LT_LOW, _____________________COLEMAK_R3_____________________,\ + _____________________COLEMAK_L3_____________________, LT_RAI, LT_LOW, _____________________COLEMAK_R3_____________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - ________MOD_LEFT_________, LT_NUM, LT_FUNC, ________MOD_RIGHT________ \ + ________MOD_LEFT_________, K_LAPP, K_RAPP, ________MOD_RIGHT________ //`---------------------------------------' `---------------------------------------' ), - [_LOWER] = LAYOUT_wrapper( \ + [_LOWER] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - XXXXXXX, XXXXXXX, XXXXXXX, _________MEDIA_1_________, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, XXXXXXX,\ + XXXXXXX, XXXXXXX, _________MEDIA_1_________, XXXXXXX, K_CSCN, XXXXXXX, _______________NAV_1______________, XXXXXXX, K_MDSH, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - XXXXXXX, XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX,\ + XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, XXXXXXX, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - M_SHFT, XXXXXXX, XXXXXXX, _________MEDIA_3_________, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, M_ZOOM, M_PYNV,\ + M_SHFT, XXXXXXX, _________MEDIA_3_________, XXXXXXX, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, M_ZOOM, M_PYNV, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - __________________________________, _______, _______, M_CODE, _______ \ + __________________________________, _______, _______, M_CODE, _______ //`---------------------------------------' `---------------------------------------' ), - [_RAISE] = LAYOUT_wrapper( \ + [_RAISE] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\ + _____________________NUM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________NUM_RIGHT______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\ + _____________________SYM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________SYM_RIGHT______________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________XXXXXXX________________________, _______, _______, _____________________XXXXXXX________________________,\ + _____________________FUNC_LEFT______________________, _______, _______, _____________________FUNC_RIGHT_____________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - __________________________________, __________________________________ \ + __________________________________, __________________________________ //`---------------------------------------' `---------------------------------------' ), - [_ADJUST] = LAYOUT_wrapper( \ + [_ADJUST] = LAYOUT_wrapper( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,\ + M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - M_VRSN, _____________________XXXXXXX________________________, XXXXXXX, _____________________XXXXXXX________________________,\ + M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _____________________XXXXXXX________________________,\ + M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _____________________XXXXXXX________________________, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - __________________________________, __________________________________ \ - //`---------------------------------------' `---------------------------------------' - ), - - [_NUMBERS] = LAYOUT_wrapper( \ - //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _____________________NUM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________NUM_RIGHT______________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________SYM_LEFT_______________________, XXXXXXX, XXXXXXX, _____________________SYM_RIGHT______________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - ____________________________________________________, _______, _______, ____________________________________________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - __________________________________, __________________________________ \ - //`---------------------------------------' `---------------------------------------' - ), - - [_FUNCTIONS] = LAYOUT_wrapper( \ - //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _____________________FUNC_LEFT______________________, XXXXXXX, XXXXXXX, _____________________FUNC_RIGHT_____________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________XXXXXXX________________________, XXXXXXX, XXXXXXX, _____________________XXXXXXX________________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _____________________XXXXXXX________________________, _______, _______, _____________________XXXXXXX________________________,\ - //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - __________________________________, __________________________________ \ + __________________________________, __________________________________ //`---------------------------------------' `---------------------------------------' ), /* - [_TEMPLATE] = LAYOUT( \ + [_TEMPLATE] = LAYOUT( //,---------------------------------------------------------------------. ,---------------------------------------------------------------------. - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| - _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______ //`---------------------------------------' `---------------------------------------' ) */ diff --git a/keyboards/pinky/3/keymaps/ninjonas/rules.mk b/keyboards/pinky/3/keymaps/ninjonas/rules.mk new file mode 100644 index 0000000000..155f56ef9f --- /dev/null +++ b/keyboards/pinky/3/keymaps/ninjonas/rules.mk @@ -0,0 +1,2 @@ +MOUSEKEY_ENABLE = no +LINK_TIME_OPTIMIZATION_ENABLE = yes
\ No newline at end of file |