Skip to content

Commit

Permalink
Remove old symbol layers and ifdefs
Browse files Browse the repository at this point in the history 
Also fix a few bugs, readd bsls
  • Loading branch information
@halcyonCorsair
halcyonCorsair committed Jan 19, 2022
1 parent 1900f5e commit f45db3e
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 215 deletions.
150 changes: 41 additions & 109 deletions keyboards/splitkb/kyria/keymaps/halcyoncorsair/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* Base Layer: Colemak DH
*
* ,-------------------------------------------. ,-------------------------------------------.
* | Tab | Q | W | F | P | B | | J | L | U | Y | ; : | | \ |
* | Tab | Q | W | F | P | B | | J | L | U | Y | ; : | \ | |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | Esc/` |A/Ctrl| R/Alt| S/GUI| T/SFT| G | | M | N/SFT| E/GUI| I/Alt|O/Ctrl| ' " |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
Expand All @@ -39,13 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------' `----------------------------------'
*/
[_COLEMAK_DH] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_PIPE,
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
KC_ESC, HOME_A, HOME_R, HOME_S, HOME_T, KC_G, KC_M, HOME_N, HOME_E, HOME_I, HOME_O, KC_QUOT,
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
OS_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, SPOTLIGHT,NUM, ONEPASS, ADJUST, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
#else
OS_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, SPOTLIGHT,_______, ONEPASS, ADJUST, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
#endif
ADJUST, KC_MEH, NAV, KC_SPC, KC_BSPC, KC_TAB, KC_ENT, SYM, REPEAT, KC_MPLY
),

