Skip to content

Commit

Permalink
Changes to thumb clusters and keypad layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Cardoso committed Jun 30, 2021
1 parent 5e178dc commit 1d2b361
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 81 deletions.
112 changes: 43 additions & 69 deletions keyboards/kinesis/keymaps/cadusk/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ enum layer_names {
enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, KEYPAD };

// Aliases to make the keymap more uniform
#define GUI_END GUI_T(KC_END)
#define KPD_ENT LT(_KEYPAD, KC_ENT)
#define MACLOCK LGUI(LCTL(KC_Q))
#define MACLANG LALT(LCTL(KC_SPC))

// clang-format off

Expand All @@ -38,11 +38,11 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, KEYPAD };
| ` | INS | Left | Rght | | Up | Dn | [ | ] |
`---------------------------' `---------------------------'
,--------------.,--------------.
| LCtl | LAlt || LGUI | RCtl |
| Home | End || WWW< | WWW> |
,------|-------|------||------+-------+-------.
| | | Home || PgUp | Enter | |
| BkSp | Del |------||------| / | Space |
| | | End || PgDn | KeyPd | |
| | | LCtl || RCtl | Enter | |
| BkSp | LGUI |------||------| / | Space |
| | | LAlt || RAlt | KeyPd | |
`---------------------'`----------------------'
Colemak layer:
Expand All @@ -58,11 +58,11 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, KEYPAD };
| ` | INS | Left | Rght | | Up | Dn | [ | ] |
`---------------------------' `---------------------------'
,--------------.,--------------.
| LCtl | LAlt || LGUI | RCtl |
| Home | End || WWW< | WWW> |
,------|-------|------||------+-------+-------.
| | | Home || PgUp | Enter | |
| BkSp | Del |------||------| / | Space |
| | | End || PgDn | KeyPd | |
| | | LCtl || RCtl | Enter | |
| BkSp | LGUI |------||------| / | Space |
| | | LAlt || RAlt | KeyPd | |
`---------------------'`----------------------'
Keypad layer:
Expand All @@ -71,49 +71,23 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, KEYPAD };
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Wake | | Mute | Vol- | Vol+ | || | KP 4 | KP 5 | KP 6 | KP + | |
| Wake | | Mute | Vol- | Vol+ | || PgUp | KP 4 | KP 5 | KP 6 | KP + | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| | Stop | Prev | Play | Next | Sel || | KP 1 | KP 2 | KP 3 |KP Ent| |
| | Stop | Prev | Play | Next | Sel || PgDn | KP 1 | KP 2 | KP 3 |KP Ent| |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
| |QWERTY|Colemk| | | | | KP . |KP Ent|
`---------------------------' `---------------------------'
,-------------.,-------------.
| | || |MacLck|
,------|------|------||------+------+------.
| | | || | | |
| | |------||------| | KP 0 |
| | |MacLck|| | | |
| Del |MacLng|------||------| | KP 0 |
| | | || | | |
`--------------------'`--------------------'
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_DVORAK] = LAYOUT (
// Left Hand
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
KC_BSPC, KC_DEL, GUI_END,

// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
// Right Thumb
KC_LGUI, KC_RCTL,
KC_PGUP,
KC_PGDN, KPD_ENT, KC_SPC
),

[_QWERTY] = LAYOUT (
// Left Hand
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
Expand All @@ -123,9 +97,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
KC_BSPC, KC_DEL, KC_END,
KC_HOME, KC_END,
KC_LCTL,
KC_BSPC, KC_LGUI, KC_LALT,

// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
Expand All @@ -135,9 +109,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
// Right Thumb
KC_LGUI, KC_RCTL,
KC_PGUP,
KC_PGDN, KPD_ENT, KC_SPC
KC_WBAK, KC_WFWD,
KC_RCTL,
KC_RALT, KPD_ENT, KC_SPC
),

[_COLEMAK] = LAYOUT (
Expand All @@ -149,9 +123,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
KC_BSPC, KC_DEL, KC_END,
KC_HOME, KC_END,
KC_LCTL,
KC_BSPC, KC_LGUI, KC_LALT,

// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
Expand All @@ -161,35 +135,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
// Right Thumb
KC_LGUI, KC_RCTL,
KC_PGUP,
KC_PGDN, KPD_ENT, KC_SPC
KC_WBAK, KC_WFWD,
KC_RCTL,
KC_RALT, KPD_ENT, KC_SPC
),

