ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Keymap] ninjonas keymap updates (#8170)

Browse source 
* [keymap] ninjonas keymap updates

* [refactor(kyria)] updating keymap for numpad layer to be transparent rather than ignores

* [keymap(lily58)] added numpad layer

* [keymap(crkbd)] added numpad layer activated through tapdance

* [fix(8170)] fixing code review changes requested by noroadsleft

* [fix(8170)] updating comments and .md files to use 'Cmd' instead of  and ⌘
This commit is contained in:
Jonas Avellana 2020-02-17 02:30:03 -07:00 • committed by GitHub
parent 5e79da9f32
commit 79e6b78669
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 378 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

112
keyboards/lily58/keymaps/ninjonas/keymap.c
View file

@ -28,16 +28,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_QWERTY] = LAYOUT_wrapper(
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
_____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, \
_____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, \
_____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, \
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
_____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
_____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
_____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________,
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* DVORAK
@ -50,16 +50,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_DVORAK] = LAYOUT_wrapper(
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
_____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, \
_____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, \
_____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, \
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
_____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
_____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
_____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________,
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* COLEMAK
@ -72,16 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_COLEMAK] = LAYOUT_wrapper(
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
_____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, \
_____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, \
_____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, \
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
_____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
_____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
_____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
_____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________,
_____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* LOWER
@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_LOWER] = LAYOUT_wrapper( \
_____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \
_____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, \
_____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, \
_____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, \
__________________________________, _______, _______, M_CODE, _______ \
_____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________,
_____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________,
_____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________,
_____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________,
__________________________________, _______, _______, M_CODE, _______
),
/* RAISE
@ -121,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_RAISE] = LAYOUT_wrapper( \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
__________________________________, __________________________________ \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
__________________________________, __________________________________
),
/* ADJUST
@ -143,10 +143,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_ADJUST] = LAYOUT_wrapper( \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
_____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, \
_____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, \
_____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,\
__________________________________, __________________________________ \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________,
_____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________,
_____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,
__________________________________, __________________________________
),
};
/* TEMPLATE
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |-------. ,-------| | | | | | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | | | | / / \ \ | | | |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_NUMPAD] = LAYOUT_wrapper( \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________,
_______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________,
_______, _______, _______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________,
__________________________________, __________________________________
),
};
/* TEMPLATE
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | |-------. ,-------| | | | | | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | | | | / / \ \ | | | |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*
[_TEMPLATE] = LAYOUT_wrapper( \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
__________________________________, __________________________________
),
*/