Expand All @@ -64,56 +60,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------' `----------------------------------'
*/
[_QWERTY] = LAYOUT(
_______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, _______,
_______, _______, QHOME_S, QHOME_D, QHOME_F, _______, KC_H, QHOME_J, QHOME_K, QHOME_L, QHOME_SCLN,_______,
_______, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_ESC, HOME_A, QHOME_S, QHOME_D, QHOME_F, KC_G, KC_H, QHOME_J, QHOME_K, QHOME_L, QHOME_SCLN,KC_QUOT,
OS_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
/*
* Layer template
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | ! | @ | ; | : | _ | | = | & | ` | ~ | + | |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | \ | | | } | ( | [ | | * | $ | % | ^ | - | |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | ~ | ` | { | ) | ] | | | | | | & | ! | @ | # | | |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
* | | Swap | Num | | Del | | | | | | |
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
*/
[_SYM] = LAYOUT(
_______, KC_EXLM, KC_AT, KC_SCLN, KC_COLN, KC_UNDS, KC_EQL, KC_AMPR, KC_GRAVE,KC_TILD, KC_PLUS, _______,
_______, HOME_BSLS,HOME_PIPE,HOME_LCBR,HOME_LPRN,KC_LBRC, KC_ASTR, HOME_DLR,HOME_PERC,HOME_CIRC,HOME_MINS,_______,
_______, KC_TILD, KC_GRAVE,KC_RCBR, KC_RPRN, KC_RBRC, _______, _______, _______, _______, KC_AMPR, KC_EXLM, KC_AT, KC_HASH, _______, _______,
_______, SH_OS, NUM, _______, KC_DEL, _______, _______, _______, _______, _______
),
// NOTE: swap hands is currently not enabled due to memory requirements
#elif defined(ENABLE_SYMBOL_LAYER_TBAART)
/*
* Raise Layer: Symbols
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | ! | @ | { | } | | | | | _ | € | | | \ |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | # | $ | ( | ) | ` | | + | - | / | * | % | ' " |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | % | ^ | [ | ] | ~ | | | | | | & | = | , | . | / ? | - _ |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
* | | | | | | | | | | | |
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
*/
[_SYM] = LAYOUT(
_______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_UNDS, _______,_______,_______,KC_BSLS,
_______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT,
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
#else
// #ifdef ENABLE_SYMBOL_LAYER_WINTERNEBS

// NOTE: swap hands is currently not enabled due to memory requirements
// #ifdef ENABLE_SYMBOL_LAYER_TBAART
// /*
// * Raise Layer: Symbols -- from Thomas Baart
// *
// * ,-------------------------------------------. ,-------------------------------------------.
// * | | ! | @ | { | } | | | | | _ | | | | \ |
// * |--------+------+------+------+------+------| |------+------+------+------+------+--------|
// * | | # | $ | ( | ) | ` | | + | - | / | * | % | ' " |
// * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
// * | | % | ^ | [ | ] | ~ | | | | | | & | = | , | . | / ? | - _ |
// * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
// * | | | | | | | | | | | |
// * | | | | | | | | | | | |
// * `----------------------------------' `----------------------------------'
// */
// [_SYM] = LAYOUT(
// _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_UNDS, _______,_______,_______,KC_BSLS,
// _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC,KC_QUOT,
// _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH,KC_MINS,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
// ),
/*
* winter nebs: NUM/symb, swapped numbers
*
Expand All @@ -127,41 +101,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
*/
[_SYM] = LAYOUT(
KC_GRV, KC_4, KC_3, KC_2, KC_1, KC_5, KC_9, KC_0, KC_6, KC_7, KC_8, _______,
KC_DEL, HOME_DLR,HOME_PLUS,HOME_LPRN,HOME_RPRN,KC_AT, KC_PIPE, HOME_MINS,HOME_EQL,HOME_UNDS,HOME_ASTR, _______,
_______, KC_EXLM, KC_HASH, KC_LCBR, KC_RCBR, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_LBRC, KC_RBRC, KC_PERC, KC_CIRC, _______,
_______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______
),
#endif
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
/*
* Nav Layer: Media, navigation
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | | | | | | | PgUp | Home | ↑ | End | VolUp| Delete |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | Ctrl | Alt | GUI | Shift| | | PgDn | ← | ↓ | → | VolDn|Capslock|
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | | Cut | Copy | Paste|P-Text| |Scroll| | |Selwrd| XXX |M Prev|M Play|M Next| Mute | Insert |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
* | | | | | | | | | Num | | |
* | | | | | | | | | | | |
* `----------------------------------' `----------------------------------'
*/
[_NAV] = LAYOUT(
_______, _______, _______, _______, _______, _______, KC_PGUP, MHOME, KC_UP, MEND, KC_VOLU, KC_DEL,
_______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_CAPS, // KC_PSCR
_______, UNDO, CUT, COPY, PASTE, PTXT, _______, KC_SLCK, _______, SELWORD, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_INS,
_______, _______, _______, _______, _______, _______, _______, NUM, _______, _______
),
[_NUM] = LAYOUT(
KC_F13, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_EQL, KC_7, KC_8, KC_9, KC_PLUS, KC_BSPC,
KC_F14, HOME_F5, HOME_F6, HOME_F7, HOME_F8, KC_DOT, KC_ASTR, HOME_4, HOME_5, HOME_6, HOME_MINS,_______,
KC_F15, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_SLSH, KC_DOT,
_______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_DOT, _______
[_SYM] = LAYOUT(
KC_GRV, KC_4, KC_3, KC_2, KC_1, KC_5, KC_9, KC_0, KC_6, KC_7, KC_8, _______,
KC_DEL, HOME_DLR,HOME_PLUS,HOME_LPRN,HOME_RPRN,KC_AT, KC_PIPE, HOME_MINS,HOME_EQL,HOME_UNDS,HOME_ASTR,_______,
_______, KC_EXLM, KC_HASH, KC_LCBR, KC_RCBR, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_LBRC, KC_RBRC, KC_PERC, KC_CIRC, _______,
_______, SH_OS, _______, _______, _______, _______, _______, _______, _______, _______
),
#else
/*
* Nav Layer: Media, navigation
*
Expand All @@ -178,31 +123,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_NAV] = LAYOUT(
KC_F13, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PGUP, MHOME, KC_UP, MEND, KC_VOLU, KC_DEL,
KC_F14, HOME_F5, HOME_F6, HOME_F7, HOME_F8, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_CAPS, // KC_PSCR
KC_F14, HOME_F5, HOME_F6, HOME_F7, HOME_F8, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_CAPS,
KC_F15, KC_F1, KC_F2, KC_F3, KC_F4, PTXT, _______, _______, _______, SELWORD, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_INS,
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
_______, _______, _______, _______, _______, _______, _______, NUM, _______, _______
#else
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
#endif
_______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______
),
#endif
#ifdef ENABLE_WINMGMT_LAYER
[_WINMGMT] = LAYOUT(
_______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, DIVVY_U, DIVVY_I, DIVVY_O, _______, _______,
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, DIVVY_H, DIVVY_J, DIVVY_K, DIVVY_L, DIVVY_SCLN,DIVVY_PANEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DIVVY_M, DIVVY_COMMA,DIVVY_DOT,_______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
#endif

/*
* Adjust Layer: Default layer settings, RGB
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | | |QWERTY| | | | | | | | | RESET |
* | | | | | | | | | | | | | RESET |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | | |Colmak| | | | TOG | SAI | HUI | VAI | MOD | DEBUG |
* | | | |Colmak|QWERTY| | | TOG | SAI | HUI | VAI | MOD | DEBUG |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | | | | | | | | | | | | SAD | HUD | VAD | RMOD | |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
Expand Down Expand Up @@ -232,10 +164,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// * `----------------------------------' `----------------------------------'
// */
// [_LAYERINDEX] = LAYOUT(
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
// ),
};

Expand Down
62 changes: 20 additions & 42 deletions users/halcyoncorsair/keycode_aliases.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
#define COLEMAK DF(_COLEMAK_DH)
#define SYM MO(_SYM)
#define NAV TT(_NAV)
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
# define NUM TT(_NUM)
#endif
#ifdef ENABLE_WINMGMT_LAYER
# define DIVVY MO(_WINMGMT)
#endif
#define ADJUST MO(_ADJUST)
#define NUM_SPC LT(_NUM, KC_SPC)

Expand All @@ -33,17 +27,10 @@
#define QHOME_F LSFT_T(KC_F)

// Symbols
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
# define HOME_BSLS LCTL_T(KC_BSLS)
# define HOME_PIPE LALT_T(KC_PIPE)
# define HOME_LCBR LGUI_T(KC_LCBR)
# define HOME_LPRN LSFT_T(KC_LPRN)
#else
# define HOME_DLR LCTL_T(KC_DLR)
# define HOME_PLUS LALT_T(KC_PLUS)
# define HOME_LPRN LGUI_T(KC_LPRN)
# define HOME_RPRN LSFT_T(KC_RPRN)
#endif
#define HOME_DLR LCTL_T(KC_DLR)
#define HOME_PLUS LALT_T(KC_PLUS)
#define HOME_LPRN LGUI_T(KC_LPRN)
#define HOME_RPRN LSFT_T(KC_RPRN)

// Num
#define HOME_F5 LCTL_T(KC_F5)
Expand All @@ -65,17 +52,10 @@
#define QHOME_SCLN RCTL_T(KC_SCLN)

// Symbols
#ifdef ENABLE_SYMBOL_LAYER_ORIGINAL
# define HOME_DLR RSFT_T(KC_DLR)
# define HOME_PERC RGUI_T(KC_PERC)
# define HOME_CIRC LALT_T(KC_CIRC)
# define HOME_MINS RCTL_T(KC_MINS)
#else
# define HOME_MINS RSFT_T(KC_MINS)
# define HOME_EQL RGUI_T(KC_EQL)
# define HOME_UNDS LALT_T(KC_UNDS)
# define HOME_ASTR RCTL_T(KC_ASTR)
#endif
#define HOME_MINS RSFT_T(KC_MINS)
#define HOME_EQL RGUI_T(KC_EQL)
#define HOME_UNDS LALT_T(KC_UNDS)
#define HOME_ASTR RCTL_T(KC_ASTR)

// Num
#define HOME_4 RSFT_T(KC_4)
Expand Down Expand Up @@ -110,17 +90,15 @@
#define SPOTLIGHT LGUI(KC_SPC)
#define ONEPASS LAG(KC_BSLS)

#ifdef ENABLE_WINMGMT_LAYER
# define DIVVY_PANEL MEH(KC_D)
# define DIVVY_U MEH(KC_U)
# define DIVVY_I MEH(KC_I)
# define DIVVY_O MEH(KC_O)
# define DIVVY_H MEH(KC_H)
# define DIVVY_J MEH(KC_J)
# define DIVVY_K MEH(KC_K)
# define DIVVY_L MEH(KC_L)
# define DIVVY_SCLN MEH(KC_SCLN)
# define DIVVY_M MEH(KC_M)
# define DIVVY_COMMA MEH(KC_COMMA)
# define DIVVY_DOT MEH(KC_DOT)
#endif
#define DIVVY_PANEL MEH(KC_D)
#define DIVVY_U MEH(KC_U)
#define DIVVY_I MEH(KC_I)
#define DIVVY_O MEH(KC_O)
#define DIVVY_H MEH(KC_H)
#define DIVVY_J MEH(KC_J)
#define DIVVY_K MEH(KC_K)
#define DIVVY_L MEH(KC_L)
#define DIVVY_SCLN MEH(KC_SCLN)
#define DIVVY_M MEH(KC_M)
#define DIVVY_COMMA MEH(KC_COMMA)
#define DIVVY_DOT MEH(KC_DOT)
Loading

0 comments on commit f45db3e

Please sign in to comment.