[_KEYPAD] = LAYOUT (
// Left Hand
_______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_PWR, _______, _______, _______, _______, _______,
KC_SLEP, _______, _______, _______, _______, _______,
KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
_______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
_______, QWERTY, COLEMAK, _______,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_WAKE, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,
XXXXXXX, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
XXXXXXX, QWERTY, COLEMAK, XXXXXXX,
// Left Thumb
_______, _______,
_______,
_______, _______, MACLOCK,
XXXXXXX, XXXXXXX,
XXXXXXX,
KC_DEL, MACLANG, XXXXXXX,

// Right Hand
_______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______,
_______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
_______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
_______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
_______, _______, KC_PDOT, KC_PENT,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,
XXXXXXX, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, XXXXXXX,
XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PMNS, XXXXXXX,
KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PPLS, XXXXXXX,
KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PENT, XXXXXXX,
XXXXXXX, XXXXXXX, KC_PDOT, KC_PENT,
// Right Thumb
_______, MACLOCK,
_______,
_______, _______, KC_P0
XXXXXXX, MACLOCK,
XXXXXXX,
XXXXXXX, XXXXXXX, KC_P0
)
};

Expand Down
25 changes: 13 additions & 12 deletions keyboards/kinesis/keymaps/cadusk/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
> Feel free to check out [Xyverz's original layout here.](../xyverz/readme.md)
>
> *Update* 2021-06-26: Removed DVORAK layout
> *Update* 2021-06-26: Changes to thumb clusters and keypad layout

This is is pretty much a stock Advantage layout for Dvorak, with a bit of
Expand Down Expand Up @@ -58,11 +59,11 @@ ortholinear keyboards 2020-05-04
| ` | Ins | Left | Rght | | Up | Dn | [ | ] |
`---------------------------' `---------------------------'
,--------------.,--------------.
| LCtl | LAlt || RGUI | RCtl |
| Home | End || WWW< | WWW> |
,------|-------|------||------+-------+-------.
| | | Home || PgUp | Enter | |
| BkSp | Del |------||------| / | Space |
| | | End || PgDn | KeyPd | |
| | | LCtl || RCtl | Enter | |
| BkSp | LGUI |------||------| / | Space |
| | | LAlt || RAlt | KeyPd | |
`---------------------'`----------------------'

### Layer 1: Colemak layer
Expand All @@ -79,11 +80,11 @@ ortholinear keyboards 2020-05-04
| ` | Ins | Left | Rght | | Up | Dn | [ | ] |
`---------------------------' `---------------------------'
,--------------.,--------------.
| LCtl | LAlt || RGUI | RCtl |
| Home | End || WWW< | WWW> |
,------|-------|------||------+-------+-------.
| | | Home || PgUp | Enter | |
| BkSp | Del |------||------| / | Space |
| | | End || PgDn | KeyPd | |
| | | LCtl || RCtl | Enter | |
| BkSp | LGUI |------||------| / | Space |
| | | LAlt || RAlt | KeyPd | |
`---------------------'`----------------------'

### Layer 2: Keypad layer
Expand All @@ -93,16 +94,16 @@ ortholinear keyboards 2020-05-04
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Wake | | Mute | Vol- | Vol+ | || | KP 4 | KP 5 | KP 6 | KP + | |
| Wake | | Mute | Vol- | Vol+ | || PgUp | KP 4 | KP 5 | KP 6 | KP + | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| | Stop | Prev | Play | Next | Sel || | KP 1 | KP 2 | KP 3 |KP Ent| |
| | Stop | Prev | Play | Next | Sel || PgDn | KP 1 | KP 2 | KP 3 |KP Ent| |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
| |QWERTY|Colemk| | | | | KP . |KP Ent|
`---------------------------' `---------------------------'
,-------------.,-------------.
| | || |MacLck|
,------|------|------||------+------+------.
| | | || | | |
| | |------||------| | KP 0 |
| | |MacLck|| | | |
| Del |MacLng|------||------| | KP 0 |
| | | || | | |
`--------------------'`--------------------'

0 comments on commit 1d2b361

Please sign in to comment.