[keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace (#8053)
* [keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace and keyboards * [fix(#8053)] removed redundant code based off Duckle29's code review * [fix(#8053)] fixing typos * [refactor(#8053)] updating oled timeout * [fix(8053) resolved code review issues identified by noroadsleft
This commit is contained in:
parent
fdabf524f2
commit
1aee492c0f
12 changed files with 468 additions and 72 deletions
|
@ -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"
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* QWERTY
|
||||
|
@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = |
|
||||
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
|
||||
* |M_SHFT| | Alt | | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
|
||||
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | Up | Down | | Left | Right|
|
||||
|
@ -41,10 +41,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_QWERTY] = LAYOUT_ergodox_wrapper(
|
||||
// LEFT HAND
|
||||
_____________________NUM_LEFT_______________________, KC_MPLY,
|
||||
_____________________QWERTY_L1______________________, KC_NO,
|
||||
_____________________QWERTY_L1______________________, XXXXXXX,
|
||||
_____________________QWERTY_L2______________________,
|
||||
_____________________QWERTY_L3______________________, T_LBRC,
|
||||
M_SHFT, KC_NO, ________MOD_LEFT_________,
|
||||
XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
|
||||
// LEFT THUMB
|
||||
KC_UP, KC_DOWN,
|
||||
KC_HOME,
|
||||
|
@ -53,10 +53,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//RIGHT HAND
|
||||
K_LOCK, _____________________NUM_RIGHT______________________,
|
||||
KC_NO, _____________________QWERTY_R1______________________,
|
||||
XXXXXXX,_____________________QWERTY_R1______________________,
|
||||
_____________________QWERTY_R2______________________,
|
||||
T_RBRC, _____________________QWERTY_R3______________________,
|
||||
________MOD_RIGHT________, M_XXX1, M_PYNV,
|
||||
________MOD_RIGHT________, XXXXXXX, XXXXXXX,
|
||||
// RIGHT THUMB
|
||||
KC_LEFT, KC_RGHT,
|
||||
KC_PGUP,
|
||||
|
@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | = |
|
||||
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
|
||||
* |M_SHFT| | Alt | | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
|
||||
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | Up | Down | | Left | Right|
|
||||
|
@ -88,10 +88,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_DVORAK] = LAYOUT_ergodox_wrapper(
|
||||
// LEFT HAND
|
||||
_____________________NUM_LEFT_______________________, KC_MPLY,
|
||||
_____________________DVORAK_L1______________________, KC_NO,
|
||||
_____________________DVORAK_L1______________________, XXXXXXX,
|
||||
_____________________DVORAK_L2______________________,
|
||||
_____________________DVORAK_L3______________________, T_LBRC,
|
||||
M_SHFT, KC_NO, ________MOD_LEFT_________,
|
||||
XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
|
||||
// LEFT THUMB
|
||||
KC_UP, KC_DOWN,
|
||||
KC_HOME,
|
||||
|
@ -100,10 +100,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//RIGHT HAND
|
||||
K_LOCK, _____________________NUM_RIGHT______________________,
|
||||
KC_NO, _____________________DVORAK_R1______________________,
|
||||
XXXXXXX,_____________________DVORAK_R1______________________,
|
||||
_____________________DVORAK_R2______________________,
|
||||
T_RBRC, _____________________DVORAK_R3______________________,
|
||||
________MOD_RIGHT________, M_XXX1, M_PYNV,
|
||||
________MOD_RIGHT________, XXXXXXX, XXXXXXX,
|
||||
// RIGHT THUMB
|
||||
KC_LEFT, KC_RGHT,
|
||||
KC_PGUP,
|
||||
|
@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | K | M | , | . | / | = |
|
||||
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
|
||||
* |M_SHFT| | Alt | | Ctl | | BkSP | Del |LOWER |M_XXX1|M_PYNV|
|
||||
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | Up | Down | | Left | Right|
|
||||
|
@ -135,10 +135,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_COLEMAK] = LAYOUT_ergodox_wrapper(
|
||||
// LEFT HAND
|
||||
_____________________NUM_LEFT_______________________, KC_MPLY,
|
||||
_____________________COLEMAK_L1_____________________, KC_NO,
|
||||
_____________________COLEMAK_L1_____________________, XXXXXXX,
|
||||
_____________________COLEMAK_L2_____________________,
|
||||
_____________________COLEMAK_L3_____________________, T_LBRC,
|
||||
M_SHFT, KC_NO, ________MOD_LEFT_________,
|
||||
XXXXXXX, XXXXXXX, ________MOD_LEFT_________,
|
||||
// LEFT THUMB
|
||||
KC_UP, KC_DOWN,
|
||||
KC_HOME,
|
||||
|
@ -147,10 +147,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//RIGHT HAND
|
||||
K_LOCK, _____________________NUM_RIGHT______________________,
|
||||
KC_NO, _____________________COLEMAK_R1_____________________,
|
||||
XXXXXXX,_____________________COLEMAK_R1_____________________,
|
||||
_____________________COLEMAK_R2_____________________,
|
||||
T_RBRC, _____________________COLEMAK_R3_____________________,
|
||||
________MOD_RIGHT________, M_XXX1, M_PYNV,
|
||||
________MOD_RIGHT________, XXXXXXX, XXXXXXX,
|
||||
// RIGHT THUMB
|
||||
KC_LEFT, KC_RGHT,
|
||||
KC_PGUP,
|
||||
|
@ -163,11 +163,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* ,--------------------------------------------------. ,----------------------------------------------------.
|
||||
* | F11 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F12 |
|
||||
* |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
|
||||
* | | | |KC_BRU| Play | Mute | | | | PgUp | Home | Up | End | | |
|
||||
* | | |KC_BRU| Play | Mute | | | | | PgUp | Home | Up | End | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
|
||||
* | | | |KC_BRD| Next |VolUp |------| |-------| PgDn | Left | Down |Right |K_LOCK | |
|
||||
* | | |KC_BRD| Next |VolUp | |------| |-------| PgDn | Left | Down |Right |K_LOCK | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
|
||||
* | | | | | Prev |VolDn | | | | | | | | | |
|
||||
* | | | | Prev |VolDn | | | | | | | | | | |
|
||||
* `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
|
||||
* | | | | | | | | | |M_CODE | |
|
||||
* `----------------------------------' `-----------------------------------'
|
||||
|
@ -182,9 +182,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_LOWER] = LAYOUT_ergodox_wrapper(
|
||||
//LEFT HAND
|
||||
_____________________FUNC_LEFT______________________, _______,
|
||||
_______, _______, _______, _________MEDIA_1_________, _______,
|
||||
_______, _______, _______, _________MEDIA_2_________,
|
||||
_______, _______, _______, _________MEDIA_3_________, _______,
|
||||
_____________________LOWER_L1_______________________, _______,
|
||||
_____________________LOWER_L2_______________________,
|
||||
_____________________LOWER_L3_______________________, _______,
|
||||
_______, _______, _______, _______, _______,
|
||||
// LEFT THUMB
|
||||
_______, _______,
|
||||
|
@ -194,9 +194,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
//RIGHT HAND
|
||||
_______, _____________________FUNC_RIGHT_____________________,
|
||||
_______, _______________NAV_1______________, _______, _______,
|
||||
_______________NAV_2______________, K_LOCK, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _____________________LOWER_R1_______________________,
|
||||
_____________________LOWER_R2_______________________,
|
||||
_______, _____________________LOWER_R3_______________________,
|
||||
_______, _______, _______, M_CODE, _______,
|
||||
// RIGHT THUMB
|
||||
_______, _______,
|
||||
|
@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
/* RAISE
|
||||
*
|
||||
* ,--------------------------------------------------. ,----------------------------------------------------.
|
||||
* | | | | |K_CSCN| | | | | | | | | | |
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
|
||||
* | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
|
||||
|
@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
*/
|
||||
[_RAISE] = LAYOUT_ergodox_wrapper(
|
||||
//LEFT HAND
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_CSCN, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, _____________MOUSE_2______________,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
|
@ -255,11 +255,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
/* ADJUST
|
||||
*
|
||||
* ,--------------------------------------------------. ,----------------------------------------------------.
|
||||
* | | | | | | | | | | | | |COLMAK|DVORAK |QWERTY |
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------|
|
||||
* | M_MAKE | | | | | | | | | | | | | | |
|
||||
* | M_MAKE |RESET | | | | | | | | | | |COLMAK|DVORAK |QWERTY |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
|
||||
* | M_VRSN | | | | | |------| |-------| | | | | | |
|
||||
* | M_VRSN |M_MALL| | | | |------| |-------| | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------|
|
||||
* | M_FLSH | | | | | | | | | | | | | | |
|
||||
* `--------+------+------+------+------+-------------' `--------------+------+------+------+-------+--------'
|
||||
|
@ -276,9 +276,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_ADJUST] = LAYOUT_ergodox_wrapper(
|
||||
//LEFT HAND
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
_____________________ADJUST_L1______________________, XXXXXXX,
|
||||
_____________________ADJUST_L1______________________,
|
||||
_____________________ADJUST_L1______________________, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// LEFT THUMB
|
||||
_______, _______,
|
||||
|
@ -287,10 +287,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
_______,
|
||||
|
||||
//RIGHT HAND
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, _____________________ADJUST_R1______________________,
|
||||
_____________________ADJUST_R1______________________,
|
||||
XXXXXXX, _____________________ADJUST_R1______________________,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// RIGHT THUMB
|
||||
_______, _______,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue