[Keymap] ninjonas keymap updates (#8170)

* [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
20 changed files with 378 additions and 80 deletions

View File

@@ -14,7 +14,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// LShift, Z, X, C, V, B, N, M, ,, ., /, =
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// , Ctrl, Space, Enter, BackSP, Del
// Cmd, Ctrl, Space, Enter, BackSP, Del
//`---------------------' `---------------------'
```
@@ -27,7 +27,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// LShift, ;, Q, J, K, X, B, M, W, V, Z, =
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// , Ctrl, Space, Enter, BackSP, Del
// Cmd, Ctrl, Space, Enter, BackSP, Del
//`---------------------' `---------------------'
```
@@ -40,7 +40,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// LShift, Z, X, C, V, B, K, M, ,, ., /, =
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
// , Ctrl, Space, Enter, BackSP, Del
// Cmd, Ctrl, Space, Enter, BackSP, Del
//`---------------------' `---------------------'
```

View File

@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define TAPPING_TERM 200
#define TAPPING_TERM 300
#define MASTER_LEFT

View File

@@ -73,6 +73,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______,_______, _______,_______,_______
//`---------------------' `---------------------'
),
[_NUMPAD] = LAYOUT_wrapper( \
//,----------------------------------------------------. ,----------------------------------------------------.
_______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
_______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
_______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
_______,_______,_______, _______,_______,_______
//`---------------------' `---------------------'
),
/*
[_TEMPLATE] = LAYOUT_wrapper( \
//,----------------------------------------------------. ,----------------------------------------------------.

View File

@@ -43,7 +43,7 @@ This keymap is designed based off my typing habits and is subject to change. Inf
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = |
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
* | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Up | Down | | Left | Right|

View File

@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | = |
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
* | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Up | Down | | Left | Right|
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
* | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | = |
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
* | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Up | Down | | Left | Right|
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | K | M | , | . | / | = |
* `--------+------+------+------+------+-------------' `--------------+------+------+------+------+--------'
* | | | Alt | | Ctl | | BkSP | Del |LOWER | | |
* | | | Alt | Cmd | Ctl | | BkSP | Del |LOWER | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Up | Down | | Left | Right|

View File

@@ -0,0 +1,113 @@
# ninjonas Keymap for [Kyria](https://github.com/splitkb/kyria)
## Keymap
This 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).
More information about the Kyria keyboard can be found [here](https://blog.splitkb.com/blog/introducing-the-kyria)
### QWERTY
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// Tab, Q, W, E, R, T, Y, U, I, O, P, \
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// ESC, A, S, D, F, G, H, J, K, L, ;, '
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// LShift, Z, X, C, V, B, ALT, NUMLK, N, M, ,, ., /, =
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
// ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE
// `----------------------------------------' `----------------------------------------'
```
### DVORAK
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// Tab, ', ,, ., P, Y, F, G, C, R, L, \
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// ESC, A, O, E, U, I, D, H, T, N, S, /
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// LShift, ;, Q, J, K, X, ALT, NUMLK, B, M, W, V, Z, =
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
// ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE
// `----------------------------------------' `----------------------------------------'
```
### COLEMAK
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// Tab, Q, W, F, P, G, J, L, U, Y, ;, \
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// ESC, A, R, S, T, D, H, N, E, I, O, '
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// LShift, Z, X, C, V, B, ALT, NUMLK, K, M, ,, ., /, =
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
// ALT, Cmd, Ctrl, Space, [, ], Enter, BackSP, Del, MUTE
// `----------------------------------------' `----------------------------------------'
```
### LOWER
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// , , KC_BRIU, Play, Mute, K_CSCN, PgUp, Home, Up, End, , K_MDSH
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// , , KC_BRID, Next, VolUp, , PgDn, Left, Down, Right, K_LOCK,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// , , , Prev, VolDn, [, ], , , M_CODE, M_XXX1, M_PYNV,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
//
// `----------------------------------------' `----------------------------------------'
```
### RAISE
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// `, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// ~, !, @, #, $, %, ^, &, *, (, ), _
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// F11, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F12
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
//
// `----------------------------------------' `----------------------------------------'
```
### ADJUST
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// M_MAKE, EEP_RST, , , , , RGB_TOG, , , COLEMAK, DVORAK, QWERTY,
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// M_VRSN, M_MALL, , RGB_SAI, RGB_HUI,RGB_VAI,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// M_FLSH, , , RGB_SAD, RGB_HUD,RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, , , ,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
//
// `----------------------------------------' `----------------------------------------'
```
### NUMPAD
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// , , , , , , , 7, 8, 9, +, /,
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
// , , , , , , , 4, 5, 6, -, *,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
// , , , , , , , , , , 0, 1, 2, 3, ., :,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
//
// `----------------------------------------' `----------------------------------------'
```
<!--
### TEMPLATE
```c
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
// 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
// `----------------------------------------' `----------------------------------------'
```
-->

View File

@@ -16,7 +16,7 @@
#pragma once
#define TAPPING_TERM 200
#define TAPPING_TERM 300
#ifdef OLED_DRIVER_ENABLE
#define OLED_DISPLAY_128X64

View File

@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
_____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
_____________________QWERTY_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________QWERTY_R3______________________,
_____________________QWERTY_L3______________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________QWERTY_R3______________________,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
_____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
// `----------------------------------------' `----------------------------------------'
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
_____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
_____________________DVORAK_L3______________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________DVORAK_R3______________________,
_____________________DVORAK_L3______________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________DVORAK_R3______________________,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
_____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
// `----------------------------------------' `----------------------------------------'
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
_____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
_____________________COLEMAK_L3_____________________,XXXXXXX,KC_LALT, M_COPA,XXXXXXX,_____________________COLEMAK_R3_____________________,
_____________________COLEMAK_L3_____________________,XXXXXXX,KC_LALT, T_CPNU,XXXXXXX,_____________________COLEMAK_R3_____________________,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
_____________MOD_LEFT_____________,T_LBRC, T_RBRC,________MOD_RIGHT________,KC_MUTE
// `----------------------------------------' `----------------------------------------'
@@ -89,6 +89,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______,_______,_______,_______, _______,_______,_______,_______,_______
// `----------------------------------------' `----------------------------------------'
),
[_NUMPAD] = LAYOUT_wrapper(
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.
_______, _______, _______, _______, _______,_______, _____________________NUMPAD_1_______________________,
// |--------+-----——-+——------+-——-----+——------+——-----| |------—+——------+——------+——------+——------+--------|
_______, _______, _______, _______, _______,_______, _____________________NUMPAD_2_______________________,
// |--------+-----——-+——------+-——-----+——------+——-----+———-----------. ,——————————————+------—+——------+——------+——------+——------+--------|
_______, _______, _______, _______,_______,_______,_______,_______, _______,_______,_____________________NUMPAD_3_______________________,
// `--------------------------+--------+--------+-------+-------+------| |------+-------+-------+--------+--------+--------+--------+--------'
_______,_______,_______,_______,_______, _______,_______,_______,_______,_______
// `----------------------------------------' `----------------------------------------'
),
/*
[_TEMPLATE] = LAYOUT_wrapper(
// ,------—————————-------------------------------------. ,--------—————————-----------------------------------.

View File

@@ -127,6 +127,7 @@ static void render_layer_state(void) {
bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST);
bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST);
bool adjust = layer_state_is(_ADJUST);
bool numpad = layer_state_is(_NUMPAD);
if(lower){
oled_write_P(PSTR(" Lower "), true);
@@ -134,6 +135,8 @@ static void render_layer_state(void) {
oled_write_P(PSTR(" Raise "), true);
} else if(adjust){
oled_write_P(PSTR(" Adjust "), true);
} else if(numpad) {
oled_write_P(PSTR(" Numpad "), true);
} else {
oled_write_P(PSTR(" Default"), false);
}

View File

@@ -17,7 +17,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
@@ -35,7 +35,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |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 |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
@@ -53,7 +53,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/

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,
__________________________________, __________________________________
),
*/

View File

@@ -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| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER|
| ALT| Cmd| 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| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER|
| ALT| Cmd| 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| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER|
| ALT| Cmd| CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER|
`---------------------------------------' `---------------------------------------'
*/
```

View File

@@ -27,5 +27,5 @@
#define USE_SERIAL_PD2
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 200
#define TAPPING_TERM 300
#define RETRO_TAPPPING