From 7e9f4b4aedd9e26d2aa3a51fb762a1293c69af1c Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 9 Mar 2024 22:29:04 +0100 Subject: Update the symbol layer --- aktersnurra/charybdis/keymap.c | 43 ++++++++++++++++-------------------- aktersnurra/ferris/keymap.c | 49 +++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/aktersnurra/charybdis/keymap.c b/aktersnurra/charybdis/keymap.c index 09fdecb..3bec92f 100644 --- a/aktersnurra/charybdis/keymap.c +++ b/aktersnurra/charybdis/keymap.c @@ -18,36 +18,38 @@ #define KC_HE CTL_T(KC_E) #define KC_HN SFT_T(KC_N) +#define KC_SLBRC SFT_T(KC_LBRC) +#define KC_SRPRN SFT_T(KC_RPRN) + #define KC_ALT_CTL LALT(KC_LCTL) #define NAV LT(_NAV, KC_SPC) #define SYM LT(_SYM, KC_BSPC) #define NUM LT(_NUM, KC_TAB) -#define MOU LT(_MOU, KC_ESC) #define CHARYBDIS_AUTO_SNIPING_ON_LAYER _MOU -enum { _COLEMAK_DH, _NAV, _NUM, _SYM, _FUN, _MEDIA, _MOU } layers; +enum { _COLEMAK_DH, _NAV, _NUM, _SYM, _FUN, _MEDIA, } layers; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK_DH] = LAYOUT( /* COLEMAK MOD DH */ KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_HA, KC_HR, KC_HS, KC_HT, KC_G, KC_M, KC_HN, KC_HE, KC_HI, KC_HO, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, - KC_ENT, NAV, MOU, SYM, NUM + KC_ENT, NAV, KC_ESC, SYM, NUM ), - [_NAV] = LAYOUT( /* [> Navigation layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_LSFT + [_SYM] = LAYOUT( /* [> Symbol layer <] */ + KC_TRNS, KC_EXLM, KC_PERC, KC_DLR, KC_AT, KC_GRV, KC_ASTR, KC_CIRC, KC_TRNS, KC_TRNS, + KC_AMPR, KC_HASH, KC_LPRN, KC_SRPRN, KC_MINS, KC_EQL, KC_SLBRC, KC_RBRC, KC_QUOT, KC_PIPE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, + KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS ), - [_SYM] = LAYOUT( /* [> Symbol layer <] */ - KC_GRV, KC_EXLM, KC_PERC, KC_DLR, KC_AT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_HASH, KC_QUOT, KC_ASTR, KC_MINS, KC_EQL, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_AMPR, KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, - KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS + [_NAV] = LAYOUT( /* [> Mouse/Nav layer <] */ + KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS ), [_NUM] = LAYOUT( /* [> Number layer <] */ @@ -58,23 +60,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_MEDIA] = LAYOUT( /* [> Media layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FUN] = LAYOUT( /* [> Function layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_ALT_CTL, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - - [_MOU] = LAYOUT( /* [> Mouse layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) }; diff --git a/aktersnurra/ferris/keymap.c b/aktersnurra/ferris/keymap.c index ac44ed8..c7838e9 100644 --- a/aktersnurra/ferris/keymap.c +++ b/aktersnurra/ferris/keymap.c @@ -1,13 +1,5 @@ -// this is the style you want to emulate. -// This is the canonical layout file for the Quantum project. If you want to add another keyboard, - #include QMK_KEYBOARD_H -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. - #define KC_HA GUI_T(KC_A) #define KC_HR ALT_T(KC_R) #define KC_HS CTL_T(KC_S) @@ -18,6 +10,9 @@ #define KC_HE CTL_T(KC_E) #define KC_HN SFT_T(KC_N) +#define KC_SLBRC SFT_T(KC_LBRC) +#define KC_SRPRN SFT_T(KC_RPRN) + #define KC_ALT_CTL LALT(KC_LCTL) #define NAV LT(_NAV, KC_SPC) @@ -25,33 +20,33 @@ #define NUM LT(_NUM, KC_TAB) enum { _COLEMAK_DH, _NAV, _NUM, _SYM, _FUN, _MEDIA } layers; -enum { M_ESC } tap_dances; +enum { TD_J_ESC } tap_dances; // Tap Dance Definitions tap_dance_action_t tap_dance_actions[] = { - [M_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_M, KC_ESC) + [TD_J_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_ESC) }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK_DH] = LAYOUT( /* COLEMAK MOD DH */ - KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, - KC_HA, KC_HR, KC_HS, KC_HT, KC_G, TD(M_ESC), KC_HN, KC_HE, KC_HI, KC_HO, - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, - KC_ENT, NAV, SYM, NUM + KC_Q, KC_W, KC_F, KC_P, KC_B, TD(TD_J_ESC), KC_L, KC_U, KC_Y, KC_SCLN, + KC_HA, KC_HR, KC_HS, KC_HT, KC_G, KC_M, KC_HN, KC_HE, KC_HI, KC_HO, + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, + KC_ENT, NAV, SYM, NUM ), - [_NAV] = LAYOUT( /* [> Navigation layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, - KC_TRNS, KC_TRNS, KC_BSPC, KC_LSFT + [_SYM] = LAYOUT( /* [> Symbol layer <] */ + KC_TRNS, KC_EXLM, KC_PERC, KC_DLR, KC_AT, KC_GRV, KC_ASTR, KC_CIRC, KC_TRNS, KC_TRNS, + KC_AMPR, KC_HASH, KC_LPRN, KC_SRPRN, KC_MINS, KC_EQL, KC_SLBRC, KC_RBRC, KC_QUOT, KC_PIPE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, + KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS ), - [_SYM] = LAYOUT( /* [> Symbol layer <] */ - KC_GRV, KC_EXLM, KC_PERC, KC_DLR, KC_AT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_HASH, KC_QUOT, KC_ASTR, KC_MINS, KC_EQL, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_AMPR, KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, - KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS + [_NAV] = LAYOUT( /* [> Navigation layer <] */ + KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS ), [_NUM] = LAYOUT( /* [> Number layer <] */ @@ -62,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_MEDIA] = LAYOUT( /* [> Media layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FUN] = LAYOUT( /* [> Function layer <] */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ALT_CTL, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -- cgit v1.2.3-70-g09d2